diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-09-15 15:27:58 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-09-15 15:27:58 +0100 |
| commit | 14bc4ed59f0d98e80db96ed8232983f814082305 (patch) | |
| tree | 27e70665764b41f5f16f8662eb1328e2ba20aba7 /synapse/server.py | |
| parent | Update spec to include m.login.email.identity (diff) | |
| parent | Correctly handle the 'age' key in events and pdus (diff) | |
| download | synapse-14bc4ed59f0d98e80db96ed8232983f814082305.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.
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) |