summary refs log tree commit diff
path: root/synapse/config/server_notices_config.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-05-23 17:43:30 +0100
committerRichard van der Hoff <richard@matrix.org>2018-05-23 17:43:30 +0100
commit9bf4b2bda343dcbdba7b0e9d752bc560f8e344fd (patch)
treeaf04617ba94617b47934773bceb852334a6b5b82 /synapse/config/server_notices_config.py
parentMerge docs on consent bits from PR #3268 into release branch (diff)
downloadsynapse-9bf4b2bda343dcbdba7b0e9d752bc560f8e344fd.tar.xz
Allow overriding the server_notices user's avatar
probably should have done this in the first place, like @turt2live suggested.
Diffstat (limited to 'synapse/config/server_notices_config.py')
-rw-r--r--synapse/config/server_notices_config.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/synapse/config/server_notices_config.py b/synapse/config/server_notices_config.py
index ccef8d2ec5..be1d1f762c 100644
--- a/synapse/config/server_notices_config.py
+++ b/synapse/config/server_notices_config.py
@@ -26,12 +26,13 @@ DEFAULT_CONFIG = """\
 # setting, which defines the id of the user which will be used to send the
 # notices.
 #
-# It's also possible to override the room name, or the display name of the
-# "notices" user.
+# It's also possible to override the room name, the display name of the
+# "notices" user, and the avatar for the user.
 #
 # server_notices:
 #   system_mxid_localpart: notices
 #   system_mxid_display_name: "Server Notices"
+#   system_mxid_avatar_url: "mxc://server.com/oumMVlgDnLYFaPVkExemNVVZ"
 #   room_name: "Server Notices"
 """
 
@@ -48,6 +49,10 @@ class ServerNoticesConfig(Config):
             The display name to use for the server notices user.
             None if server notices are not enabled.
 
+        server_notices_mxid_avatar_url (str|None):
+            The display name to use for the server notices user.
+            None if server notices are not enabled.
+
         server_notices_room_name (str|None):
             The name to use for the server notices room.
             None if server notices are not enabled.
@@ -56,6 +61,7 @@ class ServerNoticesConfig(Config):
         super(ServerNoticesConfig, self).__init__()
         self.server_notices_mxid = None
         self.server_notices_mxid_display_name = None
+        self.server_notices_mxid_avatar_url = None
         self.server_notices_room_name = None
 
     def read_config(self, config):
@@ -68,7 +74,10 @@ class ServerNoticesConfig(Config):
             mxid_localpart, self.server_name,
         ).to_string()
         self.server_notices_mxid_display_name = c.get(
-            'system_mxid_display_name', 'Server Notices',
+            'system_mxid_display_name', None,
+        )
+        self.server_notices_mxid_avatar_url = c.get(
+            'system_mxid_avatar_url', None,
         )
         # todo: i18n
         self.server_notices_room_name = c.get('room_name', "Server Notices")