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

Remove redundant function 

inline `reject_remote_invite`, which only existed to make tracing the callflow
more difficult.
pull/2145/head
Richard van der Hoff 2017-04-21 00:51:01 +01:00
parent 4903ccf159
commit 736b9a4784
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/handlers/room_member.py
View File

@ -139,13 +139,6 @@ class RoomMemberHandler(BaseHandler):
) )
yield user_joined_room(self.distributor, user, room_id) yield user_joined_room(self.distributor, user, room_id)
def reject_remote_invite(self, user_id, room_id, remote_room_hosts):
return self.hs.get_handlers().federation_handler.do_remotely_reject_invite(
remote_room_hosts,
room_id,
user_id
)
@defer.inlineCallbacks @defer.inlineCallbacks
def update_membership( def update_membership(
self, self,
@ -286,10 +279,12 @@ class RoomMemberHandler(BaseHandler):
else: else:
# send the rejection to the inviter's HS. # send the rejection to the inviter's HS.
remote_room_hosts = remote_room_hosts + [inviter.domain] remote_room_hosts = remote_room_hosts + [inviter.domain]
fed_handler = self.hs.get_handlers().federation_handler
try: try:
ret = yield self.reject_remote_invite( ret = yield fed_handler.do_remotely_reject_invite(
target.to_string(), room_id, remote_room_hosts remote_room_hosts,
room_id,
target.to_string(),
) )
defer.returnValue(ret) defer.returnValue(ret)
except SynapseError as e: except SynapseError as e: