code cleanups

This commit is contained in:
Andrew Morgan 2019-09-03 21:05:06 +01:00
parent 2f416fc997
commit ea128a3e8e
1 changed files with 2 additions and 7 deletions

View File

@ -962,9 +962,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
) )
if complexity: if complexity:
if complexity["v1"] > max_complexity: return complexity["v1"] > max_complexity
return True
return False
return None return None
@defer.inlineCallbacks @defer.inlineCallbacks
@ -980,10 +978,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
max_complexity = self.hs.config.limit_remote_rooms.complexity max_complexity = self.hs.config.limit_remote_rooms.complexity
complexity = yield self.store.get_room_complexity(room_id) complexity = yield self.store.get_room_complexity(room_id)
if complexity["v1"] > max_complexity: return complexity["v1"] > max_complexity
return True
return False
@defer.inlineCallbacks @defer.inlineCallbacks
def _remote_join(self, requester, remote_room_hosts, room_id, user, content): def _remote_join(self, requester, remote_room_hosts, room_id, user, content):