delete all the things

4 files changed, 0 insertions, 320 deletions

diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 36bda0eff0..d3b8b813cb 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -113,27 +113,6 @@ class PresenceHandler(object):
         federation_registry.register_edu_handler(
             "m.presence", self.incoming_presence
         )
-        # federation_registry.register_edu_handler(
-        #     "m.presence_invite",
-        #     lambda origin, content: self.invite_presence(
-        #         observed_user=UserID.from_string(content["observed_user"]),
-        #         observer_user=UserID.from_string(content["observer_user"]),
-        #     )
-        # )
-        # federation_registry.register_edu_handler(
-        #     "m.presence_accept",
-        #     lambda origin, content: self.accept_presence(
-        #         observed_user=UserID.from_string(content["observed_user"]),
-        #         observer_user=UserID.from_string(content["observer_user"]),
-        #     )
-        # )
-        # federation_registry.register_edu_handler(
-        #     "m.presence_deny",
-        #     lambda origin, content: self.deny_presence(
-        #         observed_user=UserID.from_string(content["observed_user"]),
-        #         observer_user=UserID.from_string(content["observer_user"]),
-        #     )
-        # )
 
         active_presence = self.store.take_presence_startup_info()
 
@@ -759,137 +738,6 @@ class PresenceHandler(object):
 
         yield self._update_states([prev_state.copy_and_replace(**new_fields)])
 
-    # @defer.inlineCallbacks
-    # def get_presence_list(self, observer_user, accepted=None):
-    #     """Returns the presence for all users in their presence list.
-    #     """
-    #     if not self.is_mine(observer_user):
-    #         raise SynapseError(400, "User is not hosted on this Home Server")
-
-    #     presence_list = yield self.store.get_presence_list(
-    #         observer_user.localpart, accepted=accepted
-    #     )
-
-    #     results = yield self.get_states(
-    #         target_user_ids=[row["observed_user_id"] for row in presence_list],
-    #         as_event=False,
-    #     )
-
-    #     now = self.clock.time_msec()
-    #     results[:] = [format_user_presence_state(r, now) for r in results]
-
-    #     is_accepted = {
-    #         row["observed_user_id"]: row["accepted"] for row in presence_list
-    #     }
-
-    #     for result in results:
-    #         result.update({
-    #             "accepted": is_accepted,
-    #         })
-
-    #     defer.returnValue(results)
-
-    # @defer.inlineCallbacks
-    # def send_presence_invite(self, observer_user, observed_user):
-    #     """Sends a presence invite.
-    #     """
-    #     yield self.store.add_presence_list_pending(
-    #         observer_user.localpart, observed_user.to_string()
-    #     )
-
-    #     if self.is_mine(observed_user):
-    #         yield self.invite_presence(observed_user, observer_user)
-    #     else:
-    #         yield self.federation.build_and_send_edu(
-    #             destination=observed_user.domain,
-    #             edu_type="m.presence_invite",
-    #             content={
-    #                 "observed_user": observed_user.to_string(),
-    #                 "observer_user": observer_user.to_string(),
-    #             }
-    #         )
-
-    # @defer.inlineCallbacks
-    # def invite_presence(self, observed_user, observer_user):
-    #     """Handles new presence invites.
-    #     """
-    #     if not self.is_mine(observed_user):
-    #         raise SynapseError(400, "User is not hosted on this Home Server")
-
-    #     # TODO: Don't auto accept
-    #     if self.is_mine(observer_user):
-    #         yield self.accept_presence(observed_user, observer_user)
-    #     else:
-    #         self.federation.build_and_send_edu(
-    #             destination=observer_user.domain,
-    #             edu_type="m.presence_accept",
-    #             content={
-    #                 "observed_user": observed_user.to_string(),
-    #                 "observer_user": observer_user.to_string(),
-    #             }
-    #         )
-
-    #         state_dict = yield self.get_state(observed_user, as_event=False)
-    #         state_dict = format_user_presence_state(state_dict, self.clock.time_msec())
-
-    #         self.federation.build_and_send_edu(
-    #             destination=observer_user.domain,
-    #             edu_type="m.presence",
-    #             content={
-    #                 "push": [state_dict]
-    #             }
-    #         )
-
-    # @defer.inlineCallbacks
-    # def accept_presence(self, observed_user, observer_user):
-    #     """Handles a m.presence_accept EDU. Mark a presence invite from a
-    #     local or remote user as accepted in a local user's presence list.
-    #     Starts polling for presence updates from the local or remote user.
-    #     Args:
-    #         observed_user(UserID): The user to update in the presence list.
-    #         observer_user(UserID): The owner of the presence list to update.
-    #     """
-    #     yield self.store.set_presence_list_accepted(
-    #         observer_user.localpart, observed_user.to_string()
-    #     )
-
-    # @defer.inlineCallbacks
-    # def deny_presence(self, observed_user, observer_user):
-    #     """Handle a m.presence_deny EDU. Removes a local or remote user from a
-    #     local user's presence list.
-    #     Args:
-    #         observed_user(UserID): The local or remote user to remove from the
-    #             list.
-    #         observer_user(UserID): The local owner of the presence list.
-    #     Returns:
-    #         A Deferred.
-    #     """
-    #     yield self.store.del_presence_list(
-    #         observer_user.localpart, observed_user.to_string()
-    #     )
-
-        # TODO(paul): Inform the user somehow?
-
-    # @defer.inlineCallbacks
-    # def drop(self, observed_user, observer_user):
-    #     """Remove a local or remote user from a local user's presence list and
-    #     unsubscribe the local user from updates that user.
-    #     Args:
-    #         observed_user(UserId): The local or remote user to remove from the
-    #             list.
-    #         observer_user(UserId): The local owner of the presence list.
-    #     Returns:
-    #         A Deferred.
-    #     """
-    #     if not self.is_mine(observer_user):
-    #         raise SynapseError(400, "User is not hosted on this Home Server")
-
-    #     yield self.store.del_presence_list(
-    #         observer_user.localpart, observed_user.to_string()
-    #     )
-
-    #     # TODO: Inform the remote that we've dropped the presence list.
-
     @defer.inlineCallbacks
     def is_visible(self, observed_user, observer_user):
         """Returns whether a user can see another user's presence.
@@ -904,10 +752,6 @@ class PresenceHandler(object):
         if observer_room_ids & observed_room_ids:
             defer.returnValue(True)
 
-        # accepted_observers = yield self.store.get_presence_list_observers_accepted(
-        #     observed_user.to_string()
-        # )
-
         defer.returnValue(False)
 
     @defer.inlineCallbacks
@@ -1204,10 +1048,6 @@ class PresenceEventSource(object):
         updates for
         """
         user_id = user.to_string()
-        # plist = yield self.store.get_presence_list_accepted(
-        #     user.localpart, on_invalidate=cache_context.invalidate,
-        # )
-        # users_interested_in = set(row["observed_user_id"] for row in plist)
         users_interested_in = set()
         users_interested_in.add(user_id)  # So that we receive our own presence
 
diff --git a/synapse/replication/slave/storage/presence.py b/synapse/replication/slave/storage/presence.py
index 8a23479ad1..0ec1db25ce 100644
--- a/synapse/replication/slave/storage/presence.py
+++ b/synapse/replication/slave/storage/presence.py
@@ -39,16 +39,6 @@ class SlavedPresenceStore(BaseSlavedStore):
     _get_presence_for_user = PresenceStore.__dict__["_get_presence_for_user"]
     get_presence_for_users = PresenceStore.__dict__["get_presence_for_users"]
 
-    # XXX: This is a bit broken because we don't persist the accepted list in a
-    # way that can be replicated. This means that we don't have a way to
-    # invalidate the cache correctly.
-    # get_presence_list_accepted = PresenceStore.__dict__[
-    #     "get_presence_list_accepted"
-    # ]
-    # get_presence_list_observers_accepted = PresenceStore.__dict__[
-    #     "get_presence_list_observers_accepted"
-    # ]
-
     def get_current_presence_token(self):
         return self._presence_id_gen.get_current_token()
 
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py
index 2e805e6773..279ed56928 100644
--- a/synapse/rest/client/v1/presence.py
+++ b/synapse/rest/client/v1/presence.py
@@ -92,73 +92,5 @@ class PresenceStatusRestServlet(ClientV1RestServlet):
     def on_OPTIONS(self, request):
         return (200, {})
 
-
-class PresenceListRestServlet(ClientV1RestServlet):
-    PATTERNS = client_path_patterns("/presence/list/(?P<user_id>[^/]*)")
-
-    def __init__(self, hs):
-        super(PresenceListRestServlet, self).__init__(hs)
-        self.presence_handler = hs.get_presence_handler()
-
-    # @defer.inlineCallbacks
-    # def on_GET(self, request, user_id):
-    #     requester = yield self.auth.get_user_by_req(request)
-    #     user = UserID.from_string(user_id)
-
-    #     if not self.hs.is_mine(user):
-    #         raise SynapseError(400, "User not hosted on this Home Server")
-
-    #     if requester.user != user:
-    #         raise SynapseError(400, "Cannot get another user's presence list")
-
-    #     presence = yield self.presence_handler.get_presence_list(
-    #         observer_user=user, accepted=True
-    #     )
-
-    #     defer.returnValue((200, presence))
-
-    # @defer.inlineCallbacks
-    # def on_POST(self, request, user_id):
-    #     requester = yield self.auth.get_user_by_req(request)
-    #     user = UserID.from_string(user_id)
-
-    #     if not self.hs.is_mine(user):
-    #         raise SynapseError(400, "User not hosted on this Home Server")
-
-    #     if requester.user != user:
-    #         raise SynapseError(
-    #             400, "Cannot modify another user's presence list")
-
-    #     content = parse_json_object_from_request(request)
-
-    #     if "invite" in content:
-    #         for u in content["invite"]:
-    #             if not isinstance(u, string_types):
-    #                 raise SynapseError(400, "Bad invite value.")
-    #             if len(u) == 0:
-    #                 continue
-    #             invited_user = UserID.from_string(u)
-    #             yield self.presence_handler.send_presence_invite(
-    #                 observer_user=user, observed_user=invited_user
-    #             )
-
-    #     # if "drop" in content:
-    #     #     for u in content["drop"]:
-    #     #         if not isinstance(u, string_types):
-    #     #             raise SynapseError(400, "Bad drop value.")
-    #     #         if len(u) == 0:
-    #     #             continue
-    #     #         dropped_user = UserID.from_string(u)
-    #     #         yield self.presence_handler.drop(
-    #     #             observer_user=user, observed_user=dropped_user
-    #     #         )
-
-    #     defer.returnValue((200, {}))
-
-    def on_OPTIONS(self, request):
-        return (200, {})
-
-
 def register_servlets(hs, http_server):
     PresenceStatusRestServlet(hs).register(http_server)
-    PresenceListRestServlet(hs).register(http_server)
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py
index 656fa805b4..18a148883f 100644
--- a/synapse/storage/presence.py
+++ b/synapse/storage/presence.py
@@ -193,85 +193,3 @@ class PresenceStore(SQLBaseStore):
                        "observer_user_id": observer_userid},
             desc="disallow_presence_visible",
         )
-
-    # def add_presence_list_pending(self, observer_localpart, observed_userid):
-    #     return self._simple_insert(
-    #         table="presence_list",
-    #         values={"user_id": observer_localpart,
-    #                 "observed_user_id": observed_userid,
-    #                 "accepted": False},
-    #         desc="add_presence_list_pending",
-    #     )
-
-    # def set_presence_list_accepted(self, observer_localpart, observed_userid):
-    #     def update_presence_list_txn(txn):
-    #         result = self._simple_update_one_txn(
-    #             txn,
-    #             table="presence_list",
-    #             keyvalues={
-    #                 "user_id": observer_localpart,
-    #                 "observed_user_id": observed_userid
-    #             },
-    #             updatevalues={"accepted": True},
-    #         )
-
-    #         self._invalidate_cache_and_stream(
-    #             txn, self.get_presence_list_accepted, (observer_localpart,)
-    #         )
-    #         self._invalidate_cache_and_stream(
-    #             txn, self.get_presence_list_observers_accepted, (observed_userid,)
-    #         )
-
-    #         return result
-
-    #     return self.runInteraction(
-    #         "set_presence_list_accepted", update_presence_list_txn,
-    #     )
-
-    # def get_presence_list(self, observer_localpart, accepted=None):
-    #     if accepted:
-    #         return self.get_presence_list_accepted(observer_localpart)
-    #     else:
-    #         keyvalues = {"user_id": observer_localpart}
-    #         if accepted is not None:
-    #             keyvalues["accepted"] = accepted
-
-    #         return self._simple_select_list(
-    #             table="presence_list",
-    #             keyvalues=keyvalues,
-    #             retcols=["observed_user_id", "accepted"],
-    #             desc="get_presence_list",
-    #         )
-
-    # @cached()
-    # def get_presence_list_accepted(self, observer_localpart):
-    #     return self._simple_select_list(
-    #         table="presence_list",
-    #         keyvalues={"user_id": observer_localpart, "accepted": True},
-    #         retcols=["observed_user_id", "accepted"],
-    #         desc="get_presence_list_accepted",
-    #     )
-
-    # @cachedInlineCallbacks()
-    # def get_presence_list_observers_accepted(self, observed_userid):
-    #     user_localparts = yield self._simple_select_onecol(
-    #         table="presence_list",
-    #         keyvalues={"observed_user_id": observed_userid, "accepted": True},
-    #         retcol="user_id",
-    #         desc="get_presence_list_accepted",
-    #     )
-
-    #     defer.returnValue([
-    #         "@%s:%s" % (u, self.hs.hostname,) for u in user_localparts
-    #     ])
-
-    # @defer.inlineCallbacks
-    # def del_presence_list(self, observer_localpart, observed_userid):
-    #     yield self._simple_delete_one(
-    #         table="presence_list",
-    #         keyvalues={"user_id": observer_localpart,
-    #                    "observed_user_id": observed_userid},
-    #         desc="del_presence_list",
-    #     )
-    #     self.get_presence_list_accepted.invalidate((observer_localpart,))
-    #     self.get_presence_list_observers_accepted.invalidate((observed_userid,))