Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others

This commit is contained in:
Paul "LeoNerd" Evans 2014-12-12 11:59:46 +00:00
parent 0b70023373
commit b0bb1756a9
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/typing.py
View File

@ -223,7 +223,9 @@ class TypingNotificationEventSource(object):
return {
"type": "m.typing",
"room_id": room_id,
"typing": [u.to_string() for u in typing],
"content": {
"user_ids": [u.to_string() for u in typing],
},
}
def get_new_events_for_user(self, user, from_key, limit):

20
tests/handlers/test_typing.py
View File

@ -182,7 +182,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
[
{"type": "m.typing",
"room_id": self.room_id,
"typing": [self.u_apple.to_string()]},
"content": {
"user_ids": [self.u_apple.to_string()],
}},
]
)
@ -242,7 +244,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
[
{"type": "m.typing",
"room_id": self.room_id,
"typing": [self.u_onion.to_string()]},
"content": {
"user_ids": [self.u_onion.to_string()],
}},
]
)
@ -295,7 +299,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
[
{"type": "m.typing",
"room_id": self.room_id,
"typing": []},
"content": {
"user_ids": [],
}},
]
)
@ -323,7 +329,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
[
{"type": "m.typing",
"room_id": self.room_id,
"typing": [self.u_apple.to_string()]},
"content": {
"user_ids": [self.u_apple.to_string()],
}},
]
)
@ -339,6 +347,8 @@ class TypingNotificationsTestCase(unittest.TestCase):
[
{"type": "m.typing",
"room_id": self.room_id,
"typing": []},
"content": {
"user_ids": [],
}},
]
)

4
tests/rest/test_typing.py
View File

@ -100,7 +100,9 @@ class RoomTypingTestCase(RestTestCase):
[
{"type": "m.typing",
"room_id": self.room_id,
"typing": [self.user_id]},
"content": {
"user_ids": [self.user_id],
}},
]
)