FIX: accounts for `hide_profile_and_presence` core user option (#20991)

Chat will now correctly use this core setting and will not show the presence of the user in this case.
This commit is contained in:
Joffrey JAFFEUX 2023-04-06 01:29:54 +02:00 committed by GitHub
parent 5bec894a8c
commit 838fb37019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 0 deletions

View File

@ -17,14 +17,17 @@ const CHAT_ONLINE_OPTIONS = {
export default class Chat extends Service {
@service appEvents;
@service currentUser;
@service chatNotificationManager;
@service chatSubscriptionsManager;
@service chatStateManager;
@service presence;
@service router;
@service site;
@service chatChannelsManager;
@tracked activeChannel = null;
cook = null;
presenceChannel = null;
sidebarActive = false;
@ -114,6 +117,10 @@ export default class Chat extends Service {
return;
}
if (this.currentUser.user_option?.hide_profile_and_presence) {
return;
}
if (this.chatStateManager.isActive) {
this.presenceChannel.enter({ activeOptions: CHAT_ONLINE_OPTIONS });
} else {

View File

@ -0,0 +1,32 @@
# frozen_string_literal: true
RSpec.describe "User presence", type: :system, js: true do
fab!(:channel_1) { Fabricate(:chat_channel) }
fab!(:current_user) { Fabricate(:user) }
let(:channel) { PageObjects::Pages::ChatChannel.new }
before do
chat_system_bootstrap
channel_1.add(current_user)
end
it "shows presence indicator" do
sign_in(current_user)
chat.visit_channel(channel_1)
channel.send_message("Am I present?")
expect(page).to have_selector(".chat-user-avatar.is-online")
end
context "when user hides presence" do
it "hides the presence indicator" do
current_user.user_option.update!(hide_profile_and_presence: true)
sign_in(current_user)
chat.visit_channel(channel_1)
channel.send_message("Am I present?")
expect(page).to have_no_selector(".chat-user-avatar.is-online")
end
end
end