diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
commit | faee41c303c51f2d0ba9392643e67a8d100fbfa9 (patch) | |
tree | a586ca2ca460de50eb37c301409ccd97f9f40abf /synapse/server.py | |
parent | Filter room where the user has been banned (diff) | |
parent | Fix bug where we didn't always get 'prev_content' key (diff) | |
download | synapse-faee41c303c51f2d0ba9392643e67a8d100fbfa9.tar.xz |
Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation
Diffstat (limited to 'synapse/server.py')
-rw-r--r-- | synapse/server.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index 83368ea5a7..7c185537aa 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -20,6 +20,7 @@ # Imports required for the default HomeServer() implementation from synapse.federation import initialize_http_replication +from synapse.api.events import serialize_event from synapse.api.events.factory import EventFactory from synapse.notifier import Notifier from synapse.api.auth import Auth @@ -138,6 +139,9 @@ class BaseHomeServer(object): object.""" return RoomID.from_string(s, hs=self) + def serialize_event(self, e): + return serialize_event(self, e) + # Build magic accessors for every dependency for depname in BaseHomeServer.DEPENDENCIES: BaseHomeServer._make_dependency_method(depname) |