1
0

Commit Graph

  • 823999716e Fix bug in timeout handling in keyclient Erik Johnston 2015-01-30 11:07:57 +00:00
  • c1d860870b Fix regression where we no longer correctly handled the case of gaps in our event graph Erik Johnston 2015-01-30 10:48:47 +00:00
  • c1c7b39827 Fix bug where we changes in outlier in metadata dict propogated to other events Erik Johnston 2015-01-30 10:30:54 +00:00
  • fc946f3b8d Include content in notification pokes David Baker 2015-01-29 21:59:17 +00:00
  • 0b16886397 Change 'from' in notification pokes to 'sender' to match client API v2. Send sender display names where they exist. David Baker 2015-01-29 18:51:22 +00:00
  • 1235f7f383 Add default push rules including setting a sound for messages mentioning your username / display name David Baker 2015-01-29 18:38:22 +00:00
  • ece828a7b7 Update todo for the filtering on sync Mark Haines 2015-01-29 18:15:24 +00:00
  • 365a186729 Add basic filtering support Mark Haines 2015-01-29 18:11:28 +00:00
  • 7ceda8bf3d Merge branch 'client_v2_filter' into client_v2_sync Mark Haines 2015-01-29 18:04:07 +00:00
  • 93ed31dda2 Create a separate filter object to do the actual filtering, so that we can split the storage and management of filters from the actual filter code and don't have to load a filter from the db each time we filter an event Mark Haines 2015-01-29 17:41:48 +00:00
  • 4bdfce30d7 Renumber priority classes so we can use 0 for defaults. David Baker 2015-01-29 17:12:11 +00:00
  • e0d2c6889b Allow kind to be set to null to delete a pusher. David Baker 2015-01-29 17:04:31 +00:00
  • 78015948a7 Initial implementation of auth conflict resolution Erik Johnston 2015-01-29 16:50:23 +00:00
  • 4ad45f2582 Fix indent Mark Haines 2015-01-29 16:41:49 +00:00
  • 722b65f461 Move typing notifs to an "emphermal" event list on the room object Mark Haines 2015-01-29 16:41:21 +00:00
  • cc42d3f907 Fix check for empty room update Mark Haines 2015-01-29 16:27:38 +00:00
  • 4d9dd9bdc0 Fix v2 initial sync Mark Haines 2015-01-29 16:23:03 +00:00
  • 8e571cbed8 Merge branch 'client_v2_filter' into client_v2_sync Mark Haines 2015-01-29 16:18:59 +00:00
  • 295322048d Merge branch 'develop' into client_v2_filter Mark Haines 2015-01-29 16:18:34 +00:00
  • acb68a39e0 Code style fixes. Mark Haines 2015-01-29 16:10:35 +00:00
  • 8b1dd9f57f Only send a badge-reset if the user actually has unread notifications. David Baker 2015-01-29 16:10:01 +00:00
  • 9150a0d62e Fix code-style Mark Haines 2015-01-29 16:01:14 +00:00
  • cf7c54ec93 Merge branch 'client_v2_filter' into client_v2_sync Mark Haines 2015-01-29 15:55:58 +00:00
  • 33391db5f8 Merge in auth changes from develop Mark Haines 2015-01-29 15:54:54 +00:00
  • 396a67a09a Merge branch 'client_v2_filter' into client_v2_sync Mark Haines 2015-01-29 14:58:00 +00:00
  • 9d8f798a3f Merge changes from develop Mark Haines 2015-01-29 14:55:27 +00:00
  • e4f50fa0aa Move bump schema delta Mark Haines 2015-01-29 14:53:18 +00:00
  • e016f4043b Use get_room_events_stream to get changes to the rooms if the number of changes is small Mark Haines 2015-01-29 14:40:28 +00:00
  • 38b27bd2cb Add filter_room_state unit tests. Kegan Dougal 2015-01-29 14:28:34 +00:00
  • 5a3a15f5c1 Make post_json(...) actually send data. Erik Johnston 2015-01-29 13:58:22 +00:00
  • c183cec8f6 Add post_json(...) method to federation client Erik Johnston 2015-01-29 13:44:52 +00:00
  • 83172487b0 Add basic filtering public API unit tests. Use defers in the right places. Kegan Dougal 2015-01-29 12:20:59 +00:00
  • 5561a87920 Add more unit tests for the filter algorithm. Kegan Dougal 2015-01-29 12:06:16 +00:00
  • 777d9914b5 Implement filter algorithm. Add basic event type unit tests to assert it works. Kegan Dougal 2015-01-29 11:38:06 +00:00
  • 50de1eaad9 Add filtering public API; outline filtering algorithm. Kegan Dougal 2015-01-29 10:24:57 +00:00
  • 2a4fda7b88 Add filtering.filter_events function, with stub passes_filter function. Kegan Dougal 2015-01-29 09:27:16 +00:00
  • 3773759c0f Also edit the filter column on the delta SQL Kegan Dougal 2015-01-29 09:15:33 +00:00
  • e3e72b8c5c Remove typing TODO Mark Haines 2015-01-29 03:35:25 +00:00
  • 3dbce6f4a5 Add typing notifications to sync Mark Haines 2015-01-29 03:33:51 +00:00
  • b9c442c85c Include transaction ids in unsigned section of events in the sync results for the clients that made those requests Mark Haines 2015-01-29 02:45:33 +00:00
  • 1b4a164c02 Add support for formatting events in the way a v2 client expects Mark Haines 2015-01-29 02:34:35 +00:00
  • b0b80074e0 SYN-252: Supply the stream and topological parts in the correct order to the constructor Mark Haines 2015-01-29 01:48:36 +00:00
  • d5bdf3c0c7 Allow the push rule delete method to take more specifiers. David Baker 2015-01-28 18:06:04 +00:00
  • 8552ed8df2 Change uses of get_user_by_req because it returns a tuple now. David Baker 2015-01-28 18:04:40 +00:00
  • 11634017f4 s/definition/filter_json/ since definition is now used to mean a component of the filter, rather than the complete json Kegan Dougal 2015-01-28 17:42:19 +00:00
  • c81a19552f Add ports back to demo/start.sh Mark Haines 2015-01-28 17:32:41 +00:00
  • 9c61556504 Merge branch 'develop' into client_v2_sync Mark Haines 2015-01-28 17:29:30 +00:00
  • 26c8fff19e Merge pull request #36 from matrix-org/device_id_from_access_token Mark Haines 2015-01-28 17:19:28 +00:00
  • 3cca61e006 Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier Mark Haines 2015-01-28 17:16:12 +00:00
  • c18e551640 Add a : to the doc string after the type of the return value Mark Haines 2015-01-28 17:08:53 +00:00
  • 388581e087 Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events Mark Haines 2015-01-28 16:58:23 +00:00
  • c23e3db544 Add filter JSON sanity checks. Kegan Dougal 2015-01-28 16:45:18 +00:00
  • 0ef5bfd6a9 Start implementing auth conflict res Erik Johnston 2015-01-28 16:16:53 +00:00
  • 6840e7cece Merge branch 'master' into develop David Baker 2015-01-28 16:03:35 +00:00
  • 60b143a52e Move pushers delta to v12 and bump schema version David Baker 2015-01-28 15:48:28 +00:00
  • c59bcabf0b Return the device_id from get_auth_by_req Mark Haines 2015-01-28 15:36:21 +00:00
  • fddc7a080a Merge pull request #35 from matrix-org/pushers2 David Baker 2015-01-28 15:41:24 +00:00
  • e78dd33292 Use %s instead of + David Baker 2015-01-28 14:52:58 +00:00
  • 93aac9bb7b Newline David Baker 2015-01-28 14:51:01 +00:00
  • 445ad9941e Redundant parens David Baker 2015-01-28 14:49:59 +00:00
  • 6d485dd1c7 unnecessary newlines David Baker 2015-01-28 14:48:42 +00:00
  • fb0928097a More magic commas (including the place I copied it from...) David Baker 2015-01-28 14:48:07 +00:00
  • 0cbb6b0f52 Google doc style David Baker 2015-01-28 14:44:41 +00:00
  • 2cfdfee572 spaces David Baker 2015-01-28 14:41:51 +00:00
  • 289a249874 Unnecessary newlines. David Baker 2015-01-28 14:39:03 +00:00
  • 3cb5b73c0d Unnecessary newline. David Baker 2015-01-28 14:37:55 +00:00
  • 8807f4170e Better style David Baker 2015-01-28 14:35:00 +00:00
  • 032f8d4ed3 Another superfluous newline David Baker 2015-01-28 14:33:15 +00:00
  • d93ce29a86 Ah, the comma of doom. David Baker 2015-01-28 14:27:01 +00:00
  • 6741c3dbd9 Brackets are nicer David Baker 2015-01-28 14:26:03 +00:00
  • 4fbf2328c2 Unnecessary new line David Baker 2015-01-28 14:24:28 +00:00
  • 30fbba168b Easy on the newlines David Baker 2015-01-28 14:23:16 +00:00
  • dd3abbd61f 2015 David Baker 2015-01-28 14:22:39 +00:00
  • 6fde707add doc style fix David Baker 2015-01-28 14:14:49 +00:00
  • 5f2665320f It is 2015 David Baker 2015-01-28 14:11:45 +00:00
  • 20c47383dc Oops, bad merge: needed to change the base class of the rest servlets too. David Baker 2015-01-28 14:10:46 +00:00
  • 03149ad23a More code style things David Baker 2015-01-28 14:01:24 +00:00
  • e1ca0f1396 Brackets rather than slashes at end David Baker 2015-01-28 13:58:32 +00:00
  • 6df6f5e084 Redundant bracketing & missed space David Baker 2015-01-28 13:56:35 +00:00
  • ca7240a2f0 Update copyright David Baker 2015-01-28 13:17:55 +00:00
  • fb532d8425 Unused import David Baker 2015-01-28 13:06:09 +00:00
  • c291a4d522 Merge branch 'develop' into pushers David Baker 2015-01-28 12:51:05 +00:00
  • 42876969b9 Add basic application_services SQL, and hook up parts of the appservice store to read from it. Kegan Dougal 2015-01-28 11:59:38 +00:00
  • 273b12729b Reset badge count to zero when last active time is bumped David Baker 2015-01-28 11:55:49 +00:00
  • e32ded7b3e Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address). David Baker 2015-01-28 10:09:54 +00:00
  • b46fa8603e Remove unused import Kegan Dougal 2015-01-28 09:17:48 +00:00
  • e020574d65 Fix Formatting Mark Haines 2015-01-27 20:19:36 +00:00
  • b19cf6a105 Wait for events if the incremental sync is empty and a timeout is given Mark Haines 2015-01-27 20:09:52 +00:00
  • 8398f19bce Created schema delta Paul "LeoNerd" Evans 2015-01-27 19:00:09 +00:00
  • 06cc147012 Initial stab at real SQL storage implementation of user filter definitions Paul "LeoNerd" Evans 2015-01-27 18:46:03 +00:00
  • 0c14a699bb More unit-testing of REST errors Paul "LeoNerd" Evans 2015-01-27 18:07:21 +00:00
  • 54e513b4e6 Move storage of user filters into real datastore layer; now have to mock it out in the REST-level tests Paul "LeoNerd" Evans 2015-01-27 17:48:13 +00:00
  • fbeaeb8689 Log when ASes are registered/unregistered. Kegan Dougal 2015-01-27 17:34:40 +00:00
  • ec3719b583 Use ApplicationService when registering. Kegan Dougal 2015-01-27 17:15:06 +00:00
  • 92171f9dd1 Add stub methods, TODOs and docstrings for application services. Kegan Dougal 2015-01-27 16:53:59 +00:00
  • a56008842b Start implementing incremental initial sync Mark Haines 2015-01-27 16:24:22 +00:00
  • 7331d34839 Add AS specific classes with docstrings. Kegan Dougal 2015-01-27 16:23:46 +00:00
  • 059651efa1 Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely Paul "LeoNerd" Evans 2015-01-27 16:17:56 +00:00
  • f7c4daa8f9 Oops, remove debugging David Baker 2015-01-27 16:08:47 +00:00
  • 5eacaeb4a7 or of course we could just return the deferred David Baker 2015-01-27 16:05:23 +00:00