diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-02 15:11:31 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-02 15:11:31 +0000 |
| commit | ddd8566f415ab3a6092aa4947e5d2aebf67109fc (patch) | |
| tree | eab8cc4d46e1ab7446b990d8eb5556e65304c0a1 /synapse/handlers/message.py | |
| parent | Merge branch 'develop' into markjh/room_tags (diff) | |
| download | synapse-ddd8566f415ab3a6092aa4947e5d2aebf67109fc.tar.xz | |
Store room tag content and return the content in the m.tag event
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 8f156e5c84..0f947993d1 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -405,7 +405,6 @@ class MessageHandler(BaseHandler): tags = tags_by_room.get(event.room_id) if tags: private_user_data.append({ - "room_id": event.room_id, "type": "m.tag", "content": {"tags": tags}, }) @@ -466,7 +465,6 @@ class MessageHandler(BaseHandler): private_user_data.append({ "type": "m.tag", "content": {"tags": tags}, - "room_id": room_id, }) result["private_user_data"] = private_user_data @@ -499,8 +497,8 @@ class MessageHandler(BaseHandler): user_id, messages ) - start_token = StreamToken(token[0], 0, 0, 0) - end_token = StreamToken(token[1], 0, 0, 0) + start_token = StreamToken(token[0], 0, 0, 0, 0) + end_token = StreamToken(token[1], 0, 0, 0, 0) time_now = self.clock.time_msec() |