Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-09-04 19:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

flake8

Browse source
This commit is contained in:
Luke Barnard 2017-04-11 17:07:07 +01:00
parent d892079844
commit 0127423027
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/handlers/read_marker.py
View file

@ -17,14 +17,13 @@ from ._base import BaseHandler
from twisted.internet import defer from twisted.internet import defer
from synapse.util.logcontext import PreserveLoggingContext
from synapse.util.async import Linearizer from synapse.util.async import Linearizer
from synapse.types import get_domain_from_id
from synapse.api.errors import SynapseError from synapse.api.errors import SynapseError
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class ReadMarkerHandler(BaseHandler): class ReadMarkerHandler(BaseHandler):
def __init__(self, hs): def __init__(self, hs):
super(ReadMarkerHandler, self).__init__(hs) super(ReadMarkerHandler, self).__init__(hs)

3
synapse/rest/client/v2_alpha/account_data.py
View file

@ -83,7 +83,8 @@ class RoomAccountDataServlet(RestServlet):
body = parse_json_object_from_request(request) body = parse_json_object_from_request(request)
if account_data_type == "m.read_marker": if account_data_type == "m.read_marker":
raise SynapseError(405, raise SynapseError(
405,
"Cannot set m.read_marker through this API. " "Cannot set m.read_marker through this API. "
"Use /rooms/!roomId:server.name/read_marker" "Use /rooms/!roomId:server.name/read_marker"
) )

3
synapse/rest/client/v2_alpha/read_marker.py
View file

@ -15,7 +15,6 @@
from twisted.internet import defer from twisted.internet import defer
from synapse.api.errors import SynapseError
from synapse.http.servlet import RestServlet, parse_json_object_from_request from synapse.http.servlet import RestServlet, parse_json_object_from_request
from ._base import client_v2_patterns from ._base import client_v2_patterns
@ -45,7 +44,7 @@ class ReadMarkerRestServlet(RestServlet):
body = parse_json_object_from_request(request) body = parse_json_object_from_request(request)
if "m.read" in body: if "m.read" in body:
read_event_id = body["m.read"]; read_event_id = body["m.read"]
yield self.receipts_handler.received_client_receipt( yield self.receipts_handler.received_client_receipt(
room_id, room_id,
"m.read", "m.read",