summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-01 15:59:45 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-01 15:59:45 +0000
commit31069ecf6a9c91e62fcecab9059385e33a19a629 (patch)
tree9f7cb6f1bb7a99d8b90b736cc3e93ec3932f87e4 /synapse
parentAdd options to definitions.py to fetch referrers and to output dot (diff)
downloadsynapse-31069ecf6a9c91e62fcecab9059385e33a19a629.tar.xz
Rename presence_handler.send_invite to presence_handler.send_presence_invite to distinguish it from normal invites
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/presence.py2
-rw-r--r--synapse/rest/client/v1/presence.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index aca65096fc..e95e821c9a 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -467,7 +467,7 @@ class PresenceHandler(BaseHandler):
             )
 
     @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"""
         if not self.hs.is_mine(observer_user):
             raise SynapseError(400, "User is not hosted on this Home Server")
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py
index 6fe5d19a22..48533f9d60 100644
--- a/synapse/rest/client/v1/presence.py
+++ b/synapse/rest/client/v1/presence.py
@@ -120,7 +120,7 @@ class PresenceListRestServlet(ClientV1RestServlet):
                 if len(u) == 0:
                     continue
                 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
                 )