Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-24 11:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove debug try/catch

Browse Source
This commit is contained in:
Erik Johnston 2015-08-18 10:29:49 +01:00
parent 2d97e65558
commit f72ed6c6a3
1 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
synapse/handlers/presence.py
View File

@ -234,64 +234,60 @@ class PresenceHandler(BaseHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
def get_states(self, target_users, auth_user, as_event=False, check_auth=True): def get_states(self, target_users, auth_user, as_event=False, check_auth=True):
try: local_users, remote_users = partitionbool(
local_users, remote_users = partitionbool( target_users,
target_users, lambda u: self.hs.is_mine(u)
lambda u: self.hs.is_mine(u) )
)
if check_auth: if check_auth:
for u in local_users: for u in local_users:
visible = yield self.is_presence_visible( visible = yield self.is_presence_visible(
observer_user=auth_user, observer_user=auth_user,
observed_user=u observed_user=u
)
if not visible:
raise SynapseError(404, "Presence information not visible")
results = {}
if local_users:
for u in local_users:
if u in self._user_cachemap:
results[u] = self._user_cachemap[u].get_state()
local_to_user = {u.localpart: u for u in local_users}
states = yield self.store.get_presence_states(
[u.localpart for u in local_users if u not in results]
) )
for local_part, state in states.items(): if not visible:
res = {"presence": state["state"]} raise SynapseError(404, "Presence information not visible")
if "status_msg" in state and state["status_msg"]:
res["status_msg"] = state["status_msg"]
results[local_to_user[local_part]] = res
for u in remote_users: results = {}
# TODO(paul): Have remote server send us permissions set if local_users:
results[u] = self._get_or_offline_usercache(u).get_state() for u in local_users:
if u in self._user_cachemap:
results[u] = self._user_cachemap[u].get_state()
for state in results.values(): local_to_user = {u.localpart: u for u in local_users}
if "last_active" in state:
state["last_active_ago"] = int( states = yield self.store.get_presence_states(
self.clock.time_msec() - state.pop("last_active") [u.localpart for u in local_users if u not in results]
)
for local_part, state in states.items():
res = {"presence": state["state"]}
if "status_msg" in state and state["status_msg"]:
res["status_msg"] = state["status_msg"]
results[local_to_user[local_part]] = res
for u in remote_users:
# TODO(paul): Have remote server send us permissions set
results[u] = self._get_or_offline_usercache(u).get_state()
for state in results.values():
if "last_active" in state:
state["last_active_ago"] = int(
self.clock.time_msec() - state.pop("last_active")
)
if as_event:
for user, state in results.items():
content = state
content["user_id"] = user.to_string()
if "last_active" in content:
content["last_active_ago"] = int(
self._clock.time_msec() - content.pop("last_active")
) )
if as_event: results[user] = {"type": "m.presence", "content": content}
for user, state in results.items():
content = state
content["user_id"] = user.to_string()
if "last_active" in content:
content["last_active_ago"] = int(
self._clock.time_msec() - content.pop("last_active")
)
results[user] = {"type": "m.presence", "content": content}
except:
logger.exception(":(")
raise
defer.returnValue(results) defer.returnValue(results)