Remove some unused server_name fields (#15723)

Signed-off-by: Sean Quah <[email protected]>
matrix-org · Jun 6, 2023 · dfd77f4 · dfd77f4
1 parent 1a54953
commit dfd77f4
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 5 deletions.
diff --git a/changelog.d/15723.misc b/changelog.d/15723.misc
@@ -0,0 +1 @@
+Removed some unused fields.
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
@@ -648,7 +648,6 @@ class PresenceHandler(BasePresenceHandler):
     def __init__(self, hs: "HomeServer"):
         super().__init__(hs)
         self.hs = hs
-        self.server_name = hs.hostname
         self.wheel_timer: WheelTimer[str] = WheelTimer()
         self.notifier = hs.get_notifier()
         self._presence_enabled = hs.config.server.use_presence

diff --git a/synapse/handlers/read_marker.py b/synapse/handlers/read_marker.py
@@ -27,7 +27,6 @@
 
 class ReadMarkerHandler:
     def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.config.server.server_name
         self.store = hs.get_datastores().main
         self.account_data_handler = hs.get_account_data_handler()
         self.read_marker_linearizer = Linearizer(name="read_marker")

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
@@ -1490,7 +1490,6 @@ async def filter_evts(events: List[EventBase]) -> List[EventBase]:
 
 class TimestampLookupHandler:
     def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.hostname
         self.store = hs.get_datastores().main
         self.state_handler = hs.get_state_handler()
         self.federation_client = hs.get_federation_client()

diff --git a/synapse/handlers/stats.py b/synapse/handlers/stats.py
@@ -42,7 +42,6 @@ def __init__(self, hs: "HomeServer"):
         self.store = hs.get_datastores().main
         self._storage_controllers = hs.get_storage_controllers()
         self.state = hs.get_state_handler()
-        self.server_name = hs.hostname
         self.clock = hs.get_clock()
         self.notifier = hs.get_notifier()
         self.is_mine_id = hs.is_mine_id

diff --git a/synapse/rest/media/upload_resource.py b/synapse/rest/media/upload_resource.py
@@ -39,7 +39,6 @@ def __init__(self, hs: "HomeServer", media_repo: "MediaRepository"):
         self.filepaths = media_repo.filepaths
         self.store = hs.get_datastores().main
         self.clock = hs.get_clock()
-        self.server_name = hs.hostname
         self.auth = hs.get_auth()
         self.max_upload_size = hs.config.media.max_upload_size
         self.clock = hs.get_clock()