Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-14 13:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

Run lint fix

Browse source
This commit is contained in:
Tulir Asokan 2020-08-13 13:49:47 +03:00
parent ce02e755c1
commit a77a254b31
3 changed files with 40 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

43
synapse/rest/client/v2_alpha/forward_event.py
View file

@ -16,7 +16,7 @@
import logging
from synapse.api.errors import Codes, SynapseError, AuthError
from synapse.api.errors import AuthError, Codes, SynapseError
from synapse.http.servlet import RestServlet, parse_integer
from synapse.logging.opentracing import set_tag
@ -31,8 +31,10 @@ class RoomEventForwardServlet(RestServlet):
"""
PATTERNS = client_patterns(
("/net.maunium.msc2730/rooms/(?P<room_id>[^/]*)/event/(?P<event_id>[^/]*)"
"/forward/(?P<target_room_id>[^/]*)/(?P<txn_id>.*)"),
(
"/net.maunium.msc2730/rooms/(?P<room_id>[^/]*)/event/(?P<event_id>[^/]*)"
"/forward/(?P<target_room_id>[^/]*)/(?P<txn_id>.*)"
),
releases=(), # This is an unstable feature
)
@ -59,14 +61,23 @@ class RoomEventForwardServlet(RestServlet):
raise SynapseError(404, "Event not found.", errcode=Codes.NOT_FOUND)
if event.is_state():
raise SynapseError(401, "State events cannot be forwarded.",
errcode=self._err_not_forwardable)
raise SynapseError(
401,
"State events cannot be forwarded.",
errcode=self._err_not_forwardable,
)
elif event.redacts:
raise SynapseError(401, "Redaction events cannot be forwarded.",
errcode=self._err_not_forwardable)
raise SynapseError(
401,
"Redaction events cannot be forwarded.",
errcode=self._err_not_forwardable,
)
elif event.internal_metadata.is_redacted():
raise SynapseError(401, "Redacted events cannot be forwarded.",
errcode=self._err_not_forwardable)
raise SynapseError(
401,
"Redacted events cannot be forwarded.",
errcode=self._err_not_forwardable,
)
event_id = event.event_id
event_dict = event.get_dict()
@ -81,8 +92,11 @@ class RoomEventForwardServlet(RestServlet):
is_valid_forward = False
if has_forward_meta and not is_valid_forward:
raise SynapseError(401, "Event contains invalid forward metadata.",
errcode=self._err_not_forwardable)
raise SynapseError(
401,
"Event contains invalid forward metadata.",
errcode=self._err_not_forwardable,
)
elif not has_forward_meta:
content[self._data_key] = event_dict
room_version = await self.store.get_room_version(event.room_id)
@ -101,13 +115,16 @@ class RoomEventForwardServlet(RestServlet):
"valid": True,
"event_id": event_id,
}
}
},
}
if b"ts" in request.args and requester.app_service:
forwarded_event_dict["origin_server_ts"] = parse_integer(request, "ts", 0)
forwarded_event, _ = await self.event_creation_handler.create_and_send_nonmember_event(
(
forwarded_event,
_,
) = await self.event_creation_handler.create_and_send_nonmember_event(
requester, forwarded_event_dict, txn_id=txn_id
)