github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 23:02:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: add status to channel membership serializer (#25906)

Browse Source
This commit is contained in:
David Battersby 2024-02-27 18:23:59 +08:00 committed by GitHub
parent 7a14831695
commit fe851a533a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/chat/app/serializers/chat/user_channel_membership_serializer.rb
View File

@ -2,10 +2,11 @@
module Chat module Chat
class UserChannelMembershipSerializer < BaseChannelMembershipSerializer class UserChannelMembershipSerializer < BaseChannelMembershipSerializer
has_one :user, serializer: ::Chat::ChatableUserSerializer, embed: :objects has_one :user, embed: :objects
def user def user
object.user || Chat::NullUser.new user = object.user || Chat::NullUser.new
Chat::BasicUserSerializer.new(user, root: false, scope: scope, include_status: true)
end end
end end
end end

1
plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json
View File

@ -24,7 +24,6 @@
"name": { "type": "string" }, "name": { "type": "string" },
"avatar_template": { "type": "string" }, "avatar_template": { "type": "string" },
"username": { "type": "string" }, "username": { "type": "string" },
"custom_fields": { "type": ["object", "null"] },
"can_chat": { "type": "boolean" }, "can_chat": { "type": "boolean" },
"has_chat_enabled": { "type": "boolean" } "has_chat_enabled": { "type": "boolean" }
} }

2
plugins/chat/spec/system/channel_members_page_spec.rb
View File

@ -64,7 +64,7 @@ RSpec.describe "Channel - Info - Members page", type: :system do
end end
context "with user status" do context "with user status" do
xit "renders status next to name" do it "renders status next to name" do
SiteSetting.enable_user_status = true SiteSetting.enable_user_status = true
current_user.set_status!("walking the dog", "dog") current_user.set_status!("walking the dog", "dog")