Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-11 02:34:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Browse source
This commit is contained in:
Erik Johnston 2014-08-18 11:14:57 +01:00
commit 1c2caacd67
17 changed files with 1232 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

9
synapse/handlers/presence.py
View file

@ -166,17 +166,22 @@ class PresenceHandler(BaseHandler):
observed_user=target_user
)
if visible:
if visible or True: # XXX: FIXME: Bodge to unbreak matrix.org. breaks UTs.
state = yield self.store.get_presence_state(
target_user.localpart
)
else:
# FIXME: *Surely* we shouldn't be 404ing the whole request, whatever
# it is, just because presence info isn't visible?!
# This causes client/api/v1/rooms/!cURbafjkfsMDVwdRDQ%3Amatrix.org/members/list
# to 404 currently
raise SynapseError(404, "Presence information not visible")
else:
# TODO(paul): Have remote server send us permissions set
state = self._get_or_offline_usercache(target_user).get_state()
if "mtime" in state:
if "mtime" in state and (state["mtime"] is not None):
state["mtime_age"] = int(
self.clock.time_msec() - state.pop("mtime")
)

1
synapse/storage/presence.py
View file

@ -67,6 +67,7 @@ class PresenceStore(SQLBaseStore):
table="presence_allow_inbound",
keyvalues={"observed_user_id": observed_localpart,
"observer_user_id": observer_userid},
retcols=["observed_user_id"],
allow_none=True,
)