Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: add new chat reactions popup (#41028)

David Battersbyf1c68b0a0db5
diff --git a/app/assets/stylesheets/common/modal/discourse-reactions-popup.scss b/app/assets/stylesheets/common/modal/discourse-reactions-popup.scss
index f7b9b067e76..7c5a7df43db 100644
--- a/app/assets/stylesheets/common/modal/discourse-reactions-popup.scss
+++ b/app/assets/stylesheets/common/modal/discourse-reactions-popup.scss
@@ -2,7 +2,8 @@
// specific d-modal overrules
.fk-d-menu-modal.discourse-reactions-users-menu-content,
-.fk-d-menu-modal.post-liked-users-menu-content {
+.fk-d-menu-modal.post-liked-users-menu-content,
+.fk-d-menu-modal.chat-message-reaction-users-content {
.d-modal {
&__container {
height: clamp(50dvh, 50dvh, 60dvh);
@@ -14,7 +15,7 @@
}
}
-.post-users-popup {
+.users-popup {
--skeleton-shimmer-rgb: #{hexToRGB($primary-50)};
width: 250px;
background: var(--secondary);
@@ -216,7 +217,7 @@
);
@media (prefers-reduced-motion: no-preference) {
- animation: post-users-popup-shimmer 1.25s infinite;
+ animation: users-popup-shimmer 1.25s infinite;
}
}
}
@@ -257,7 +258,7 @@
}
}
- @keyframes post-users-popup-shimmer {
+ @keyframes users-popup-shimmer {
100% {
transform: translateX(100%);
}
diff --git a/frontend/discourse/app/components/post/menu/liked-users-menu.gjs b/frontend/discourse/app/components/post/menu/liked-users-menu.gjs
index 6c8234bf79a..147f84733ee 100644
--- a/frontend/discourse/app/components/post/menu/liked-users-menu.gjs
+++ b/frontend/discourse/app/components/post/menu/liked-users-menu.gjs
@@ -1,10 +1,10 @@
import Component from "@glimmer/component";
import PluginOutlet from "discourse/components/plugin-outlet";
+import UsersPopup from "discourse/components/user/users-popup";
import lazyHash from "discourse/helpers/lazy-hash";
import { ajax } from "discourse/lib/ajax";
import DUserAvatar from "discourse/ui-kit/d-user-avatar";
import { i18n } from "discourse-i18n";
-import PostUsersMenu from "./post-users-menu";
const LIKE_ACTION = 2;
@@ -36,7 +36,7 @@ export default class PostLikedUsersMenu extends Component {
}
<template>
- <PostUsersMenu
+ <UsersPopup
@fetchUsers={{this.fetchUsers}}
@titleText={{this.titleText}}
@totalUsers={{this.post.likeCount}}
@@ -49,6 +49,6 @@ export default class PostLikedUsersMenu extends Component {
<DUserAvatar class="trigger-user-card" @user={{user}} @size="small" />
</PluginOutlet>
</:avatar>
- </PostUsersMenu>
+ </UsersPopup>
</template>
}
diff --git a/frontend/discourse/app/components/post/menu/post-users-menu.gjs b/frontend/discourse/app/components/user/users-popup.gjs
similarity index 79%
rename from frontend/discourse/app/components/post/menu/post-users-menu.gjs
rename to frontend/discourse/app/components/user/users-popup.gjs
index 88b228ca4c6..0a154c75b3d 100644
--- a/frontend/discourse/app/components/post/menu/post-users-menu.gjs
+++ b/frontend/discourse/app/components/user/users-popup.gjs
@@ -15,22 +15,19 @@ const PAGE_SIZE = 30;
const FALLBACK_SKELETON_ROWS = 3;
const SkeletonRow = <template>
- <div
- class="post-users-popup__item post-users-popup__skeleton-item"
- aria-hidden="true"
- >
- <div class="post-users-popup__skeleton-avatar"></div>
- <div class="post-users-popup__user-info">
- <div class="post-users-popup__skeleton-name"></div>
+ <div class="users-popup__item users-popup__skeleton-item" aria-hidden="true">
+ <div class="users-popup__skeleton-avatar"></div>
+ <div class="users-popup__user-info">
+ <div class="users-popup__skeleton-name"></div>
{{#unless @prioritizeUsername}}
- <div class="post-users-popup__skeleton-username"></div>
+ <div class="users-popup__skeleton-username"></div>
{{/unless}}
</div>
- <div class="post-users-popup__skeleton-reaction"></div>
+ <div class="users-popup__skeleton-reaction"></div>
</div>
</template>;
-export default class PostUsersMenu extends Component {
+export default class UsersPopup extends Component {
@service siteSettings;
@service site;
@@ -46,12 +43,12 @@ export default class PostUsersMenu extends Component {
} else {
defaultName = user.username;
}
- return applyValueTransformer("post-user-display-name", defaultName, {
+ return applyValueTransformer("user-list-display-name", defaultName, {
user,
});
};
displayUsername = (user) => {
- return applyValueTransformer("post-user-display-username", user.username, {
+ return applyValueTransformer("user-list-display-username", user.username, {
user,
});
};
@@ -122,17 +119,17 @@ export default class PostUsersMenu extends Component {
}
<template>
- <div class="post-users-popup">
- <div class="post-users-popup__sticky-header">
+ <div class="users-popup" ...attributes>
+ <div class="users-popup__sticky-header">
{{#if this.site.mobileView}}
- <div class="post-users-popup__title">{{@titleText}}</div>
+ <div class="users-popup__title">{{@titleText}}</div>
{{/if}}
{{yield this.resetAndReload to="header"}}
</div>
<div
- class="post-users-popup__body"
+ class="users-popup__body"
style={{this.bodyStyle}}
{{didInsert this.loadInitial}}
>
@@ -143,23 +140,23 @@ export default class PostUsersMenu extends Component {
@rootMargin="100px"
>
{{#each this.users as |user|}}
- <div class="post-users-popup__item">
+ <div class="users-popup__item">
{{#if (has-block "avatar")}}
{{yield user to="avatar"}}
{{else}}
<DUserAvatar @user={{user}} @size="small" />
{{/if}}
- <div class="post-users-popup__user-info">
+ <div class="users-popup__user-info">
<DUserLink
@username={{user.username}}
- class="post-users-popup__name"
+ class="users-popup__name"
>
{{this.displayName user}}
</DUserLink>
{{#unless this.siteSettings.prioritize_username_in_ux}}
<DUserLink
@username={{user.username}}
- class="post-users-popup__username"
+ class="users-popup__username"
>
@{{this.displayUsername user}}
</DUserLink>
@@ -168,7 +165,7 @@ export default class PostUsersMenu extends Component {
{{#if (has-block "reaction")}}
{{yield user to="reaction"}}
{{else}}
- {{dIcon "d-liked" class="post-users-popup__reaction"}}
+ {{dIcon "d-liked" class="users-popup__reaction"}}
{{/if}}
</div>
{{/each}}
diff --git a/frontend/discourse/app/lib/registry/transformers.js b/frontend/discourse/app/lib/registry/transformers.js
index 4b8facaa9b3..b11da2ec3c4 100644
--- a/frontend/discourse/app/lib/registry/transformers.js
+++ b/frontend/discourse/app/lib/registry/transformers.js
@@ -107,8 +107,6 @@ export const VALUE_TRANSFORMERS = Object.freeze([
"post-small-action-class",
"post-small-action-custom-component",
"post-small-action-icon",
- "post-user-display-name",
- "post-user-display-username",
"poster-name-class",
"poster-name-icons",
"poster-name-user-title",
@@ -127,6 +125,8 @@ export const VALUE_TRANSFORMERS = Object.freeze([
"topic-list-item-style",
"topic-show-footer-buttons",
"user-field-components",
+ "user-list-display-name",
+ "user-list-display-username",
"user-menu-notification-item-acting-user-avatar",
"user-notes-modal-subtitle",
"welcome-banner-display-for-route",
diff --git a/frontend/discourse/tests/acceptance/post-controls-test.js b/frontend/discourse/tests/acceptance/post-controls-test.js
index 0492831369c..6e5fa9dc9b1 100644
--- a/frontend/discourse/tests/acceptance/post-controls-test.js
+++ b/frontend/discourse/tests/acceptance/post-controls-test.js
@@ -13,9 +13,9 @@ acceptance(`Post controls`, function (needs) {
await click("#post_2 .button-count");
- assert.dom(".post-users-popup").exists("post likes popup appears");
+ assert.dom(".users-popup").exists("post likes popup appears");
assert
- .dom(".post-users-popup__item")
+ .dom(".users-popup__item")
.exists("liked users are listed in the popup");
});
diff --git a/frontend/discourse/tests/integration/components/post/menu/post-users-menu-test.gjs b/frontend/discourse/tests/integration/components/post/menu/post-users-menu-test.gjs
deleted file mode 100644
index 7112f207913..00000000000
--- a/frontend/discourse/tests/integration/components/post/menu/post-users-menu-test.gjs
+++ /dev/null
@@ -1,244 +0,0 @@
-import { render, settled, waitFor, waitUntil } from "@ember/test-helpers";
-import { module, test } from "qunit";
-import PostUsersMenu from "discourse/components/post/menu/post-users-menu";
-import { withPluginApi } from "discourse/lib/plugin-api";
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import stubIntersectionObserver from "discourse/tests/helpers/stub-intersection-observer";
-import {
- disableLoadMoreObserver,
- enableLoadMoreObserver,
-} from "discourse/ui-kit/d-load-more";
-
-function makeUsers(count) {
- return Array.from({ length: count }, (_, i) => ({
- id: i + 1,
- username: `u${i + 1}`,
- name: `User ${i + 1}`,
- avatar_template: "/user_avatar/avatar/{size}/1_1.png",
- }));
-}
-
-function deferredFetch(response) {
- let resolve;
- const promise = new Promise((r) => (resolve = r));
- const fetchUsers = () => promise;
- return {
- fetchUsers,
- resolve: () => resolve(response),
- };
-}
-
-function renderMenu({ fetchUsers, totalUsers, onReset = () => {} }) {
- return render(
- <template>
- <PostUsersMenu
- @fetchUsers={{fetchUsers}}
- @titleText="Likes"
- @totalUsers={{totalUsers}}
- >
- <:header as |reset|>{{onReset reset}}</:header>
- </PostUsersMenu>
- </template>
- );
-}
-
-module(
- "Integration | Component | Post | Menu | PostUsersMenu",
- function (hooks) {
- setupRenderingTest(hooks);
-
- hooks.beforeEach(function () {
- enableLoadMoreObserver();
- this.observations = stubIntersectionObserver();
- });
-
- hooks.afterEach(function () {
- disableLoadMoreObserver();
- });
-
- test("renders skeleton rows while the initial fetch is pending", async function (assert) {
- const { fetchUsers, resolve } = deferredFetch({
- users: makeUsers(5),
- canLoadMore: false,
- });
-
- const renderPromise = renderMenu({ fetchUsers, totalUsers: 5 });
-
- await waitFor(".post-users-popup__skeleton-item");
-
- assert
- .dom(".post-users-popup__skeleton-item")
- .exists(
- { count: 5 },
- "renders one skeleton per pending user up to PAGE_SIZE"
- );
-
- resolve();
- await renderPromise;
- await settled();
-
- assert
- .dom(".post-users-popup__skeleton-item")
- .doesNotExist("skeleton rows clear once the fetch resolves");
- assert
- .dom(".post-users-popup__item:not(.post-users-popup__skeleton-item)")
- .exists({ count: 5 }, "renders real user rows after load");
- });
-
- test("caps skeleton rows at PAGE_SIZE when totalUsers is larger", async function (assert) {
- const { fetchUsers, resolve } = deferredFetch({
- users: makeUsers(30),
- canLoadMore: true,
- });
-
- const renderPromise = renderMenu({ fetchUsers, totalUsers: 200 });
-
- await waitFor(".post-users-popup__skeleton-item");
-
- assert
- .dom(".post-users-popup__skeleton-item")
- .exists({ count: 30 }, "skeleton count is capped at PAGE_SIZE");
-
- resolve();
- await renderPromise;
- await settled();
- });
-
- test("does not fall back to skeleton rows when load more starts with every known user loaded", async function (assert) {
- let fetchCallCount = 0;
- let resolveSecondFetch;
- const secondFetchPromise = new Promise((resolve) => {
- resolveSecondFetch = resolve;
- });
- const fetchUsers = () => {
- fetchCallCount++;
-
- if (fetchCallCount === 1) {
- return Promise.resolve({
- users: makeUsers(30),
- canLoadMore: true,
- });
- }
-
- return secondFetchPromise;
- };
-
- await renderMenu({ fetchUsers, totalUsers: 30 });
-
- assert
- .dom(".post-users-popup__item:not(.post-users-popup__skeleton-item)")
- .exists({ count: 30 }, "renders the initially loaded full page");
-
- const triggerPromise =
- this.observations[this.observations.length - 1]?.trigger();
- await waitUntil(() => fetchCallCount === 2);
-
- assert
- .dom(".post-users-popup__skeleton-item")
- .doesNotExist(
- "does not render fallback skeleton rows when totalUsers has already been reached"
- );
-
- resolveSecondFetch({ users: [], canLoadMore: false });
- await triggerPromise;
- await settled();
- });
-
- test("resets scroll position when the user list is reloaded", async function (assert) {
- const fetchUsers = () =>
- Promise.resolve({ users: makeUsers(3), canLoadMore: false });
-
- let resetAndReload;
- await renderMenu({
- fetchUsers,
- onReset: (fn) => (resetAndReload = fn),
- });
-
- const body = document.querySelector(".post-users-popup__body");
- body.style.cssText = "max-height: 20px; overflow-y: auto";
- body.scrollTop = 50;
-
- await resetAndReload();
-
- assert.strictEqual(body.scrollTop, 0, "scrollTop is reset after reload");
- });
-
- test("falls back to a small skeleton count when totalUsers is missing", async function (assert) {
- const { fetchUsers, resolve } = deferredFetch({
- users: makeUsers(2),
- canLoadMore: false,
- });
-
- const renderPromise = renderMenu({ fetchUsers });
-
- await waitFor(".post-users-popup__skeleton-item");
-
- assert
- .dom(".post-users-popup__skeleton-item")
- .exists(
- { count: 3 },
- "still shows a small skeleton fallback when count is unknown"
- );
-
- resolve();
- await renderPromise;
- await settled();
- });
-
- test("can transform the display name via post-user-display-name transformer", async function (assert) {
- this.siteSettings.prioritize_username_in_ux = false;
-
- withPluginApi((api) => {
- api.registerValueTransformer(
- "post-user-display-name",
- ({ value, context }) => {
- if (context.user.id === 1) {
- return "Custom Name";
- }
- return value;
- }
- );
- });
-
- const fetchUsers = () =>
- Promise.resolve({ users: makeUsers(2), canLoadMore: false });
-
- await renderMenu({ fetchUsers });
-
- assert
- .dom(".post-users-popup__item:nth-child(1) .post-users-popup__name")
- .hasText("Custom Name", "first user has custom name");
- assert
- .dom(".post-users-popup__item:nth-child(2) .post-users-popup__name")
- .hasText("User 2", "second user has default name");
- });
-
- test("can transform the username via post-user-display-username transformer", async function (assert) {
- this.siteSettings.prioritize_username_in_ux = false;
-
- withPluginApi((api) => {
- api.registerValueTransformer(
- "post-user-display-username",
- ({ value, context }) => {
- if (context.user.id === 1) {
- return "custom_username";
- }
- return value;
- }
- );
- });
-
- const fetchUsers = () =>
- Promise.resolve({ users: makeUsers(2), canLoadMore: false });
-
- await renderMenu({ fetchUsers });
-
- assert
- .dom(".post-users-popup__item:nth-child(1) .post-users-popup__username")
- .hasText("@custom_username", "first user has custom username");
- assert
- .dom(".post-users-popup__item:nth-child(2) .post-users-popup__username")
- .hasText("@u2", "second user has default username");
- });
- }
-);
diff --git a/frontend/discourse/tests/integration/components/user/users-popup-test.gjs b/frontend/discourse/tests/integration/components/user/users-popup-test.gjs
new file mode 100644
index 00000000000..6536030a123
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/user/users-popup-test.gjs
@@ -0,0 +1,241 @@
+import { render, settled, waitFor, waitUntil } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import UsersPopup from "discourse/components/user/users-popup";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import stubIntersectionObserver from "discourse/tests/helpers/stub-intersection-observer";
+import {
+ disableLoadMoreObserver,
+ enableLoadMoreObserver,
+} from "discourse/ui-kit/d-load-more";
+
+function makeUsers(count) {
+ return Array.from({ length: count }, (_, i) => ({
+ id: i + 1,
+ username: `u${i + 1}`,
+ name: `User ${i + 1}`,
+ avatar_template: "/user_avatar/avatar/{size}/1_1.png",
+ }));
+}
+
+function deferredFetch(response) {
+ let resolve;
+ const promise = new Promise((r) => (resolve = r));
+ const fetchUsers = () => promise;
+ return {
+ fetchUsers,
+ resolve: () => resolve(response),
+ };
+}
+
+function renderMenu({ fetchUsers, totalUsers, onReset = () => {} }) {
+ return render(
+ <template>
+ <UsersPopup
+ @fetchUsers={{fetchUsers}}
+ @titleText="Likes"
+ @totalUsers={{totalUsers}}
+ >
+ <:header as |reset|>{{onReset reset}}</:header>
+ </UsersPopup>
+ </template>
+ );
+}
+
+module("Integration | Component | User | UsersPopup", function (hooks) {
+ setupRenderingTest(hooks);
+
+ hooks.beforeEach(function () {
+ enableLoadMoreObserver();
+ this.observations = stubIntersectionObserver();
+ });
+
+ hooks.afterEach(function () {
+ disableLoadMoreObserver();
+ });
+
+ test("renders skeleton rows while the initial fetch is pending", async function (assert) {
+ const { fetchUsers, resolve } = deferredFetch({
+ users: makeUsers(5),
+ canLoadMore: false,
+ });
+
+ const renderPromise = renderMenu({ fetchUsers, totalUsers: 5 });
+
+ await waitFor(".users-popup__skeleton-item");
+
+ assert
+ .dom(".users-popup__skeleton-item")
+ .exists(
+ { count: 5 },
+ "renders one skeleton per pending user up to PAGE_SIZE"
+ );
+
+ resolve();
+ await renderPromise;
+ await settled();
+
+ assert
+ .dom(".users-popup__skeleton-item")
+ .doesNotExist("skeleton rows clear once the fetch resolves");
+ assert
+ .dom(".users-popup__item:not(.users-popup__skeleton-item)")
+ .exists({ count: 5 }, "renders real user rows after load");
+ });
+
+ test("caps skeleton rows at PAGE_SIZE when totalUsers is larger", async function (assert) {
+ const { fetchUsers, resolve } = deferredFetch({
+ users: makeUsers(30),
+ canLoadMore: true,
+ });
+
+ const renderPromise = renderMenu({ fetchUsers, totalUsers: 200 });
+
+ await waitFor(".users-popup__skeleton-item");
+
+ assert
+ .dom(".users-popup__skeleton-item")
+ .exists({ count: 30 }, "skeleton count is capped at PAGE_SIZE");
+
+ resolve();
+ await renderPromise;
+ await settled();
+ });
+
+ test("does not fall back to skeleton rows when load more starts with every known user loaded", async function (assert) {
+ let fetchCallCount = 0;
+ let resolveSecondFetch;
+ const secondFetchPromise = new Promise((resolve) => {
+ resolveSecondFetch = resolve;
+ });
+ const fetchUsers = () => {
+ fetchCallCount++;
+
+ if (fetchCallCount === 1) {
+ return Promise.resolve({
+ users: makeUsers(30),
+ canLoadMore: true,
+ });
+ }
+
+ return secondFetchPromise;
+ };
+
+ await renderMenu({ fetchUsers, totalUsers: 30 });
+
+ assert
+ .dom(".users-popup__item:not(.users-popup__skeleton-item)")
+ .exists({ count: 30 }, "renders the initially loaded full page");
+
+ const triggerPromise =
+ this.observations[this.observations.length - 1]?.trigger();
+ await waitUntil(() => fetchCallCount === 2);
+
+ assert
+ .dom(".users-popup__skeleton-item")
+ .doesNotExist(
+ "does not render fallback skeleton rows when totalUsers has already been reached"
+ );
+
+ resolveSecondFetch({ users: [], canLoadMore: false });
+ await triggerPromise;
+ await settled();
+ });
+
+ test("resets scroll position when the user list is reloaded", async function (assert) {
+ const fetchUsers = () =>
+ Promise.resolve({ users: makeUsers(3), canLoadMore: false });
+
+ let resetAndReload;
+ await renderMenu({
+ fetchUsers,
+ onReset: (fn) => (resetAndReload = fn),
+ });
+
+ const body = document.querySelector(".users-popup__body");
+ body.style.cssText = "max-height: 20px; overflow-y: auto";
+ body.scrollTop = 50;
+
+ await resetAndReload();
+
+ assert.strictEqual(body.scrollTop, 0, "scrollTop is reset after reload");
+ });
+
+ test("falls back to a small skeleton count when totalUsers is missing", async function (assert) {
+ const { fetchUsers, resolve } = deferredFetch({
+ users: makeUsers(2),
+ canLoadMore: false,
+ });
+
+ const renderPromise = renderMenu({ fetchUsers });
+
+ await waitFor(".users-popup__skeleton-item");
+
+ assert
+ .dom(".users-popup__skeleton-item")
+ .exists(
+ { count: 3 },
+ "still shows a small skeleton fallback when count is unknown"
+ );
+
+ resolve();
+ await renderPromise;
+ await settled();
+ });
+
+ test("can transform the display name via user-list-display-name transformer", async function (assert) {
+ this.siteSettings.prioritize_username_in_ux = false;
+
+ withPluginApi((api) => {
+ api.registerValueTransformer(
+ "user-list-display-name",
+ ({ value, context }) => {
+ if (context.user.id === 1) {
+ return "Custom Name";
+ }
+ return value;
+ }
+ );
+ });
+
+ const fetchUsers = () =>
+ Promise.resolve({ users: makeUsers(2), canLoadMore: false });
+
+ await renderMenu({ fetchUsers });
+
+ assert
+ .dom(".users-popup__item:nth-child(1) .users-popup__name")
+ .hasText("Custom Name", "first user has custom name");
+ assert
+ .dom(".users-popup__item:nth-child(2) .users-popup__name")
+ .hasText("User 2", "second user has default name");
+ });
+
+ test("can transform the username via user-list-display-username transformer", async function (assert) {
+ this.siteSettings.prioritize_username_in_ux = false;
+
+ withPluginApi((api) => {
+ api.registerValueTransformer(
+ "user-list-display-username",
+ ({ value, context }) => {
+ if (context.user.id === 1) {
+ return "custom_username";
+ }
+ return value;
+ }
+ );
+ });
+
+ const fetchUsers = () =>
+ Promise.resolve({ users: makeUsers(2), canLoadMore: false });
+
+ await renderMenu({ fetchUsers });
+
+ assert
+ .dom(".users-popup__item:nth-child(1) .users-popup__username")
+ .hasText("@custom_username", "first user has custom username");
+ assert
+ .dom(".users-popup__item:nth-child(2) .users-popup__username")
+ .hasText("@u2", "second user has default username");
+ });
+});
diff --git a/plugins/chat/app/controllers/chat/chat_controller.rb b/plugins/chat/app/controllers/chat/chat_controller.rb
index 90fa5024604..e60b6b96a85 100644
--- a/plugins/chat/app/controllers/chat/chat_controller.rb
+++ b/plugins/chat/app/controllers/chat/chat_controller.rb
@@ -22,6 +22,27 @@ module Chat
render json: success_json
end
+ def message_reactions_users
+ params.require(:message_id)
+
+ message = Chat::Message.find_by(id: params[:message_id], chat_channel_id: @chat_channel.id)
+ raise Discourse::NotFound if message.nil? || !guardian.can_see_chat_message?(message)
+
+ page = params[:page].to_i.clamp(0..)
+ limit = params[:limit].present? ? params[:limit].to_i.clamp(1, 50) : 30
+
+ rows, total =
+ Chat::MessageReactionUsersQuery.call(
+ message: message,
+ emoji: params[:emoji],
+ limit: limit,
+ offset: page * limit,
+ current_user_id: current_user.id,
+ )
+
+ render_json_dump(users: serialize_data(rows, Chat::ReactionUserSerializer), total_rows: total)
+ end
+
def rebake
Chat::RebakeMessage.call(service_params) do
on_success { render(json: success_json) }
diff --git a/plugins/chat/app/serializers/chat/reaction_user_serializer.rb b/plugins/chat/app/serializers/chat/reaction_user_serializer.rb
new file mode 100644
index 00000000000..9c32799754b
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/reaction_user_serializer.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Chat
+ class ReactionUserSerializer < ::BasicUserSerializer
+ attributes :reaction
+
+ def name
+ object.name
+ end
+
+ def avatar_template
+ User.avatar_template(object.username, object.uploaded_avatar_id)
+ end
+
+ def reaction
+ object.reaction
+ end
+ end
+end
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.gjs
index ea014bfc091..45e5ab214a6 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.gjs
@@ -3,21 +3,31 @@ import { cached } from "@glimmer/tracking";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { getOwner } from "@ember/owner";
+import { cancel } from "@ember/runloop";
import { service } from "@ember/service";
import { trustHTML } from "@ember/template";
import { modifier } from "ember-modifier";
+import { bind } from "discourse/lib/decorators";
+import discourseLater from "discourse/lib/later";
import { emojiUnescape, emojiUrlFor } from "discourse/lib/text";
import { and } from "discourse/truth-helpers";
import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
+import ChatMessageReactionsUsers from "discourse/plugins/chat/discourse/components/chat-message-reactions-users";
import { getReactionText } from "discourse/plugins/chat/discourse/lib/get-reaction-text";
export default class ChatMessageReaction extends Component {
@service currentUser;
+ @service menu;
@service site;
+ @service siteSettings;
@service tooltip;
registerTooltip = modifier((element) => {
- if (this.args.disableTooltip || !this.popoverContent?.length) {
+ if (
+ this.args.disableTooltip ||
+ this.useReactionsUsersPopup ||
+ !this.popoverContent?.length
+ ) {
return;
}
@@ -35,6 +45,95 @@ export default class ChatMessageReaction extends Component {
};
});
+ // With the new reactions popup enabled, hovering (desktop) or long-pressing
+ // (mobile) a reaction opens a users popup centred on that reaction. Each
+ // reaction registers its own popup; the shared `groupIdentifier` ensures only
+ // one is open at a time, so moving to another reaction opens a fresh popup.
+ registerReactionsUsersPopup = modifier((element) => {
+ if (!this.useReactionsUsersPopup) {
+ return;
+ }
+
+ const desktop = !this.site.mobileView;
+
+ const instance = this.menu.register(element, {
+ identifier: "chat-message-reaction-users",
+ groupIdentifier: "chat-message-reaction-users",
+ component: ChatMessageReactionsUsers,
+ modalForMobile: true,
+ placement: "bottom",
+ fallbackPlacements: ["top"],
+ triggers: desktop ? ["hover"] : ["hold"],
+ data: {
+ message: this.args.message,
+ emoji: this.args.reaction.emoji,
+ // Lets the popup keep itself open while the pointer is over it, so the
+ // hover-to-open popup only closes once the pointer leaves both the
+ // reaction and the popup.
+ onContentPointerEnter: desktop
+ ? this.cancelCloseReactionsUsersPopup
+ : undefined,
+ onContentPointerLeave: desktop
+ ? this.scheduleCloseReactionsUsersPopup
+ : undefined,
+ },
+ });
+ this.#reactionsUsersPopupInstance = instance;
+
+ if (desktop) {
+ element.addEventListener(
+ "pointerenter",
+ this.cancelCloseReactionsUsersPopup,
+ { passive: true }
+ );
+ element.addEventListener(
+ "pointerleave",
+ this.scheduleCloseReactionsUsersPopup,
+ { passive: true }
+ );
+ }
+
+ return () => {
+ cancel(this.#closeReactionsUsersPopupTimer);
+ element.removeEventListener(
+ "pointerenter",
+ this.cancelCloseReactionsUsersPopup
+ );
+ element.removeEventListener(
+ "pointerleave",
+ this.scheduleCloseReactionsUsersPopup
+ );
+ instance.destroy();
+ this.#reactionsUsersPopupInstance = null;
+ };
+ });
+ #reactionsUsersPopupInstance = null;
+ #closeReactionsUsersPopupTimer = null;
+
+ // Close on a short delay so moving the pointer across the gap between the
+ // reaction and the popup (or briefly off either) doesn't dismiss it.
+ @bind
+ scheduleCloseReactionsUsersPopup() {
+ cancel(this.#closeReactionsUsersPopupTimer);
+ this.#closeReactionsUsersPopupTimer = discourseLater(() => {
+ this.#reactionsUsersPopupInstance?.close({ focusTrigger: false });
+ }, 250);
+ }
+
+ @bind
+ cancelCloseReactionsUsersPopup() {
+ cancel(this.#closeReactionsUsersPopupTimer);
+ }
+
+ // When the new reactions popup is enabled the reaction opens a users popup, so
+ // the names tooltip is suppressed here.
+ get useReactionsUsersPopup() {
+ return (
+ this.siteSettings.enable_new_chat_reactions_popup &&
+ !this.args.disableTooltip
+ );
+ }
+
get showCount() {
return this.args.showCount ?? true;
}
@@ -76,6 +175,7 @@ export default class ChatMessageReaction extends Component {
<button
{{on "click" this.handleClick passive=true}}
{{this.registerTooltip}}
+ {{this.registerReactionsUsersPopup}}
type="button"
title={{this.emojiString}}
data-emoji-name={{@reaction.emoji}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-reactions-users.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-reactions-users.gjs
new file mode 100644
index 00000000000..e5140fdb562
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-reactions-users.gjs
@@ -0,0 +1,208 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import didUpdate from "@ember/render-modifiers/modifiers/did-update";
+import { service } from "@ember/service";
+import { modifier } from "ember-modifier";
+import UsersPopup from "discourse/components/user/users-popup";
+import { eq } from "discourse/truth-helpers";
+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
+import dEmoji from "discourse/ui-kit/helpers/d-emoji";
+import { i18n } from "discourse-i18n";
+
+const FILTER_SCROLL_PADDING = 8;
+
+export default class ChatMessageReactionsUsers extends Component {
+ @service chatApi;
+
+ // The reaction whose menu was opened starts as the active filter. The header
+ // tabs let the user switch between the message's reactions within the popup.
+ @tracked activeFilter = this.args.data.emoji ?? null;
+
+ // On desktop, report pointer enter/leave on the whole menu so the reaction can
+ // keep the hover-to-open popup alive while it (or the reaction) is hovered.
+ trackPointerForClose = modifier((element) => {
+ const onEnter = this.args.data.onContentPointerEnter;
+ const onLeave = this.args.data.onContentPointerLeave;
+ if (!onEnter || !onLeave) {
+ return;
+ }
+
+ const target = element.closest(".fk-d-menu") ?? element;
+ target.addEventListener("pointerenter", onEnter, { passive: true });
+ target.addEventListener("pointerleave", onLeave, { passive: true });
+
+ return () => {
+ target.removeEventListener("pointerenter", onEnter);
+ target.removeEventListener("pointerleave", onLeave);
+ };
+ });
+
+ // Keeps the active filter visible in the horizontally-scrollable header when
+ // the hovered reaction is past the visible tabs. Re-runs whenever the active
+ // filter changes (passed as a positional arg).
+ scrollActiveFilterIntoView = modifier((element, [activeFilter]) => {
+ if (!activeFilter) {
+ return;
+ }
+
+ const button = element.querySelector(
+ `[data-reaction-filter="${CSS.escape(activeFilter)}"]`
+ );
+ if (!button) {
+ return;
+ }
+
+ const buttonRect = button.getBoundingClientRect();
+ const containerRect = element.getBoundingClientRect();
+ const overflowEnd = buttonRect.right - containerRect.right;
+ const overflowStart = containerRect.left - buttonRect.left;
+
+ if (overflowEnd > 0) {
+ element.scrollLeft += overflowEnd + FILTER_SCROLL_PADDING;
+ } else if (overflowStart > 0) {
+ element.scrollLeft -= overflowStart + FILTER_SCROLL_PADDING;
+ }
+ });
+
+ fetchUsers = async (page, pageSize) => {
+ const filter = this.activeFilter;
+ const offset = page * pageSize;
+ const nextOffset = offset + pageSize;
+ const entry = this.#tabCache.get(filter);
+
+ if (entry) {
+ const cached = entry.users.slice(offset, nextOffset);
+ const fullPage = cached.length === pageSize;
+ const lastPartialPage = !entry.canLoadMore && cached.length > 0;
+ if (fullPage || lastPartialPage) {
+ return {
+ users: cached,
+ canLoadMore: entry.users.length > nextOffset || entry.canLoadMore,
+ };
+ }
+ }
+
+ const result = await this.chatApi.messageReactionsUsers(
+ this.channel.id,
+ this.message.id,
+ { page, limit: pageSize, emoji: filter }
+ );
+ const users = result.users ?? [];
+ const canLoadMore = result.total_rows
+ ? offset + users.length < result.total_rows
+ : users.length >= pageSize;
+
+ const existing = entry?.users ?? [];
+ const merged = [...existing.slice(0, offset), ...users];
+ this.#tabCache.set(filter, { users: merged, canLoadMore });
+
+ if (filter === null && !canLoadMore) {
+ for (const reaction of this.reactions) {
+ this.#tabCache.set(reaction.emoji, {
+ users: merged.filter((user) => user.reaction === reaction.emoji),
+ canLoadMore: false,
+ });
+ }
+ }
+
+ return { users, canLoadMore };
+ };
+ #resetCallback = null;
+ #tabCache = new Map();
+
+ get message() {
+ return this.args.data.message;
+ }
+
+ get channel() {
+ return this.message.channel;
+ }
+
+ get reactions() {
+ return this.message.reactions ?? [];
+ }
+
+ get showFilters() {
+ return this.reactions.length > 1;
+ }
+
+ get totalReactions() {
+ return this.reactions.reduce((sum, reaction) => sum + reaction.count, 0);
+ }
+
+ get titleText() {
+ return i18n("chat.reactions.users_popup.title", {
+ count: this.totalReactions,
+ });
+ }
+
+ get activeFilterTotalUsers() {
+ if (!this.activeFilter) {
+ return this.totalReactions;
+ }
+ return this.reactions.find(
+ (reaction) => reaction.emoji === this.activeFilter
+ )?.count;
+ }
+
+ @action
+ registerReset(resetFn) {
+ this.#resetCallback = resetFn;
+ }
+
+ @action
+ reload() {
+ this.#resetCallback?.();
+ }
+
+ @action
+ selectFilter(filterValue, event) {
+ event.stopPropagation();
+ event.preventDefault();
+ this.activeFilter = filterValue;
+ }
+
+ <template>
+ <UsersPopup
+ @fetchUsers={{this.fetchUsers}}
+ @titleText={{this.titleText}}
+ @totalUsers={{this.activeFilterTotalUsers}}
+ {{this.trackPointerForClose}}
+ >
+ <:header as |resetAndReload|>
+ {{this.registerReset resetAndReload}}
+ <span hidden {{didUpdate this.reload this.activeFilter}}></span>
+ {{#if this.showFilters}}
+ <div
+ class="users-popup__header"
+ {{this.scrollActiveFilterIntoView this.activeFilter}}
+ >
+ {{#each this.reactions as |reaction|}}
+ <button
+ type="button"
+ class={{dConcatClass
+ "users-popup__filter"
+ (if (eq reaction.emoji this.activeFilter) "is-active")
+ }}
+ data-reaction-filter={{reaction.emoji}}
+ {{on "click" (fn this.selectFilter reaction.emoji)}}
+ >
+ {{dEmoji reaction.emoji skipTitle=true}}
+ <span>{{reaction.count}}</span>
+ </button>
+ {{/each}}
+ </div>
+ {{/if}}
+ </:header>
+
+ <:reaction as |user|>
+ {{#if user.reaction}}
+ {{dEmoji user.reaction skipTitle=true class="users-popup__reaction"}}
+ {{/if}}
+ </:reaction>
+ </UsersPopup>
+ </template>
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-api.js b/plugins/chat/assets/javascripts/discourse/services/chat-api.js
index af01b23f4b8..529f83be36d 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-api.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-api.js
@@ -464,6 +464,13 @@ export default class ChatApi extends Service {
});
}
+ messageReactionsUsers(channelId, messageId, { page = 0, limit, emoji } = {}) {
+ return ajax(`/chat/${channelId}/${messageId}/reactions-users`, {
+ type: "GET",
+ data: { page, limit, emoji },
+ });
+ }
+
/**
* Restores a single deleted chat message in a channel.
*
diff --git a/plugins/chat/config/locales/client.en.yml b/plugins/chat/config/locales/client.en.yml
index 962c1dd0709..51275bf023c 100644
--- a/plugins/chat/config/locales/client.en.yml
+++ b/plugins/chat/config/locales/client.en.yml
@@ -502,6 +502,10 @@ en:
other: "<span>You, %{commaSeparatedUsernames} and %{count} others reacted with </span>:%{emoji}:"
single_user: "<span>%{username} reacted with </span>:%{emoji}:"
multiple_users: "<span>%{commaSeparatedUsernames} and %{username} reacted with </span>:%{emoji}:"
+ users_popup:
+ title:
+ one: "%{count} reaction"
+ other: "%{count} reactions"
multiple_users_and_more:
one: "<span>%{commaSeparatedUsernames} and %{count} other reacted with </span>:%{emoji}:"
other: "<span>%{commaSeparatedUsernames} and %{count} others reacted with </span>:%{emoji}:"
diff --git a/plugins/chat/config/locales/server.en.yml b/plugins/chat/config/locales/server.en.yml
index 2d66cad5d4a..5e9e511f8b7 100644
--- a/plugins/chat/config/locales/server.en.yml
+++ b/plugins/chat/config/locales/server.en.yml
@@ -3,6 +3,7 @@ en:
chat_separate_sidebar_mode: "Show separate sidebar modes for forum and chat."
chat_enabled: "Enable chat."
chat_pinned_messages: "Enable pinned messages in chat channels."
+ enable_new_chat_reactions_popup: "Enable the redesigned reactions popup on chat messages, showing who reacted with infinite scroll and a native mobile experience."
enable_public_channels: "Enable public channels based on categories."
chat_allowed_groups: "Users in these groups can chat, except anonymous users who can only view chat when added to this setting. Note that admins and moderators can always access chat."
chat_channel_retention_days: "Chat messages in regular channels will be retained for this many days. Set to '0' to retain messages forever."
diff --git a/plugins/chat/config/routes.rb b/plugins/chat/config/routes.rb
index 92bffa4d1da..1e6940df728 100644
--- a/plugins/chat/config/routes.rb
+++ b/plugins/chat/config/routes.rb
@@ -107,6 +107,7 @@ Chat::Engine.routes.draw do
get "/browse/archived" => "chat#respond"
post "/dismiss-retention-reminder" => "chat#dismiss_retention_reminder"
put ":chat_channel_id/react/:message_id" => "chat#react"
+ get "/:chat_channel_id/:message_id/reactions-users" => "chat#message_reactions_users"
put "/:chat_channel_id/:message_id/rebake" => "chat#rebake"
post "/:chat_channel_id/quote" => "chat#quote_messages"
put "/user_chat_enabled/:user_id" => "chat#set_user_chat_status"
diff --git a/plugins/chat/config/settings.yml b/plugins/chat/config/settings.yml
index 37442909d56..15f962f26de 100644
--- a/plugins/chat/config/settings.yml
+++ b/plugins/chat/config/settings.yml
@@ -10,6 +10,14 @@ chat:
status: "stable"
impact: "feature,all_members"
learn_more_url: "https://meta.discourse.org/t/-/397571"
+ enable_new_chat_reactions_popup:
+ default: false
+ hidden: true
+ client: true
+ upcoming_change:
+ status: "alpha"
+ impact: "feature,all_members"
+ learn_more_url: "https://meta.discourse.org/t/-/406004"
enable_public_channels:
default: true
client: true
diff --git a/plugins/chat/lib/chat/guardian_extensions.rb b/plugins/chat/lib/chat/guardian_extensions.rb
index 7067bb67436..50b7dd2172c 100644
--- a/plugins/chat/lib/chat/guardian_extensions.rb
+++ b/plugins/chat/lib/chat/guardian_extensions.rb
@@ -151,6 +151,13 @@ module Chat
can_see_chatable?(chat_channel.chatable)
end
+ def can_see_chat_message?(message)
+ return false if !can_preview_chat_channel?(message.chat_channel)
+ return true if !message.trashed?
+
+ message.user_id == @user.id || is_staff?
+ end
+
def can_join_chat_channel?(chat_channel, post_allowed_category_ids: nil)
return false if anonymous?
return false unless can_chat?
diff --git a/plugins/chat/lib/chat/message_reaction_users_query.rb b/plugins/chat/lib/chat/message_reaction_users_query.rb
new file mode 100644
index 00000000000..fa22cf3326a
--- /dev/null
+++ b/plugins/chat/lib/chat/message_reaction_users_query.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Chat
+ # Returns a paginated list of the users who reacted to a chat message, one row
+ # per reaction (a user who reacted with several emojis appears once per emoji).
+ # Used by the reactions users popup to lazily page through reactors.
+ class MessageReactionUsersQuery
+ def self.call(message:, emoji: nil, limit: 30, offset: 0, current_user_id: nil)
+ query =
+ new(
+ message: message,
+ emoji: emoji,
+ limit: limit,
+ offset: offset,
+ current_user_id: current_user_id,
+ )
+ [query.rows, query.total]
+ end
+
+ def initialize(message:, emoji: nil, limit: 30, offset: 0, current_user_id: nil)
+ @message = message
+ @emoji = emoji
+ @limit = limit
+ @offset = offset
+ @current_user_id = current_user_id
+ end
+
+ def rows
+ @rows ||= DB.query(<<~SQL, **bindings)
+ SELECT u.id, u.username, u.name, u.uploaded_avatar_id, cmr.emoji AS reaction
+ FROM chat_message_reactions cmr
+ INNER JOIN users u ON u.id = cmr.user_id
+ WHERE cmr.chat_message_id = :message_id
+ #{emoji_filter_sql}
+ #{ignored_users_filter_sql}
+ ORDER BY cmr.created_at ASC, cmr.id ASC
+ LIMIT :limit OFFSET :offset
+ SQL
+ end
+
+ def total
+ @total ||= DB.query_single(<<~SQL, **bindings).first
+ SELECT COUNT(*)
+ FROM chat_message_reactions cmr
+ WHERE cmr.chat_message_id = :message_id
+ #{emoji_filter_sql}
+ #{ignored_users_filter_sql("cmr.user_id")}
+ SQL
+ end
+
+ private
+
+ attr_reader :message, :emoji, :limit, :offset, :current_user_id
+
+ def bindings
+ {
+ message_id: message.id,
+ emoji: emoji,
+ limit: limit,
+ offset: offset,
+ current_user_id: current_user_id,
+ }
+ end
+
+ def emoji_filter_sql
+ return "" if emoji.blank?
+ "AND cmr.emoji = :emoji"
+ end
+
+ def ignored_users_filter_sql(user_column = "u.id")
+ return "" if current_user_id.blank?
+
+ <<~SQL
+ AND NOT EXISTS (
+ SELECT 1 FROM ignored_users ig
+ WHERE ig.user_id = :current_user_id
+ AND ig.ignored_user_id = #{user_column}
+ AND ig.ignored_user_id <> :current_user_id
+ )
+ SQL
+ end
+ end
+end
diff --git a/plugins/chat/public/images/upcoming_changes/enable_new_chat_reactions_popup.png b/plugins/chat/public/images/upcoming_changes/enable_new_chat_reactions_popup.png
new file mode 100644
index 00000000000..e1c7eb09650
Binary files /dev/null and b/plugins/chat/public/images/upcoming_changes/enable_new_chat_reactions_popup.png differ
diff --git a/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
index f7ef06a2d16..9df4e26b721 100644
--- a/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
+++ b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
@@ -440,6 +440,36 @@ RSpec.describe Chat::GuardianExtensions do
end
end
+ describe "#can_see_chat_message?" do
+ fab!(:message) { Fabricate(:chat_message, chat_channel: channel, user: user) }
+
+ it "returns true for a visible message in a channel the user can preview" do
+ expect(guardian.can_see_chat_message?(message)).to eq(true)
+ end
+
+ it "returns false when the user cannot preview the channel" do
+ message.update!(chat_channel: private_channel)
+ expect(guardian.can_see_chat_message?(message)).to eq(false)
+ end
+
+ context "when the message is trashed" do
+ before { message.trash! }
+
+ it "returns false for another user" do
+ other_guardian = Guardian.new(Fabricate(:user, group_ids: [chatters.id]))
+ expect(other_guardian.can_see_chat_message?(message)).to eq(false)
+ end
+
+ it "returns true for the author" do
+ expect(guardian.can_see_chat_message?(message)).to eq(true)
+ end
+
+ it "returns true for staff" do
+ expect(staff_guardian.can_see_chat_message?(message)).to eq(true)
+ end
+ end
+ end
+
describe "#can_moderate_chat?" do
context "for category channel" do
fab!(:category) { Fabricate(:category, read_restricted: true) }
diff --git a/plugins/chat/spec/requests/chat_controller_spec.rb b/plugins/chat/spec/requests/chat_controller_spec.rb
index 86cf70c5852..2ee529bca48 100644
--- a/plugins/chat/spec/requests/chat_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat_controller_spec.rb
@@ -241,6 +241,133 @@ RSpec.describe Chat::ChatController do
end
end
+ describe "#message_reactions_users" do
+ fab!(:chat_channel, :category_channel)
+ fab!(:chat_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user) }
+ fab!(:reactor_1, :user)
+ fab!(:reactor_2, :user)
+
+ # ordered by created_at: heart/reactor_1, heart/reactor_2, +1/reactor_1
+ fab!(:heart_1) do
+ Fabricate(:chat_message_reaction, chat_message: chat_message, user: reactor_1, emoji: "heart")
+ end
+ fab!(:heart_2) do
+ Fabricate(:chat_message_reaction, chat_message: chat_message, user: reactor_2, emoji: "heart")
+ end
+ fab!(:thumbsup_1) do
+ Fabricate(:chat_message_reaction, chat_message: chat_message, user: reactor_1, emoji: "+1")
+ end
+
+ it "returns all reactors with their emoji and the total count" do
+ sign_in(user)
+ get "/chat/#{chat_channel.id}/#{chat_message.id}/reactions-users.json"
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["total_rows"]).to eq(3)
+ expect(
+ response.parsed_body["users"].map { |reactor| [reactor["username"], reactor["reaction"]] },
+ ).to eq(
+ [[reactor_1.username, "heart"], [reactor_2.username, "heart"], [reactor_1.username, "+1"]],
+ )
+ end
+
+ it "serializes each reactor with the BasicUserSerializer fields plus the reaction" do
+ sign_in(user)
+ get "/chat/#{chat_channel.id}/#{chat_message.id}/reactions-users.json"
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["users"].first).to eq(
+ {
+ "id" => reactor_1.id,
+ "username" => reactor_1.username,
+ "name" => reactor_1.name,
+ "avatar_template" => reactor_1.avatar_template,
+ "reaction" => "heart",
+ },
+ )
+ end
+
+ it "filters by the emoji param" do
+ sign_in(user)
+ get "/chat/#{chat_channel.id}/#{chat_message.id}/reactions-users.json",
+ params: {
+ emoji: "heart",
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["total_rows"]).to eq(2)
+ expect(
+ response.parsed_body["users"].map { |reactor| reactor["username"] },
+ ).to contain_exactly(reactor_1.username, reactor_2.username)
+ end
+
+ it "paginates using page and limit" do
+ sign_in(user)
+
+ get "/chat/#{chat_channel.id}/#{chat_message.id}/reactions-users.json",
+ params: {
+ page: 0,
+ limit: 1,
+ }
+ expect(response.parsed_body["total_rows"]).to eq(3)
+ expect(response.parsed_body["users"].map { |reactor| reactor["username"] }).to eq(
+ [reactor_1.username],
+ )
+
+ get "/chat/#{chat_channel.id}/#{chat_message.id}/reactions-users.json",
+ params: {
+ page: 1,
+ limit: 1,
+ }
+ expect(response.parsed_body["users"].map { |reactor| reactor["username"] }).to eq(
+ [reactor_2.username],
+ )
+ end
+
+ it "excludes reactions from users the requester is ignoring" do
+ Fabricate(:ignored_user, user: user, ignored_user: reactor_2)
+ sign_in(user)
+
+ get "/chat/#{chat_channel.id}/#{chat_message.id}/reactions-users.json"
+
+ expect(response.parsed_body["total_rows"]).to eq(2)
+ expect(response.parsed_body["users"].map { |reactor| reactor["username"] }).not_to include(
+ reactor_2.username,
+ )
+ end
+
+ it "returns a 404 when the message does not exist" do
+ sign_in(user)
+ get "/chat/#{chat_channel.id}/-999/reactions-users.json"
+ expect(response.status).to eq(404)
+ end
+
+ it "returns a 404 when the message is trashed" do
+ chat_message.trash!
+ sign_in(user)
+ get "/chat/#{chat_channel.id}/#{chat_message.id}/reactions-users.json"
+ expect(response.status).to eq(404)
+ end
+
+ it "returns a 403 for anonymous users" do
+ get "/chat/#{chat_channel.id}/#{chat_message.id}/reactions-users.json"
+ expect(response.status).to eq(403)
+ end
+
+ it "returns a 403 when the channel is not accessible" do
+ private_channel =
+ Fabricate(
+ :category_channel,
+ chatable: Fabricate(:private_category, group: Fabricate(:group)),
+ )
+ private_message = Fabricate(:chat_message, chat_channel: private_channel, user: admin)
+
+ sign_in(user)
+ get "/chat/#{private_channel.id}/#{private_message.id}/reactions-users.json"
+ expect(response.status).to eq(403)
+ end
+ end
+
describe "#dismiss_retention_reminder" do
it "errors for anon" do
post "/chat/dismiss-retention-reminder.json", params: { chatable_type: "Category" }
diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs
index ef2d3f9425d..894e17fc202 100644
--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs
+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs
@@ -90,7 +90,7 @@ export default class DiscourseReactionsCounter extends Component {
}
if (this.useNewMenu) {
- if (event.target.closest(".post-users-popup")) {
+ if (event.target.closest(".users-popup")) {
return;
}
diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-users-menu.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-users-menu.gjs
index 1736ce0bce2..c526bce73d0 100644
--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-users-menu.gjs
+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-users-menu.gjs
@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";
import { fn } from "@ember/helper";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
-import PostUsersMenu from "discourse/components/post/menu/post-users-menu";
+import UsersPopup from "discourse/components/user/users-popup";
import { eq } from "discourse/truth-helpers";
import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
import dEmoji from "discourse/ui-kit/helpers/d-emoji";
@@ -104,7 +104,7 @@ export default class DiscourseReactionsUsersMenu extends Component {
}
<template>
- <PostUsersMenu
+ <UsersPopup
@fetchUsers={{this.fetchUsers}}
@titleText={{this.titleText}}
@totalUsers={{this.activeFilterTotalUsers}}
@@ -112,11 +112,11 @@ export default class DiscourseReactionsUsersMenu extends Component {
<:header as |resetAndReload|>
{{this.registerReset resetAndReload}}
{{#if this.showFilters}}
- <div class="post-users-popup__header">
+ <div class="users-popup__header">
<button
type="button"
class={{dConcatClass
- "post-users-popup__filter"
+ "users-popup__filter"
(unless this.activeFilter "is-active")
}}
data-reaction-filter="all"
@@ -128,7 +128,7 @@ export default class DiscourseReactionsUsersMenu extends Component {
<button
type="button"
class={{dConcatClass
- "post-users-popup__filter"
+ "users-popup__filter"
(if (eq reaction.id this.activeFilter) "is-active")
}}
data-reaction-filter={{reaction.id}}
@@ -144,15 +144,11 @@ export default class DiscourseReactionsUsersMenu extends Component {
<:reaction as |user|>
{{#if user.reaction}}
- {{dEmoji
- user.reaction
- skipTitle=true
- class="post-users-popup__reaction"
- }}
+ {{dEmoji user.reaction skipTitle=true class="users-popup__reaction"}}
{{else}}
- {{dIcon "d-liked" class="post-users-popup__reaction"}}
+ {{dIcon "d-liked" class="users-popup__reaction"}}
{{/if}}
</:reaction>
- </PostUsersMenu>
+ </UsersPopup>
</template>
}
diff --git a/plugins/discourse-reactions/spec/system/page_objects/post_reactions_popup.rb b/plugins/discourse-reactions/spec/system/page_objects/post_reactions_popup.rb
index 3130f4d30c5..f2325203404 100644
--- a/plugins/discourse-reactions/spec/system/page_objects/post_reactions_popup.rb
+++ b/plugins/discourse-reactions/spec/system/page_objects/post_reactions_popup.rb
@@ -3,7 +3,7 @@
module PageObjects
module Components
class PostReactionsPopup < PageObjects::Components::Base
- SELECTOR = ".post-users-popup"
+ SELECTOR = ".users-popup"
def open?
page.has_css?(SELECTOR)
@@ -18,11 +18,11 @@ module PageObjects
end
def has_user?(username)
- page.has_css?("#{SELECTOR} .post-users-popup__name[data-user-card=#{username}]")
+ page.has_css?("#{SELECTOR} .users-popup__name[data-user-card=#{username}]")
end
def has_no_user?(username)
- page.has_no_css?("#{SELECTOR} .post-users-popup__name[data-user-card=#{username}]")
+ page.has_no_css?("#{SELECTOR} .users-popup__name[data-user-card=#{username}]")
end
end
end
diff --git a/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb b/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb
index 583fd58376e..c8fa056871a 100644
--- a/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb
+++ b/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb
@@ -35,7 +35,7 @@ describe "Reactions | Post reaction user list" do
reactions_list.click_counter
expect(popup).to be_open
- find(".post-users-popup .post-users-popup__name[data-user-card=#{user_2.username}]").click
+ find(".users-popup .users-popup__name[data-user-card=#{user_2.username}]").click
expect(page).to have_css(".user-card.user-card-#{user_2.username}")
end
@@ -50,10 +50,10 @@ describe "Reactions | Post reaction user list" do
reactions_list.click_counter
expect(page).to have_css(
- ".post-users-popup__name[data-user-card=#{user_2.username}]",
+ ".users-popup__name[data-user-card=#{user_2.username}]",
text: user_2.name,
)
- expect(page).to have_css(".post-users-popup__username", text: "@#{user_2.username}")
+ expect(page).to have_css(".users-popup__username", text: "@#{user_2.username}")
end
it "shows the user's username as primary when prioritize_username_in_ux is true" do
@@ -66,10 +66,10 @@ describe "Reactions | Post reaction user list" do
reactions_list.click_counter
expect(page).to have_css(
- ".post-users-popup__name[data-user-card=#{user_2.username}]",
+ ".users-popup__name[data-user-card=#{user_2.username}]",
text: user_2.username,
)
- expect(page).to have_no_css(".post-users-popup__username")
+ expect(page).to have_no_css(".users-popup__username")
end
it "filters the users popup by reaction" do
diff --git a/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-users-menu-test.js b/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-users-menu-test.js
index 0995339abe2..f078a98155c 100644
--- a/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-users-menu-test.js
+++ b/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-users-menu-test.js
@@ -69,7 +69,7 @@ acceptance(
undefined,
"first fetch has no reaction_value"
);
- assert.dom(".post-users-popup__item").exists({ count: 5 });
+ assert.dom(".users-popup__item").exists({ count: 5 });
await click('[data-reaction-filter="heart"]');
assert.strictEqual(
@@ -77,7 +77,7 @@ acceptance(
1,
"does not refetch when filtering by heart"
);
- assert.dom(".post-users-popup__item").exists({ count: 3 });
+ assert.dom(".users-popup__item").exists({ count: 3 });
await click('[data-reaction-filter="laughing"]');
assert.strictEqual(
@@ -85,7 +85,7 @@ acceptance(
1,
"does not refetch when filtering by laughing"
);
- assert.dom(".post-users-popup__item").exists({ count: 2 });
+ assert.dom(".users-popup__item").exists({ count: 2 });
await click('[data-reaction-filter="all"]');
assert.strictEqual(
@@ -93,7 +93,7 @@ acceptance(
1,
"does not refetch when returning to all"
);
- assert.dom(".post-users-popup__item").exists({ count: 5 });
+ assert.dom(".users-popup__item").exists({ count: 5 });
});
}
);
diff --git a/spec/system/page_objects/pages/topic.rb b/spec/system/page_objects/pages/topic.rb
index 6b1bcd126ed..571a03cd3d2 100644
--- a/spec/system/page_objects/pages/topic.rb
+++ b/spec/system/page_objects/pages/topic.rb
@@ -136,13 +136,13 @@ module PageObjects
end
def has_who_liked_on_post?(post, count: nil)
- return has_css?(".post-users-popup .post-users-popup__item", count: count) if count
+ return has_css?(".users-popup .users-popup__item", count: count) if count
- has_css?(".post-users-popup")
+ has_css?(".users-popup")
end
def has_no_who_liked_on_post?(post)
- has_no_css?(".post-users-popup")
+ has_no_css?(".users-popup")
end
def has_who_read_on_post?(post, count: nil)