From 94b620a5edd6b5bc55c8aad6e00a11cc6bf210fa Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 29 Sep 2021 06:44:15 -0400 Subject: Use direct references for configuration variables (part 6). (#10916) --- synapse/server_notices/resource_limits_server_notices.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'synapse/server_notices') diff --git a/synapse/server_notices/resource_limits_server_notices.py b/synapse/server_notices/resource_limits_server_notices.py index 073b0d754f..8522930b50 100644 --- a/synapse/server_notices/resource_limits_server_notices.py +++ b/synapse/server_notices/resource_limits_server_notices.py @@ -47,9 +47,9 @@ class ResourceLimitsServerNotices: self._notifier = hs.get_notifier() self._enabled = ( - hs.config.limit_usage_by_mau + hs.config.server.limit_usage_by_mau and self._server_notices_manager.is_enabled() - and not hs.config.hs_disabled + and not hs.config.server.hs_disabled ) async def maybe_send_server_notice_to_user(self, user_id: str) -> None: @@ -98,7 +98,7 @@ class ResourceLimitsServerNotices: try: if ( limit_type == LimitBlockingTypes.MONTHLY_ACTIVE_USER - and not self._config.mau_limit_alerting + and not self._config.server.mau_limit_alerting ): # We have hit the MAU limit, but MAU alerting is disabled: # reset room if necessary and return @@ -149,7 +149,7 @@ class ResourceLimitsServerNotices: "body": event_body, "msgtype": ServerNoticeMsgType, "server_notice_type": ServerNoticeLimitReached, - "admin_contact": self._config.admin_contact, + "admin_contact": self._config.server.admin_contact, "limit_type": event_limit_type, } event = await self._server_notices_manager.send_notice( -- cgit 1.5.1 From e79ee48313404abf8fbb7c88361e4ab1efa29a81 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 7 Oct 2021 19:55:15 +0100 Subject: disallow-untyped-defs for synapse.server_notices (#11021) --- changelog.d/11021.misc | 1 + mypy.ini | 3 +++ synapse/server_notices/server_notices_manager.py | 8 ++------ 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 changelog.d/11021.misc (limited to 'synapse/server_notices') diff --git a/changelog.d/11021.misc b/changelog.d/11021.misc new file mode 100644 index 0000000000..8ac1bfcf22 --- /dev/null +++ b/changelog.d/11021.misc @@ -0,0 +1 @@ +Add additional type hints to `synapse.server_notices`. \ No newline at end of file diff --git a/mypy.ini b/mypy.ini index a052d49c71..68437e5ce1 100644 --- a/mypy.ini +++ b/mypy.ini @@ -99,6 +99,9 @@ disallow_untyped_defs = True [mypy-synapse.rest.*] disallow_untyped_defs = True +[mypy-synapse.server_notices.*] +disallow_untyped_defs = True + [mypy-synapse.state.*] disallow_untyped_defs = True diff --git a/synapse/server_notices/server_notices_manager.py b/synapse/server_notices/server_notices_manager.py index cd1c5ff6f4..0cf60236f8 100644 --- a/synapse/server_notices/server_notices_manager.py +++ b/synapse/server_notices/server_notices_manager.py @@ -41,12 +41,8 @@ class ServerNoticesManager: self._notifier = hs.get_notifier() self.server_notices_mxid = self._config.servernotices.server_notices_mxid - def is_enabled(self): - """Checks if server notices are enabled on this server. - - Returns: - bool - """ + def is_enabled(self) -> bool: + """Checks if server notices are enabled on this server.""" return self.server_notices_mxid is not None async def send_notice( -- cgit 1.5.1