Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2982 from matrix-org/erikj/fix_extra_users 

extra_users is actually a list of UserIDs
This commit is contained in:
Erik Johnston 2018-03-13 13:11:04 +00:00 committed by GitHub
parent da87791975 d0fcc48f9d
commit c82111a55f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/message.py
View File

@ -667,7 +667,7 @@ class EventCreationHandler(object):
event (FrozenEvent) event (FrozenEvent)
context (EventContext) context (EventContext)
ratelimit (bool) ratelimit (bool)
extra_users (list(str)): Any extra users to notify about event extra_users (list(UserID)): Any extra users to notify about event
""" """
try: try:

8
synapse/replication/http/send_event.py
View File

@ -25,7 +25,7 @@ from synapse.util.async import sleep
from synapse.util.caches.response_cache import ResponseCache from synapse.util.caches.response_cache import ResponseCache
from synapse.util.logcontext import make_deferred_yieldable, preserve_fn from synapse.util.logcontext import make_deferred_yieldable, preserve_fn
from synapse.util.metrics import Measure from synapse.util.metrics import Measure
from synapse.types import Requester from synapse.types import Requester, UserID
import logging import logging
import re import re
@ -46,7 +46,7 @@ def send_event_to_master(client, host, port, requester, event, context,
event (FrozenEvent) event (FrozenEvent)
context (EventContext) context (EventContext)
ratelimit (bool) ratelimit (bool)
extra_users (list(str)): Any extra users to notify about event extra_users (list(UserID)): Any extra users to notify about event
""" """
uri = "http://%s:%s/_synapse/replication/send_event/%s" % ( uri = "http://%s:%s/_synapse/replication/send_event/%s" % (
host, port, event.event_id, host, port, event.event_id,
@ -59,7 +59,7 @@ def send_event_to_master(client, host, port, requester, event, context,
"context": context.serialize(event), "context": context.serialize(event),
"requester": requester.serialize(), "requester": requester.serialize(),
"ratelimit": ratelimit, "ratelimit": ratelimit,
"extra_users": extra_users, "extra_users": [u.to_string() for u in extra_users],
} }
try: try:
@ -143,7 +143,7 @@ class ReplicationSendEventRestServlet(RestServlet):
context = yield EventContext.deserialize(self.store, content["context"]) context = yield EventContext.deserialize(self.store, content["context"])
ratelimit = content["ratelimit"] ratelimit = content["ratelimit"]
extra_users = content["extra_users"] extra_users = [UserID.from_string(u) for u in content["extra_users"]]
if requester.user: if requester.user:
request.authenticated_entity = requester.user.to_string() request.authenticated_entity = requester.user.to_string()