+
{{#if @message.chat_webhook_event}}
{{#if @message.chat_webhook_event.username}}
-
+
{{@message.chat_webhook_event.username}}
{{/if}}
@@ -12,7 +21,11 @@
{{else}}
{{this.name}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-info.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-info.js
index 9bb31d6f4c..c33af19bca 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-info.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-info.js
@@ -1,57 +1,27 @@
-import { computed } from "@ember/object";
-import Component from "@ember/component";
+import Component from "@glimmer/component";
import { prioritizeNameInUx } from "discourse/lib/settings";
+import { inject as service } from "@ember/service";
+import { bind } from "discourse-common/utils/decorators";
export default class ChatMessageInfo extends Component {
- tagName = "";
- message = null;
- details = null;
+ @service siteSettings;
- didInsertElement() {
- this._super(...arguments);
- this.message.user?.trackStatus?.();
+ @bind
+ trackStatus() {
+ this.#user?.trackStatus?.();
}
- willDestroyElement() {
- this._super(...arguments);
- this.message.user?.stopTrackingStatus?.();
+ @bind
+ stopTrackingStatus() {
+ this.#user?.stopTrackingStatus?.();
}
- @computed("message.user")
- get name() {
- return this.prioritizeName
- ? this.message.user.name
- : this.message.user.username;
- }
-
- @computed("message.reviewable_id", "message.user_flag_status")
- get isFlagged() {
- return this.message?.reviewable_id || this.message?.user_flag_status === 0;
- }
-
- @computed("message.user.name")
- get prioritizeName() {
- return (
- this.siteSettings.display_name_on_posts &&
- prioritizeNameInUx(this.message?.user?.name)
- );
- }
-
- @computed("message.user.status")
- get showStatus() {
- return !!this.message.user?.status;
- }
-
- @computed("message.user")
get usernameClasses() {
- const user = this.message?.user;
-
+ const user = this.#user;
const classes = this.prioritizeName ? ["is-full-name"] : ["is-username"];
-
if (!user) {
return classes;
}
-
if (user.staff) {
classes.push("is-staff");
}
@@ -64,7 +34,44 @@ export default class ChatMessageInfo extends Component {
if (user.groupModerator) {
classes.push("is-category-moderator");
}
-
+ if (user.new_user) {
+ classes.push("is-new-user");
+ }
+ if (user.primary_group_name) {
+ classes.push("group--" + user.primary_group_name);
+ }
return classes.join(" ");
}
+
+ get name() {
+ return this.prioritizeName
+ ? this.#user?.get("name")
+ : this.#user?.get("username");
+ }
+
+ get isFlagged() {
+ return (
+ this.#message?.get("reviewable_id") ||
+ this.#message?.get("user_flag_status") === 0
+ );
+ }
+
+ get prioritizeName() {
+ return (
+ this.siteSettings.display_name_on_posts &&
+ prioritizeNameInUx(this.#user?.get("name"))
+ );
+ }
+
+ get showStatus() {
+ return !!this.#user?.get("status");
+ }
+
+ get #user() {
+ return this.#message?.get("user");
+ }
+
+ get #message() {
+ return this.args.message;
+ }
}
diff --git a/plugins/chat/assets/stylesheets/common/common.scss b/plugins/chat/assets/stylesheets/common/common.scss
index 7cc3ae8d39..a36e52e46c 100644
--- a/plugins/chat/assets/stylesheets/common/common.scss
+++ b/plugins/chat/assets/stylesheets/common/common.scss
@@ -606,7 +606,8 @@ html.has-full-page-chat {
#main-outlet-wrapper {
// restrict the row height, including when virtual keyboard is open
grid-template-rows: calc(
- var(--chat-vh, 1vh) * 100 - var(--header-offset)
+ var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) -
+ var(--footer-nav-height, 0px)
);
.sidebar-wrapper {
// prevents sidebar from overflowing behind the virtual keyboard
@@ -614,16 +615,6 @@ html.has-full-page-chat {
}
}
- // iPad webview
- .footer-nav-ipad {
- #main-outlet-wrapper {
- // restrict the row height, including when virtual keyboard is open
- grid-template-rows: calc(
- var(--chat-vh, 1vh) * 100 - calc(var(--header-offset))
- );
- }
- }
-
.full-page-chat,
.chat-live-pane,
#main-outlet {
diff --git a/plugins/chat/assets/stylesheets/mobile/mobile.scss b/plugins/chat/assets/stylesheets/mobile/mobile.scss
index 8e54337969..107c8629dc 100644
--- a/plugins/chat/assets/stylesheets/mobile/mobile.scss
+++ b/plugins/chat/assets/stylesheets/mobile/mobile.scss
@@ -92,13 +92,6 @@ html.has-full-page-chat {
}
}
-html.has-full-page-chat body {
- #main-outlet-wrapper {
- // restricts the height of the page
- grid-template-rows: calc(var(--chat-vh, 1vh) * 100 - var(--header-offset));
- }
-}
-
.chat-message-separator {
margin-left: 0;
}
diff --git a/plugins/chat/lib/chat_message_mentions.rb b/plugins/chat/lib/chat_message_mentions.rb
new file mode 100644
index 0000000000..84516466b0
--- /dev/null
+++ b/plugins/chat/lib/chat_message_mentions.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+class Chat::ChatMessageMentions
+ def initialize(message)
+ @message = message
+
+ mentions = parse_mentions(message)
+ group_mentions = parse_group_mentions(message)
+
+ @has_global_mention = mentions.include?("@all")
+ @has_here_mention = mentions.include?("@here")
+ @parsed_direct_mentions = normalize(mentions)
+ @parsed_group_mentions = normalize(group_mentions)
+ end
+
+ attr_accessor :has_global_mention,
+ :has_here_mention,
+ :parsed_direct_mentions,
+ :parsed_group_mentions
+
+ def global_mentions
+ return User.none unless @has_global_mention
+ channel_members.where.not(username_lower: @parsed_direct_mentions)
+ end
+
+ def direct_mentions
+ chat_users.where(username_lower: @parsed_direct_mentions)
+ end
+
+ def group_mentions
+ chat_users.includes(:groups).joins(:groups).where(groups: mentionable_groups)
+ end
+
+ def here_mentions
+ return User.none unless @has_here_mention
+
+ channel_members
+ .where("last_seen_at > ?", 5.minutes.ago)
+ .where.not(username_lower: @parsed_direct_mentions)
+ end
+
+ def mentionable_groups
+ @mentionable_groups ||=
+ Group.mentionable(@message.user, include_public: false).where(id: visible_groups.map(&:id))
+ end
+
+ def visible_groups
+ @visible_groups ||=
+ Group.where("LOWER(name) IN (?)", @parsed_group_mentions).visible_groups(@message.user)
+ end
+
+ private
+
+ def channel_members
+ chat_users.where(
+ user_chat_channel_memberships: {
+ following: true,
+ chat_channel_id: @message.chat_channel.id,
+ },
+ )
+ end
+
+ def chat_users
+ User
+ .includes(:user_chat_channel_memberships, :group_users)
+ .distinct
+ .joins("LEFT OUTER JOIN user_chat_channel_memberships uccm ON uccm.user_id = users.id")
+ .joins(:user_option)
+ .real
+ .not_suspended
+ .where(user_options: { chat_enabled: true })
+ .where.not(username_lower: @message.user.username.downcase)
+ end
+
+ def parse_mentions(message)
+ Nokogiri::HTML5.fragment(message.cooked).css(".mention").map(&:text)
+ end
+
+ def parse_group_mentions(message)
+ Nokogiri::HTML5.fragment(message.cooked).css(".mention-group").map(&:text)
+ end
+
+ def normalize(mentions)
+ mentions.reduce([]) do |memo, mention|
+ %w[@here @all].include?(mention.downcase) ? memo : (memo << mention[1..-1].downcase)
+ end
+ end
+end
diff --git a/plugins/chat/lib/chat_notifier.rb b/plugins/chat/lib/chat_notifier.rb
index 4719b96801..7887cfade9 100644
--- a/plugins/chat/lib/chat_notifier.rb
+++ b/plugins/chat/lib/chat_notifier.rb
@@ -60,6 +60,7 @@ class Chat::ChatNotifier
@timestamp = timestamp
@chat_channel = @chat_message.chat_channel
@user = @chat_message.user
+ @mentions = Chat::ChatMessageMentions.new(chat_message)
end
### Public API
@@ -108,11 +109,12 @@ class Chat::ChatNotifier
private
def list_users_to_notify
- direct_mentions_count = direct_mentions_from_cooked.length
- group_mentions_count = group_name_mentions.length
+ mentions_count =
+ @mentions.parsed_direct_mentions.length + @mentions.parsed_group_mentions.length
+ mentions_count += 1 if @mentions.has_global_mention
+ mentions_count += 1 if @mentions.has_here_mention
- skip_notifications =
- (direct_mentions_count + group_mentions_count) > SiteSetting.max_mentions_per_chat_message
+ skip_notifications = mentions_count > SiteSetting.max_mentions_per_chat_message
{}.tap do |to_notify|
# The order of these methods is the precedence
@@ -131,48 +133,13 @@ class Chat::ChatNotifier
end
end
- def chat_users
- User
- .includes(:user_chat_channel_memberships, :group_users)
- .distinct
- .joins("LEFT OUTER JOIN user_chat_channel_memberships uccm ON uccm.user_id = users.id")
- .joins(:user_option)
- .real
- .not_suspended
- .where(user_options: { chat_enabled: true })
- .where.not(username_lower: @user.username.downcase)
- end
-
- def rest_of_the_channel
- chat_users.where(
- user_chat_channel_memberships: {
- following: true,
- chat_channel_id: @chat_channel.id,
- },
- )
- end
-
- def members_accepting_channel_wide_notifications
- rest_of_the_channel.where(user_options: { ignore_channel_wide_mention: [false, nil] })
- end
-
- def direct_mentions_from_cooked
- @direct_mentions_from_cooked ||=
- Nokogiri::HTML5.fragment(@chat_message.cooked).css(".mention").map(&:text)
- end
-
- def normalized_mentions(mentions)
- mentions.reduce([]) do |memo, mention|
- %w[@here @all].include?(mention.downcase) ? memo : (memo << mention[1..-1].downcase)
- end
- end
-
def expand_global_mention(to_notify, already_covered_ids, skip)
- typed_global_mention = direct_mentions_from_cooked.include?("@all")
+ has_all_mention = @mentions.has_global_mention
- if typed_global_mention && @chat_channel.allow_channel_wide_mentions && !skip
- to_notify[:global_mentions] = members_accepting_channel_wide_notifications
- .where.not(username_lower: normalized_mentions(direct_mentions_from_cooked))
+ if has_all_mention && @chat_channel.allow_channel_wide_mentions && !skip
+ to_notify[:global_mentions] = @mentions
+ .global_mentions
+ .where(user_options: { ignore_channel_wide_mention: [false, nil] })
.where.not(id: already_covered_ids)
.pluck(:id)
@@ -183,12 +150,12 @@ class Chat::ChatNotifier
end
def expand_here_mention(to_notify, already_covered_ids, skip)
- typed_here_mention = direct_mentions_from_cooked.include?("@here")
+ has_here_mention = @mentions.has_here_mention
- if typed_here_mention && @chat_channel.allow_channel_wide_mentions && !skip
- to_notify[:here_mentions] = members_accepting_channel_wide_notifications
- .where("last_seen_at > ?", 5.minutes.ago)
- .where.not(username_lower: normalized_mentions(direct_mentions_from_cooked))
+ if has_here_mention && @chat_channel.allow_channel_wide_mentions && !skip
+ to_notify[:here_mentions] = @mentions
+ .here_mentions
+ .where(user_options: { ignore_channel_wide_mention: [false, nil] })
.where.not(id: already_covered_ids)
.pluck(:id)
@@ -225,10 +192,7 @@ class Chat::ChatNotifier
if skip
direct_mentions = []
else
- direct_mentions =
- chat_users
- .where(username_lower: normalized_mentions(direct_mentions_from_cooked))
- .where.not(id: already_covered_ids)
+ direct_mentions = @mentions.direct_mentions.where.not(id: already_covered_ids)
end
grouped = group_users_to_notify(direct_mentions)
@@ -239,48 +203,31 @@ class Chat::ChatNotifier
already_covered_ids.concat(to_notify[:direct_mentions])
end
- def group_name_mentions
- @group_mentions_from_cooked ||=
- normalized_mentions(
- Nokogiri::HTML5.fragment(@chat_message.cooked).css(".mention-group").map(&:text),
- )
- end
-
- def visible_groups
- @visible_groups ||= Group.where("LOWER(name) IN (?)", group_name_mentions).visible_groups(@user)
- end
-
def expand_group_mentions(to_notify, already_covered_ids, skip)
- return [] if skip || visible_groups.empty?
+ return [] if skip || @mentions.visible_groups.empty?
- mentionable_groups =
- Group.mentionable(@user, include_public: false).where(id: visible_groups.map(&:id))
-
- mentions_disabled = visible_groups - mentionable_groups
+ reached_by_group =
+ @mentions
+ .group_mentions
+ .where("user_count <= ?", SiteSetting.max_users_notified_per_group_mention)
+ .where.not(id: already_covered_ids)
too_many_members, mentionable =
- mentionable_groups.partition do |group|
+ @mentions.mentionable_groups.partition do |group|
group.user_count > SiteSetting.max_users_notified_per_group_mention
end
+ mentions_disabled = @mentions.visible_groups - @mentions.mentionable_groups
to_notify[:group_mentions_disabled] = mentions_disabled
to_notify[:too_many_members] = too_many_members
-
mentionable.each { |g| to_notify[g.name.downcase] = [] }
- reached_by_group =
- chat_users
- .includes(:groups)
- .joins(:groups)
- .where(groups: mentionable)
- .where.not(id: already_covered_ids)
-
grouped = group_users_to_notify(reached_by_group)
-
grouped[:already_participating].each do |user|
# When a user is a member of multiple mentioned groups,
# the most far to the left should take precedence.
- ordered_group_names = group_name_mentions & mentionable.map { |mg| mg.name.downcase }
+ ordered_group_names =
+ @mentions.parsed_group_mentions & mentionable.map { |mg| mg.name.downcase }
user_group_names = user.groups.map { |ug| ug.name.downcase }
group_name = ordered_group_names.detect { |gn| user_group_names.include?(gn) }
diff --git a/plugins/chat/plugin.rb b/plugins/chat/plugin.rb
index c5b2f5c625..8a4792cb65 100644
--- a/plugins/chat/plugin.rb
+++ b/plugins/chat/plugin.rb
@@ -178,6 +178,7 @@ after_initialize do
load File.expand_path("../lib/chat_message_updater.rb", __FILE__)
load File.expand_path("../lib/chat_message_rate_limiter.rb", __FILE__)
load File.expand_path("../lib/chat_message_reactor.rb", __FILE__)
+ load File.expand_path("../lib/chat_message_mentions.rb", __FILE__)
load File.expand_path("../lib/chat_notifier.rb", __FILE__)
load File.expand_path("../lib/chat_seeder.rb", __FILE__)
load File.expand_path("../lib/chat_statistics.rb", __FILE__)
diff --git a/plugins/chat/spec/lib/chat_message_mentions_spec.rb b/plugins/chat/spec/lib/chat_message_mentions_spec.rb
new file mode 100644
index 0000000000..7ff25c873d
--- /dev/null
+++ b/plugins/chat/spec/lib/chat_message_mentions_spec.rb
@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::ChatMessageMentions do
+ fab!(:channel_member_1) { Fabricate(:user) }
+ fab!(:channel_member_2) { Fabricate(:user) }
+ fab!(:channel_member_3) { Fabricate(:user) }
+ fab!(:not_a_channel_member) { Fabricate(:user) }
+ fab!(:chat_channel) { Fabricate(:chat_channel) }
+
+ before do
+ chat_channel.add(channel_member_1)
+ chat_channel.add(channel_member_2)
+ chat_channel.add(channel_member_3)
+ end
+
+ describe "#global_mentions" do
+ it "returns all members of the channel" do
+ message = create_message("mentioning @all")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.global_mentions.pluck(:username)
+
+ expect(result).to contain_exactly(
+ channel_member_1.username,
+ channel_member_2.username,
+ channel_member_3.username,
+ )
+ end
+
+ it "doesn't include users that were also mentioned directly" do
+ message = create_message("mentioning @all and @#{channel_member_1.username}")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.global_mentions.pluck(:username)
+
+ expect(result).to contain_exactly(channel_member_2.username, channel_member_3.username)
+ end
+
+ it "returns an empty list if there are no global mentions" do
+ message = create_message("not mentioning anybody")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.global_mentions.pluck(:username)
+
+ expect(result).to be_empty
+ end
+ end
+
+ describe "#here_mentions" do
+ before do
+ freeze_time
+ channel_member_1.update(last_seen_at: 2.minutes.ago)
+ channel_member_2.update(last_seen_at: 2.minutes.ago)
+ channel_member_3.update(last_seen_at: 5.minutes.ago)
+ end
+
+ it "returns all members of the channel who were online in the last 5 minutes" do
+ message = create_message("mentioning @here")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.here_mentions.pluck(:username)
+
+ expect(result).to contain_exactly(channel_member_1.username, channel_member_2.username)
+ end
+
+ it "doesn't include users that were also mentioned directly" do
+ message = create_message("mentioning @here and @#{channel_member_1.username}")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.here_mentions.pluck(:username)
+
+ expect(result).to contain_exactly(channel_member_2.username)
+ end
+
+ it "returns an empty list if there are no here mentions" do
+ message = create_message("not mentioning anybody")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.here_mentions.pluck(:username)
+
+ expect(result).to be_empty
+ end
+ end
+
+ describe "#direct_mentions" do
+ it "returns users who were mentioned directly" do
+ message =
+ create_message("mentioning @#{channel_member_1.username} and @#{channel_member_2.username}")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.direct_mentions.pluck(:username)
+
+ expect(result).to contain_exactly(channel_member_1.username, channel_member_2.username)
+ end
+
+ it "returns a mentioned user even if he's not a member of the channel" do
+ message = create_message("mentioning @#{not_a_channel_member.username}")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.direct_mentions.pluck(:username)
+
+ expect(result).to contain_exactly(not_a_channel_member.username)
+ end
+
+ it "returns an empty list if no one was mentioned directly" do
+ message = create_message("not mentioning anybody")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.direct_mentions.pluck(:username)
+
+ expect(result).to be_empty
+ end
+ end
+
+ describe "#group_mentions" do
+ fab!(:group1) { Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
+ fab!(:group_member_1) { Fabricate(:user, group_ids: [group1.id]) }
+ fab!(:group_member_2) { Fabricate(:user, group_ids: [group1.id]) }
+ fab!(:group_member_3) { Fabricate(:user, group_ids: [group1.id]) }
+
+ before do
+ chat_channel.add(group_member_1)
+ chat_channel.add(group_member_2)
+ end
+
+ it "returns members of a mentioned group even if some of them is not members of the channel" do
+ message = create_message("mentioning @#{group1.name}")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.group_mentions.pluck(:username)
+
+ expect(result).to contain_exactly(
+ group_member_1.username,
+ group_member_2.username,
+ group_member_3.username,
+ )
+ end
+
+ it "returns an empty list if no group was mentioned" do
+ message = create_message("not mentioning anybody")
+
+ mentions = Chat::ChatMessageMentions.new(message)
+ result = mentions.group_mentions.pluck(:username)
+
+ expect(result).to be_empty
+ end
+ end
+
+ def create_message(text)
+ Fabricate(:chat_message, chat_channel: chat_channel, message: text)
+ end
+end
diff --git a/plugins/chat/test/javascripts/components/chat-message-info-test.js b/plugins/chat/test/javascripts/components/chat-message-info-test.js
index 4fea2ebd07..989656e803 100644
--- a/plugins/chat/test/javascripts/components/chat-message-info-test.js
+++ b/plugins/chat/test/javascripts/components/chat-message-info-test.js
@@ -4,14 +4,17 @@ import hbs from "htmlbars-inline-precompile";
import { exists, query } from "discourse/tests/helpers/qunit-helpers";
import I18n from "I18n";
import { module, test } from "qunit";
-import User from "discourse/models/user";
import { render } from "@ember/test-helpers";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
module("Discourse Chat | Component | chat-message-info", function (hooks) {
setupRenderingTest(hooks);
test("chat_webhook_event", async function (assert) {
- this.set("message", { chat_webhook_event: { username: "discobot" } });
+ this.set(
+ "message",
+ ChatMessage.create({ chat_webhook_event: { username: "discobot" } })
+ );
await render(hbs``);
@@ -26,7 +29,7 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
});
test("user", async function (assert) {
- this.set("message", { user: { username: "discobot" } });
+ this.set("message", ChatMessage.create({ user: { username: "discobot" } }));
await render(hbs``);
@@ -37,10 +40,13 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
});
test("date", async function (assert) {
- this.set("message", {
- user: { username: "discobot" },
- created_at: moment(),
- });
+ this.set(
+ "message",
+ ChatMessage.create({
+ user: { username: "discobot" },
+ created_at: moment(),
+ })
+ );
await render(hbs``);
@@ -48,13 +54,16 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
});
test("bookmark (with reminder)", async function (assert) {
- this.set("message", {
- user: { username: "discobot" },
- bookmark: Bookmark.create({
- reminder_at: moment(),
- name: "some name",
- }),
- });
+ this.set(
+ "message",
+ ChatMessage.create({
+ user: { username: "discobot" },
+ bookmark: Bookmark.create({
+ reminder_at: moment(),
+ name: "some name",
+ }),
+ })
+ );
await render(hbs``);
@@ -64,12 +73,15 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
});
test("bookmark (no reminder)", async function (assert) {
- this.set("message", {
- user: { username: "discobot" },
- bookmark: Bookmark.create({
- name: "some name",
- }),
- });
+ this.set(
+ "message",
+ ChatMessage.create({
+ user: { username: "discobot" },
+ bookmark: Bookmark.create({
+ name: "some name",
+ }),
+ })
+ );
await render(hbs``);
@@ -78,7 +90,7 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
test("user status", async function (assert) {
const status = { description: "off to dentist", emoji: "tooth" };
- this.set("message", { user: User.create({ status }) });
+ this.set("message", ChatMessage.create({ user: { status } }));
await render(hbs``);
@@ -86,10 +98,13 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
});
test("reviewable", async function (assert) {
- this.set("message", {
- user: { username: "discobot" },
- user_flag_status: 0,
- });
+ this.set(
+ "message",
+ ChatMessage.create({
+ user: { username: "discobot" },
+ user_flag_status: 0,
+ })
+ );
await render(hbs``);
@@ -98,14 +113,57 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
I18n.t("chat.you_flagged")
);
- this.set("message", {
- user: { username: "discobot" },
- reviewable_id: 1,
- });
+ this.set(
+ "message",
+ ChatMessage.create({
+ user: { username: "discobot" },
+ reviewable_id: 1,
+ })
+ );
assert.strictEqual(
query(".chat-message-info__flag a .svg-icon-title").title,
I18n.t("chat.flagged")
);
});
+
+ test("with username classes", async function (assert) {
+ this.set(
+ "message",
+ ChatMessage.create({
+ user: {
+ username: "discobot",
+ admin: true,
+ moderator: true,
+ groupModerator: true,
+ new_user: true,
+ primary_group_name: "foo",
+ },
+ })
+ );
+
+ await render(hbs``);
+
+ assert.dom(".chat-message-info__username.is-staff").exists();
+ assert.dom(".chat-message-info__username.is-admin").exists();
+ assert.dom(".chat-message-info__username.is-moderator").exists();
+ assert.dom(".chat-message-info__username.is-category-moderator ").exists();
+ assert.dom(".chat-message-info__username.is-new-user").exists();
+ assert.dom(".chat-message-info__username.group--foo").exists();
+ });
+
+ test("without username classes", async function (assert) {
+ this.set("message", ChatMessage.create({ user: { username: "discobot" } }));
+
+ await render(hbs``);
+
+ assert.dom(".chat-message-info__username.is-staff").doesNotExist();
+ assert.dom(".chat-message-info__username.is-admin").doesNotExist();
+ assert.dom(".chat-message-info__username.is-moderator").doesNotExist();
+ assert
+ .dom(".chat-message-info__username.is-category-moderator ")
+ .doesNotExist();
+ assert.dom(".chat-message-info__username.is-new-user").doesNotExist();
+ assert.dom(".chat-message-info__username.group--foo").doesNotExist();
+ });
});
diff --git a/spec/lib/topic_query_spec.rb b/spec/lib/topic_query_spec.rb
index 261a4cbb7c..520ee27e5a 100644
--- a/spec/lib/topic_query_spec.rb
+++ b/spec/lib/topic_query_spec.rb
@@ -1731,4 +1731,146 @@ RSpec.describe TopicQuery do
end
end
end
+
+ describe "#new_and_unread_results" do
+ fab!(:unread_topic) { Fabricate(:post).topic }
+ fab!(:new_topic) { Fabricate(:post).topic }
+ fab!(:read_topic) { Fabricate(:post).topic }
+
+ before do
+ unread_post = Fabricate(:post, topic: unread_topic)
+ read_post = Fabricate(:post, topic: read_topic)
+
+ TopicUser.change(
+ user.id,
+ unread_topic.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
+ TopicUser.change(
+ user.id,
+ read_topic.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
+ TopicUser.update_last_read(user, unread_topic.id, unread_post.post_number - 1, 1, 1)
+ TopicUser.update_last_read(user, read_topic.id, read_post.post_number, 1, 1)
+ end
+
+ it "includes unread and new topics for the user" do
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ unread_topic.id,
+ new_topic.id,
+ )
+ end
+
+ it "doesn't include deleted topics" do
+ unread_topic.trash!
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ new_topic.id,
+ )
+ end
+
+ it "doesn't include muted topics with unread posts" do
+ TopicUser.change(
+ user.id,
+ unread_topic.id,
+ notification_level: TopicUser.notification_levels[:muted],
+ )
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ new_topic.id,
+ )
+ end
+
+ it "doesn't include muted new topics" do
+ TopicUser.change(
+ user.id,
+ new_topic.id,
+ notification_level: TopicUser.notification_levels[:muted],
+ )
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ unread_topic.id,
+ )
+ end
+
+ it "doesn't include new topics in muted category" do
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: new_topic.category.id,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ unread_topic.id,
+ )
+ end
+
+ it "includes unread and trakced topics even if they're in a muted category" do
+ new_topic.update!(category: Fabricate(:category))
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: unread_topic.category.id,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ unread_topic.id,
+ new_topic.id,
+ )
+ end
+
+ it "doesn't include new topics that have a muted tag(s)" do
+ SiteSetting.tagging_enabled = true
+
+ tag = Fabricate(:tag)
+ new_topic.tags << tag
+ new_topic.save!
+
+ TagUser.create!(
+ tag_id: tag.id,
+ user_id: user.id,
+ notification_level: NotificationLevels.all[:muted],
+ )
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ unread_topic.id,
+ )
+ end
+
+ it "includes unread and tracked topics even if they have a muted tag(s)" do
+ SiteSetting.tagging_enabled = true
+
+ tag = Fabricate(:tag)
+ unread_topic.tags << tag
+ unread_topic.save!
+
+ TagUser.create!(
+ tag_id: tag.id,
+ user_id: user.id,
+ notification_level: NotificationLevels.all[:muted],
+ )
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ unread_topic.id,
+ new_topic.id,
+ )
+ end
+
+ it "doesn't include topics in restricted categories that user cannot access" do
+ category = Fabricate(:category_with_definition)
+ group = Fabricate(:group)
+ category.set_permissions(group => :full)
+ category.save!
+
+ unread_topic.update!(category: category)
+ new_topic.update!(category: category)
+
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to be_blank
+ end
+
+ it "doesn't include dismissed topics" do
+ DismissedTopicUser.create!(
+ user_id: user.id,
+ topic_id: new_topic.id,
+ created_at: Time.zone.now,
+ )
+ expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+ unread_topic.id,
+ )
+ end
+ end
end