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

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Browse source 
Conflicts:
	synapse/storage/stream.py
This commit is contained in:
Erik Johnston 2014-08-15 11:50:14 +01:00
commit d72f897f07
47 changed files with 716 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/handlers/room.py
View file

@ -94,10 +94,10 @@ class MessageHandler(BaseHandler):
event.room_id
)
yield self.hs.get_federation().handle_new_event(event)
self.notifier.on_new_room_event(event, store_id)
yield self.hs.get_federation().handle_new_event(event)
@defer.inlineCallbacks
def get_messages(self, user_id=None, room_id=None, pagin_config=None,
feedback=False):