Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Allow per-room profile to be used for server notice user (#8799)
Browse files Browse the repository at this point in the history
This applies even if the feature is disabled at the server level with `allow_per_room_profiles`.
The server notice not being a real user it doesn't have an user profile.
  • Loading branch information
MatMaul authored Nov 30, 2020
1 parent f8d13ca commit 9f0f274
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/8799.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow per-room profiles to be used for the server notice user.
10 changes: 9 additions & 1 deletion synapse/handlers/room_member.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,15 @@ async def update_membership_locked(
# later on.
content = dict(content)

if not self.allow_per_room_profiles or requester.shadow_banned:
# allow the server notices mxid to set room-level profile
is_requester_server_notices_user = (
self._server_notices_mxid is not None
and requester.user.to_string() == self._server_notices_mxid
)

if (
not self.allow_per_room_profiles and not is_requester_server_notices_user
) or requester.shadow_banned:
# Strip profile data, knowing that new profile data will be added to the
# event's content in event_creation_handler.create_event() using the target's
# global profile.
Expand Down

0 comments on commit 9f0f274

Please sign in to comment.