MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-20 02:14:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #404 from matrix-org/markjh/trivial_rename

Browse source 
Rename presence_handler.send_invite
This commit is contained in:
Mark Haines 2015-12-01 16:11:03 +00:00
commit af96c6f4d3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/handlers/presence.py
View file

@ -467,7 +467,7 @@ class PresenceHandler(BaseHandler):
) )
@defer.inlineCallbacks @defer.inlineCallbacks
def send_invite(self, observer_user, observed_user): def send_presence_invite(self, observer_user, observed_user):
"""Request the presence of a local or remote user for a local user""" """Request the presence of a local or remote user for a local user"""
if not self.hs.is_mine(observer_user): if not self.hs.is_mine(observer_user):
raise SynapseError(400, "User is not hosted on this Home Server") raise SynapseError(400, "User is not hosted on this Home Server")

2
synapse/rest/client/v1/presence.py
View file

@ -120,7 +120,7 @@ class PresenceListRestServlet(ClientV1RestServlet):
if len(u) == 0: if len(u) == 0:
continue continue
invited_user = UserID.from_string(u) invited_user = UserID.from_string(u)
yield self.handlers.presence_handler.send_invite( yield self.handlers.presence_handler.send_presence_invite(
observer_user=user, observed_user=invited_user observer_user=user, observed_user=invited_user
) )

6
tests/handlers/test_presence.py
View file

@ -365,7 +365,7 @@ class PresenceInvitesTestCase(PresenceTestCase):
# TODO(paul): This test will likely break if/when real auth permissions # TODO(paul): This test will likely break if/when real auth permissions
# are added; for now the HS will always accept any invite # are added; for now the HS will always accept any invite
yield self.handler.send_invite( yield self.handler.send_presence_invite(
observer_user=self.u_apple, observed_user=self.u_banana) observer_user=self.u_apple, observed_user=self.u_banana)
self.assertEquals( self.assertEquals(
@ -384,7 +384,7 @@ class PresenceInvitesTestCase(PresenceTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_invite_local_nonexistant(self): def test_invite_local_nonexistant(self):
yield self.handler.send_invite( yield self.handler.send_presence_invite(
observer_user=self.u_apple, observed_user=self.u_durian) observer_user=self.u_apple, observed_user=self.u_durian)
self.assertEquals( self.assertEquals(
@ -414,7 +414,7 @@ class PresenceInvitesTestCase(PresenceTestCase):
defer.succeed((200, "OK")) defer.succeed((200, "OK"))
) )
yield self.handler.send_invite( yield self.handler.send_presence_invite(
observer_user=self.u_apple, observed_user=u_rocket) observer_user=self.u_apple, observed_user=u_rocket)
self.assertEquals( self.assertEquals(