summary refs log tree commit diff
diff options
context:
space:
mode:
authorSean Quah <8349537+squahtx@users.noreply.github.com>2023-06-06 12:32:29 +0100
committerGitHub <noreply@github.com>2023-06-06 12:32:29 +0100
commitdfd77f426e3e4a66dd027db7078ed0345a4c74dd (patch)
tree88ccf5257ffef87cdbd68343ade4edae2d21a421
parentMerge remote-tracking branch 'origin/master' into develop (diff)
downloadsynapse-dfd77f426e3e4a66dd027db7078ed0345a4c74dd.tar.xz
Remove some unused `server_name` fields (#15723)
Signed-off-by: Sean Quah <seanq@matrix.org>
-rw-r--r--changelog.d/15723.misc1
-rw-r--r--synapse/handlers/presence.py1
-rw-r--r--synapse/handlers/read_marker.py1
-rw-r--r--synapse/handlers/room.py1
-rw-r--r--synapse/handlers/stats.py1
-rw-r--r--synapse/rest/media/upload_resource.py1
6 files changed, 1 insertions, 5 deletions
diff --git a/changelog.d/15723.misc b/changelog.d/15723.misc
new file mode 100644
index 0000000000..ba331adca7
--- /dev/null
+++ b/changelog.d/15723.misc
@@ -0,0 +1 @@
+Removed some unused fields.
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 4ad2233573..0a219b7962 100644
--- 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
index 49a497a860..df5a4f3e22 100644
--- a/synapse/handlers/read_marker.py
+++ b/synapse/handlers/read_marker.py
@@ -27,7 +27,6 @@ logger = logging.getLogger(__name__)
 
 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
index 5e1702d78a..cb957f2033 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -1490,7 +1490,6 @@ class RoomContextHandler:
 
 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
index 5c01482acf..7cabf7980a 100644
--- a/synapse/handlers/stats.py
+++ b/synapse/handlers/stats.py
@@ -42,7 +42,6 @@ class StatsHandler:
         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
index 697348613b..043e8d6077 100644
--- a/synapse/rest/media/upload_resource.py
+++ b/synapse/rest/media/upload_resource.py
@@ -39,7 +39,6 @@ class UploadResource(DirectServeJsonResource):
         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()