diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index df98e39f69..7c89150d99 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -20,17 +20,11 @@ from ._base import BaseHandler
from synapse.api.errors import SynapseError
import logging
-import json
-import urllib
logger = logging.getLogger(__name__)
-# TODO(erikj): This needs to be factored out somewere
-PREFIX = "/matrix/client/api/v1"
-
-
class DirectoryHandler(BaseHandler):
def __init__(self, hs):
diff --git a/synapse/handlers/login.py b/synapse/handlers/login.py
index ca69829d77..0220fa0604 100644
--- a/synapse/handlers/login.py
+++ b/synapse/handlers/login.py
@@ -16,7 +16,7 @@
from twisted.internet import defer
from ._base import BaseHandler
-from synapse.api.errors import LoginError
+from synapse.api.errors import LoginError, Codes
import bcrypt
import logging
@@ -51,7 +51,7 @@ class LoginHandler(BaseHandler):
user_info = yield self.store.get_user_by_id(user_id=user)
if not user_info:
logger.warn("Attempted to login as %s but they do not exist.", user)
- raise LoginError(403, "")
+ raise LoginError(403, "", errcode=Codes.FORBIDDEN)
stored_hash = user_info[0]["password_hash"]
if bcrypt.checkpw(password, stored_hash):
@@ -62,4 +62,4 @@ class LoginHandler(BaseHandler):
defer.returnValue(token)
else:
logger.warn("Failed password login for user %s", user)
- raise LoginError(403, "")
\ No newline at end of file
+ raise LoginError(403, "", errcode=Codes.FORBIDDEN)
\ No newline at end of file
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 8bdb0fe5c7..351ff305dc 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -177,7 +177,9 @@ class PresenceHandler(BaseHandler):
state = self._get_or_offline_usercache(target_user).get_state()
if "mtime" in state:
- state["mtime_age"] = self.clock.time_msec() - state.pop("mtime")
+ state["mtime_age"] = int(
+ self.clock.time_msec() - state.pop("mtime")
+ )
defer.returnValue(state)
@defer.inlineCallbacks
@@ -367,7 +369,9 @@ class PresenceHandler(BaseHandler):
p["observed_user"] = observed_user
p.update(self._get_or_offline_usercache(observed_user).get_state())
if "mtime" in p:
- p["mtime_age"] = self.clock.time_msec() - p.pop("mtime")
+ p["mtime_age"] = int(
+ self.clock.time_msec() - p.pop("mtime")
+ )
defer.returnValue(presence)
@@ -560,7 +564,9 @@ class PresenceHandler(BaseHandler):
if "mtime" in state:
state = dict(state)
- state["mtime_age"] = self.clock.time_msec() - state.pop("mtime")
+ state["mtime_age"] = int(
+ self.clock.time_msec() - state.pop("mtime")
+ )
yield self.federation.send_edu(
destination=destination,
@@ -598,7 +604,9 @@ class PresenceHandler(BaseHandler):
del state["user_id"]
if "mtime_age" in state:
- state["mtime"] = self.clock.time_msec() - state.pop("mtime_age")
+ state["mtime"] = int(
+ self.clock.time_msec() - state.pop("mtime_age")
+ )
statuscache = self._get_or_make_usercache(user)
@@ -720,6 +728,8 @@ class UserPresenceCache(object):
content["user_id"] = user.to_string()
if "mtime" in content:
- content["mtime_age"] = clock.time_msec() - content.pop("mtime")
+ content["mtime_age"] = int(
+ clock.time_msec() - content.pop("mtime")
+ )
return {"type": "m.presence", "content": content}
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 5c1b59dbc9..432d13982a 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -94,10 +94,10 @@ class MessageHandler(BaseHandler):
event.room_id
)
- yield self.hs.get_federation().handle_new_event(event)
-
self.notifier.on_new_room_event(event, store_id)
+ yield self.hs.get_federation().handle_new_event(event)
+
@defer.inlineCallbacks
def get_messages(self, user_id=None, room_id=None, pagin_config=None,
feedback=False):
|
