mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 11:49:51 -04:00
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
This commit is contained in:
commit
4fb858d90a
@ -296,6 +296,7 @@ class Notifier(object):
|
||||
appservice = yield self.store.get_app_service_by_user_id(user)
|
||||
current_token = yield self.event_sources.get_current_token()
|
||||
rooms = yield self.store.get_rooms_for_user(user)
|
||||
rooms = [room.room_id for room in rooms]
|
||||
user_stream = _NotifierUserStream(
|
||||
user=user,
|
||||
rooms=rooms,
|
||||
|
@ -29,6 +29,8 @@ from synapse.rest.client.v1 import events
|
||||
from synapse.types import UserID
|
||||
from synapse.util.async import run_on_reactor
|
||||
|
||||
from collections import namedtuple
|
||||
|
||||
|
||||
OFFLINE = PresenceState.OFFLINE
|
||||
UNAVAILABLE = PresenceState.UNAVAILABLE
|
||||
@ -302,7 +304,10 @@ class PresenceEventStreamTestCase(unittest.TestCase):
|
||||
return_value=defer.succeed(None)
|
||||
)
|
||||
self.mock_datastore.get_rooms_for_user = (
|
||||
lambda u: get_rooms_for_user(UserID.from_string(u))
|
||||
lambda u: [
|
||||
namedtuple("Room", "room_id")(r)
|
||||
for r in get_rooms_for_user(UserID.from_string(u))
|
||||
]
|
||||
)
|
||||
|
||||
def get_profile_displayname(user_id):
|
||||
|
Loading…
Reference in New Issue
Block a user