diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-01-27 13:11:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-01-27 13:11:03 +0000 |
| commit | 0484d7f6e98507d7c2138aa7959e722912bb4769 (patch) | |
| tree | c567e8ea0586fa33a6ff2499855ee9b1a89a4ca4 /synapse/handlers/room.py | |
| parent | Minor changes to v2_alpha filter REST test to allow the setUp method to be sh... (diff) | |
| parent | Initial cut of a shared base class for REST unit tests (diff) | |
| download | synapse-0484d7f6e98507d7c2138aa7959e722912bb4769.tar.xz | |
Merge branch 'develop' into client_v2_filter
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index edb96cec83..23821d321f 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -16,12 +16,14 @@ """Contains functions for performing events on rooms.""" from twisted.internet import defer +from ._base import BaseHandler + from synapse.types import UserID, RoomAlias, RoomID from synapse.api.constants import EventTypes, Membership, JoinRules from synapse.api.errors import StoreError, SynapseError from synapse.util import stringutils from synapse.util.async import run_on_reactor -from ._base import BaseHandler +from synapse.events.utils import serialize_event import logging @@ -293,8 +295,9 @@ class RoomMemberHandler(BaseHandler): yield self.auth.check_joined_room(room_id, user_id) member_list = yield self.store.get_room_members(room_id=room_id) + time_now = self.clock.time_msec() event_list = [ - self.hs.serialize_event(entry) + serialize_event(entry, time_now) for entry in member_list ] chunk_data = { |