diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
| commit | 897c51d2742bead151a6306cd236b517982b8a69 (patch) | |
| tree | 75f588d3949381a3d049eb5f192dba4ded09d0ec /synapse/rest/client/v1/room.py | |
| parent | update generate_monthly_active_users, and reap_monthly_active_users (diff) | |
| parent | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff) | |
| download | synapse-897c51d2742bead151a6306cd236b517982b8a69.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 13c331550b..fa5989e74e 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -506,7 +506,7 @@ class RoomEventServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id, event_id): requester = yield self.auth.get_user_by_req(request) - event = yield self.event_handler.get_event(requester.user, event_id) + event = yield self.event_handler.get_event(requester.user, room_id, event_id) time_now = self.clock.time_msec() if event: |