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

Allow per-room profile to be used for server notice user #8799

Merged
merged 3 commits into from
Nov 30, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
12 changes: 11 additions & 1 deletion synapse/handlers/room_member.py
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,17 @@ async def update_membership_locked(
# later on.
content = dict(content)

if not self.allow_per_room_profiles or requester.shadow_banned:
is_requester_server_notices_user = False
if (
self._server_notices_mxid is not None
and requester.user.to_string() == self._server_notices_mxid
):
# allow the server notices mxid to set room-level profile
is_requester_server_notices_user = True
MatMaul marked this conversation as resolved.
Show resolved Hide resolved

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