mirror of
https://github.com/element-hq/synapse
synced 2024-09-01 11:00:20 +00:00
Correctly send ratelimit and extra_users params
This commit is contained in:
parent
f756f961ea
commit
6b8604239f
2 changed files with 15 additions and 1 deletions
|
@ -583,6 +583,8 @@ class EventCreationHandler(object):
|
|||
requester=requester,
|
||||
event=event,
|
||||
context=context,
|
||||
ratelimit=ratelimit,
|
||||
extra_users=extra_users,
|
||||
)
|
||||
return
|
||||
|
||||
|
|
|
@ -29,7 +29,8 @@ logger = logging.getLogger(__name__)
|
|||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def send_event_to_master(client, host, port, requester, event, context):
|
||||
def send_event_to_master(client, host, port, requester, event, context,
|
||||
ratelimit, extra_users):
|
||||
"""Send event to be handled on the master
|
||||
|
||||
Args:
|
||||
|
@ -39,6 +40,8 @@ def send_event_to_master(client, host, port, requester, event, context):
|
|||
requester (Requester)
|
||||
event (FrozenEvent)
|
||||
context (EventContext)
|
||||
ratelimit (bool)
|
||||
extra_users (list(str)): Any extra users to notify about event
|
||||
"""
|
||||
uri = "http://%s:%s/_synapse/replication/send_event" % (host, port,)
|
||||
|
||||
|
@ -48,6 +51,8 @@ def send_event_to_master(client, host, port, requester, event, context):
|
|||
"rejected_reason": event.rejected_reason,
|
||||
"context": context.serialize(event),
|
||||
"requester": requester.serialize(),
|
||||
"ratelimit": ratelimit,
|
||||
"extra_users": extra_users,
|
||||
}
|
||||
|
||||
try:
|
||||
|
@ -74,6 +79,8 @@ class ReplicationSendEventRestServlet(RestServlet):
|
|||
"rejected_reason": .., // The event.rejected_reason field
|
||||
"context": { .. serialized event context .. },
|
||||
"requester": { .. serialized requester .. },
|
||||
"ratelimit": true,
|
||||
"extra_users": [],
|
||||
}
|
||||
"""
|
||||
PATTERNS = [re.compile("^/_synapse/replication/send_event$")]
|
||||
|
@ -98,6 +105,9 @@ class ReplicationSendEventRestServlet(RestServlet):
|
|||
requester = Requester.deserialize(self.store, content["requester"])
|
||||
context = yield EventContext.deserialize(self.store, content["context"])
|
||||
|
||||
ratelimit = content["ratelimit"]
|
||||
extra_users = content["extra_users"]
|
||||
|
||||
if requester.user:
|
||||
request.authenticated_entity = requester.user.to_string()
|
||||
|
||||
|
@ -108,6 +118,8 @@ class ReplicationSendEventRestServlet(RestServlet):
|
|||
|
||||
yield self.event_creation_handler.persist_and_notify_client_event(
|
||||
requester, event, context,
|
||||
ratelimit=ratelimit,
|
||||
extra_users=extra_users,
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
|
|
Loading…
Reference in a new issue