Commit Graph

1831 Commits

Author SHA1 Message Date
Erik Johnston
493055731e Fix tests from prev commit 2014-11-19 18:00:07 +00:00
Erik Johnston
415ddf59bb Don't add a 'prev' key to m.room.member messages 2014-11-19 17:59:51 +00:00
Paul "LeoNerd" Evans
03dc63f6c8 Initialise UserPresenceCache instances to always contain a 'presence' key 2014-11-19 17:31:46 +00:00
Erik Johnston
4eada9a908 Fix backfill request 2014-11-19 17:22:37 +00:00
Erik Johnston
512993b57f Only users can set state events which have their own user_id 2014-11-19 17:22:37 +00:00
Mark Haines
ca91bb2f7f Sometimes there isn't a current logging context 2014-11-19 17:18:55 +00:00
Mark Haines
8993affdc0 SYN-153: Raise 404 if room alias is not found 2014-11-19 17:14:14 +00:00
Mark Haines
ff23e5ba37 remove demo webserver since synapse serves up the webclient itself 2014-11-19 16:45:25 +00:00
Mark Haines
0d1221155e remove unused import 2014-11-19 16:40:01 +00:00
Mark Haines
c5eabe3143 replace user_id with sender 2014-11-19 16:38:40 +00:00
Mark Haines
97c7c34f6f Preserve logging context in a few more places, drop the logging context after it has been stashed to reduce potential for confusion 2014-11-19 16:37:43 +00:00
Mark Haines
3e54d70ae2 SYN-141: Encode query params as UTF-8. 2014-11-18 19:43:08 +00:00
Matthew Hodgson
a7f470d1d9 more README fixes 2014-11-18 11:23:17 -08:00
Mark Haines
428581dd05 SYN-144: Remove bad keys from pdu json objects, convert age_ts to age
for all pdus sent.
2014-11-18 19:20:25 +00:00
Paul "LeoNerd" Evans
572a1ca42a Remember also to UTF-8 decode bytes in room alias names in directory server URLs 2014-11-18 18:06:35 +00:00
Paul "LeoNerd" Evans
3bfc3dd45b Remember to URL decode the room_id in room initialSync 2014-11-18 17:44:55 +00:00
Mark Haines
db7e8b5619 SYN-141: Decode the query params as UTF-8 2014-11-18 17:17:57 +00:00
Mark Haines
54c438d8d3 Remove unused variable 2014-11-18 16:46:12 +00:00
Mark Haines
1731af3f29 SYN-104: When going backwards the end token should be before the last event 2014-11-18 16:45:06 +00:00
Paul Evans
11fd81e398 Merge pull request #17 from matrix-org/room-initial-sync
Room initial sync
2014-11-18 16:44:25 +00:00
Paul "LeoNerd" Evans
88dfa7baa6 Ensure to parse a real pagination config object out of room initialSync request and pass it on 2014-11-18 16:34:43 +00:00
Paul "LeoNerd" Evans
75e95c45a2 Rename message handler's new snapshot_room to room_initial_sync() as that better suits its purpose 2014-11-18 16:02:44 +00:00
Erik Johnston
c6ea29d916 Revert accidental commit of bad file 2014-11-18 15:57:00 +00:00
Paul "LeoNerd" Evans
e9f587ecba Merge remote-tracking branch 'origin/develop' into room-initial-sync 2014-11-18 15:48:30 +00:00
Mark Haines
3553101eb3 Null check when determining default power levels 2014-11-18 15:43:17 +00:00
Mark Haines
b01dd76be1 SYN-149: Enable auth for events added during room creation since they should pass auth checks 2014-11-18 15:42:53 +00:00
Erik Johnston
95614e5220 Fix auth to correctly handle initial creation of rooms 2014-11-18 15:36:41 +00:00
Mark Haines
ae9c2ab165 SYN-149: Send join event immediately after the room create event 2014-11-18 15:29:48 +00:00
Paul "LeoNerd" Evans
33d328d967 Include room members' presence in room initialSync 2014-11-18 15:28:58 +00:00
Paul "LeoNerd" Evans
759db7d7d5 Added ability to .get_state() from the PresenceHandler by returning a complete m.presence event 2014-11-18 15:25:55 +00:00
Paul "LeoNerd" Evans
4c18e08036 Don't expect all _user_cachemap entries to definitely contain a "last_active" key 2014-11-18 15:10:11 +00:00
Mark Haines
a5b88c489e Split out sending the room alias events from creating the alias so that we can do them in the right point when creating a room 2014-11-18 15:03:13 +00:00
Paul "LeoNerd" Evans
17f977a9de Include 'messages' snapshot in room initialSync 2014-11-18 14:07:51 +00:00
Matthew Hodgson
c571dd4f0e warn about memory 2014-11-17 11:44:53 -08:00
Matthew Hodgson
94ed41f236 update the README.rst to reflect the develop branch 2014-11-17 11:42:27 -08:00
Mark Haines
26fc878944 Stop before starting when restarting 2014-11-17 19:16:15 +00:00
Matthew Hodgson
b57e9f58fd yet another installation gotcha 2014-11-17 11:11:35 -08:00
Matthew Hodgson
d18fc97717 Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop 2014-11-17 11:11:15 -08:00
Matthew Hodgson
b80d1925ff clarify install instructions further still 2014-11-17 10:52:12 -08:00
Paul "LeoNerd" Evans
31a049eb69 Merge branch 'develop' into room-initial-sync
Conflicts:
	synapse/handlers/message.py
2014-11-17 16:59:24 +00:00
Mark Haines
cf45e57d9c SYN-148: Add the alias after creating the room 2014-11-17 16:37:33 +00:00
Mark Haines
1b91c26409 Mark synapse as not zip-safe since it needs to be able to read schema files from the filesystem 2014-11-17 16:36:24 +00:00
Mark Haines
5d273a0c76 Remove syweb directory. pull in syweb as a dependency from github 2014-11-17 12:55:24 +00:00
Kegan Dougal
da6df07a9d SYWEB-152: Remove room join logic from RoomController and put it in eventHandlerService.joinRoom. 2014-11-17 11:04:10 +00:00
Kegan Dougal
7799e14121 Add clearRooms() to wipe data when you logout. 2014-11-17 11:04:10 +00:00
Mark Haines
2eaf689f71 These lines aren't doing anything 2014-11-17 10:41:35 +00:00
Erik Johnston
8c45c8b8b9 Merge pull request #14 from matrix-org/merge_pdu_event_objects
Merge pdu and event objects
2014-11-17 10:29:23 +00:00
Mark Haines
1d3ef8734c Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects 2014-11-17 10:21:51 +00:00
Kegan Dougal
547adda446 Move getLastMessage to modelService. 2014-11-17 10:04:36 +00:00
Kegan Dougal
fbf8003237 s/eventHandlerService.getUsersCountInRoom/modelService.getUserCountInRoom/g 2014-11-17 09:33:22 +00:00