diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py
index 089ea8c048..42ec8c6bb8 100644
--- a/synapse/storage/presence.py
+++ b/synapse/storage/presence.py
@@ -19,7 +19,7 @@ from twisted.internet import defer
from synapse.api.constants import PresenceState
from synapse.util import batch_iter
-from synapse.util.caches.descriptors import cached, cachedInlineCallbacks, cachedList
+from synapse.util.caches.descriptors import cached, cachedList
from ._base import SQLBaseStore
@@ -205,87 +205,3 @@ class PresenceStore(SQLBaseStore):
},
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,))
|