OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

flake8

pull/3680/head
Neil Johnson 2018-08-16 17:32:22 +01:00
parent 3c1080b6e4
commit 51b17ec566
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/server_notices/resource_limits_server_notices.py
View File

@ -128,7 +128,7 @@ class ResourceLimitsServerNotices(object):
server_notices_tags = tags.get(room_id) server_notices_tags = tags.get(room_id)
need_to_set_tag = True need_to_set_tag = True
if server_notices_tags: if server_notices_tags:
if server_notice_tags.get(SERVER_NOTICE_ROOM_TAG): if server_notices_tags.get(SERVER_NOTICE_ROOM_TAG):
# tag already present, nothing to do here # tag already present, nothing to do here
need_to_set_tag = False need_to_set_tag = False
if need_to_set_tag: if need_to_set_tag:
@ -158,7 +158,7 @@ class ResourceLimitsServerNotices(object):
pinned_state_event = yield self._state.get_current_state( pinned_state_event = yield self._state.get_current_state(
room_id, event_type=EventTypes.Pinned room_id, event_type=EventTypes.Pinned
) )
except AuthError as e: except AuthError:
# The user has yet to join the server notices room # The user has yet to join the server notices room
pass pass
@ -167,7 +167,6 @@ class ResourceLimitsServerNotices(object):
referenced_events = pinned_state_event.content.get('pinned') referenced_events = pinned_state_event.content.get('pinned')
events = yield self._store.get_events(referenced_events) events = yield self._store.get_events(referenced_events)
event_to_remove = None
for event_id, event in events.items(): for event_id, event in events.items():
if event.type == EventTypes.ServerNoticeLimitReached: if event.type == EventTypes.ServerNoticeLimitReached:
currently_blocked = True currently_blocked = True