summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-274-9/+27
|\
| * Merge pull request #533 from matrix-org/rav/hashtest_federationRichard van der Hoff2016-01-271-1/+7
| |\ | | | | | | Fix federation for #test:matrix.org
| | * Federation: drop events which cause SynapseErrorsRichard van der Hoff2016-01-271-1/+7
| | | | | | | | | | | | | | | ... rather than rejecting any attempt to federate channels which contain such events.
| * | Merge pull request #531 from matrix-org/markjh/relative_push_rulesMark Haines2016-01-272-6/+12
| |\ \ | | |/ | |/| Fix adding push rules relative to other rules
| | * Fix adding push rules relative to other rulesMark Haines2016-01-272-6/+12
| | |
| * | Merge pull request #529 from matrix-org/dbkr/one_to_one_only_messagesDavid Baker2016-01-261-0/+6
| |\ \ | | |/ | |/| Only notify for messages in one to one rooms, not every event
| | * Only notify for messages in one to one rooms, not every eventDavid Baker2016-01-261-0/+6
| |/ | | | | | | Fixes the fact that candidate events and hangups generated notifications.
| * Merge pull request #528 from matrix-org/markjh/missing_yieldMark Haines2016-01-251-2/+2
| |\ | | | | | | Add missing yield in push_rules set enabled
| | * Add missing yield in push_rules set enabledMark Haines2016-01-251-2/+2
| | |
* | | PEP 8Erik Johnston2016-01-271-1/+0
| | |
* | | Add a Homeserver.setup method.Erik Johnston2016-01-269-116/+121
| | | | | | | | | | | | | | | | | | This is for setting up dependencies that require work on startup. This is useful for the DataStore that wants to read a bunch from the database before initiliazing.
* | | Remove redundated BaseHomeServerErik Johnston2016-01-2612-545/+191
|/ /
* | Merge pull request #524 from matrix-org/erikj/syncErik Johnston2016-01-254-93/+178
|\ \ | | | | | | Move some sync logic from rest to handlers pacakege
| * | PEP8Erik Johnston2016-01-251-1/+0
| | |
| * | Remove weird stuffErik Johnston2016-01-251-6/+0
| | |
| * | Fix testsErik Johnston2016-01-252-7/+5
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-251-3/+7
| |\|
| * | Move logic from rest/ to handlers/Erik Johnston2016-01-253-87/+181
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-228-19/+275
| |\ \
* | \ \ Merge pull request #525 from matrix-org/erikj/select_manyErik Johnston2016-01-253-60/+110
|\ \ \ \ | | | | | | | | | | Implement a `_simple_select_many_batch`
| * | | | Guard against empty iterablesErik Johnston2016-01-251-0/+6
| | | | |
| * | | | Correct docstringErik Johnston2016-01-251-1/+0
| | | | |
| * | | | Implement a _simple_select_many_batchErik Johnston2016-01-253-60/+105
| | |_|/ | |/| |
* | | | Merge pull request #527 from matrix-org/erikj/push_cacheErik Johnston2016-01-252-17/+14
|\ \ \ \ | | | | | | | | | | Push: Use storage apis that are cached
| * | | | Push: Use storage apis that are cachedErik Johnston2016-01-252-17/+14
| |/ / /
* | | | Merge pull request #526 from matrix-org/erikj/push_indexErik Johnston2016-01-251-0/+1
|\ \ \ \ | | | | | | | | | | Add index to event_push_actions
| * | | | Add index to event_push_actionsErik Johnston2016-01-251-0/+1
| |/ / /
* | | | Merge pull request #521 from matrix-org/erikj/underscoresErik Johnston2016-01-251-1/+1
|\ \ \ \ | |/ / / |/| | | Underscores are allowed in user ids
| * | | Underscores are allowed in user idsErik Johnston2016-01-221-1/+1
| | | |
* | | | Merge branch 'erikj/filters' of github.com:matrix-org/synapse into developErik Johnston2016-01-254-35/+41
|\ \ \ \ | | |/ / | |/| |
| * | | Fix testsErik Johnston2016-01-221-1/+1
| | | |
| * | | Sanitize filtersErik Johnston2016-01-223-34/+40
| | | |
* | | | Merge pull request #523 from matrix-org/dbkr/no_push_unless_notifyDavid Baker2016-01-221-9/+1
|\ \ \ \ | | | | | | | | | | Better fix for actions with both dont_notify and tweaks
| * | | | Better fix for actions with both dont_notify and tweaksDavid Baker2016-01-221-1/+1
| | | | |
| * | | | Revert b4a41aa542203c03bb8a6c93097b94bc5d167265 as it's just broken.David Baker2016-01-221-9/+1
| | | | |
* | | | | Merge pull request #522 from matrix-org/dbkr/no_push_unless_notifyDavid Baker2016-01-221-1/+9
|\| | | | | | | | | | | | | | Don't add notifications to the table unless there's actually a 'notify' action
| * | | | Don't add notifications to the table unless there's actually a 'notify' actionDavid Baker2016-01-221-1/+9
| | |_|/ | |/| |
* / | | Don't mutate cached valuesErik Johnston2016-01-221-2/+6
|/ / /
* | | Merge pull request #520 from matrix-org/dbkr/bulk_push_overlay_enabledDavid Baker2016-01-222-0/+46
|\ \ \ | |_|/ |/| | Overlay the push_rules_enabled map for users
| * | Don't crash if a user has no push rule enabled entriesDavid Baker2016-01-221-0/+3
| | |
| * | Overlay the push_rules_enabled map for users, otherwise they won't be able ↵David Baker2016-01-222-0/+43
|/ / | | | | | | to disable server default rules.
* | Merge pull request #519 from matrix-org/dbkr/treecacheDavid Baker2016-01-226-19/+229
|\ \ | |/ |/| Make LRU caching tree-based so subtrees of the cache can be invalidated cheaply.
| * Don't add the member functiopn if we're not using treecacheDavid Baker2016-01-221-1/+4
| |
| * docsDavid Baker2016-01-221-1/+5
| |
| * Revert all the bits changing keys of eeverything that used LRUCaches to tuplesDavid Baker2016-01-225-44/+44
| |
| * Make LRU cache not default to treecache & add options to use itDavid Baker2016-01-224-12/+22
| |
| * Add __contains__David Baker2016-01-221-0/+3
| |
| * Docs for treecacheDavid Baker2016-01-221-0/+5
| |
| * Use new invalidate_many cache invalidation to invalidate the ↵David Baker2016-01-221-4/+15
| | | | | | | | event_push_actions cache appropriately.
| * Add invalidate_many here tooDavid Baker2016-01-221-0/+1
| |
| * Test treecache directlyDavid Baker2016-01-221-0/+19
| |
| * Add tests for treecache directly and test del_multi at the LruCache level too.David Baker2016-01-221-0/+66
| |
| * peppateDavid Baker2016-01-211-2/+2
| |
| * Change LRUCache to be tree-based so we can delete subtrees.David Baker2016-01-217-52/+140
|/
* Merge pull request #517 from matrix-org/erikj/push_only_roomErik Johnston2016-01-213-7/+8
|\ | | | | Only fetch events for rooms and receipts
| * Only fetch events for rooms and receiptsErik Johnston2016-01-213-7/+8
|/
* Merge pull request #516 from matrix-org/erikj/push_perfErik Johnston2016-01-212-5/+17
|\ | | | | Reduce number of calls to get_unread_event_push_actions_by_room
| * Cache get_unread_event_push_actions_by_room_for_userErik Johnston2016-01-211-1/+2
| |
| * Only compute badge count when necessary.Erik Johnston2016-01-211-4/+15
|/ | | | This reverts commit d7265977376eb391007cde55c4b2d9b8f54d452b.
* Fix AttributeErrorErik Johnston2016-01-211-1/+1
|
* Merge pull request #515 from matrix-org/erikj/syn-606Erik Johnston2016-01-211-1/+3
|\ | | | | SYN-606: Peeking does not wake up /events
| * SYN-606: Peeking does not wake up /eventsErik Johnston2016-01-211-1/+3
| | | | | | | | | | | | If a real user attempted to first peek into one room, and then another, their room event stream would not be woken up for events in the later room.
* | Merge pull request #509 from matrix-org/erikj/dns_cacheErik Johnston2016-01-212-30/+186
|\ \ | | | | | | Cache dns lookups, and use the cache if we fail to lookup servers later
| * | Cache dns lookups, and use the cache if we fail to lookup servers laterErik Johnston2016-01-202-30/+186
| | |
* | | Merge pull request #514 from matrix-org/remove_member_event_ruleDavid Baker2016-01-211-17/+19
|\ \ \ | |_|/ |/| | Remove member event rule as per SYN-607
| * | Remove member event rule as per SYN-607David Baker2016-01-211-17/+19
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2016-01-216-69/+110
|\ \
| * \ Merge pull request #507 from matrix-org/push_badge_countsDavid Baker2016-01-215-66/+108
| |\ \ | | | | | | | | Push badge counts
| | * | peppateDavid Baker2016-01-201-3/+2
| | | |
| | * | Add index by user id on receipts_linearizedDavid Baker2016-01-201-0/+18
| | | |
| | * | Add storage function to get all receipts for a user. Also add some cache ↵David Baker2016-01-202-43/+40
| | | | | | | | | | | | | | | | invalidation to the receipts storage because there wasn't any, and remove a method that was unused.
| | * | Inline membership specifierDavid Baker2016-01-201-3/+1
| | | |
| | * | Simplify badge updating code by just updating it every time we get woken up ↵David Baker2016-01-201-15/+4
| | | | | | | | | | | | | | | | and it's not an event
| | * | Merge branch 'develop' into push_badge_countsDavid Baker2016-01-201-1/+1
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/develop' into push_badge_countsDavid Baker2016-01-201-0/+3
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into push_badge_countsDavid Baker2016-01-203-36/+36
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'develop' into push_badge_countsDavid Baker2016-01-1935-1247/+1044
| | |\ \ \ \
| | * | | | | Use the unread notification count to send accurate badge counts in push ↵David Baker2016-01-133-45/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications.
| * | | | | | Merge pull request #513 from matrix-org/erikj/register_user_charsErik Johnston2016-01-211-3/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't explode when given a unicode username in /register/
| | * | | | | | Don't explode when given a unicode username in /register/Erik Johnston2016-01-201-3/+2
| | | | | | | |
* | | | | | | | Add another graph contribErik Johnston2016-01-211-0/+151
|/ / / / / / /
* | | | | | | Fix change_passwordErik Johnston2016-01-201-3/+2
| | | | | | |
* | | | | | | Merge pull request #512 from matrix-org/erikj/whine_on_fromErik Johnston2016-01-201-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Whine if we give a from param to /sync
| * | | | | | Whine if we give a from param to /syncErik Johnston2016-01-201-0/+7
|/ / / / / /
* | | | | | Merge pull request #510 from matrix-org/daniel/nonguestpeekingDaniel Wagner-Hall2016-01-208-85/+108
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Allow non-guests to peek on rooms using /events
| * | | | | Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-208-85/+108
|/ / / / /
* | | | | Merge branch 'dbkr/no_push_for_own_events' into developDavid Baker2016-01-201-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 'filtered' is a list of zero or 1David Baker2016-01-201-1/+1
| | | | |
* | | | | Merge pull request #511 from matrix-org/dbkr/no_push_for_own_eventsDavid Baker2016-01-201-0/+3
|\| | | | | |_|_|/ |/| | | Don't generate push actions for our own events
| * | | Don't generate push actions for our own eventsDavid Baker2016-01-201-0/+3
|/ / /
* | | Merge pull request #506 from matrix-org/erikj/push_fastErik Johnston2016-01-192-30/+23
|\ \ \ | | | | | | | | Only compute unread notifications for rooms we send down stream
| * | | Only compute unread notifications for rooms we send down streamErik Johnston2016-01-192-30/+23
| | | |
* | | | Don't use form of get_state_for_events with None state_keyErik Johnston2016-01-191-6/+13
| |_|/ |/| |
* | | Merge pull request #505 from matrix-org/erikj/push_fastErik Johnston2016-01-197-14/+49
|\| | | | | | | | Push actions perf
| * | Use split rather than endswithErik Johnston2016-01-191-2/+1
| | |
| * | Change regex cache size to 5000Erik Johnston2016-01-191-1/+1
| | |
| * | Add regex cache. Only caculate push actions for users that have sent read ↵Erik Johnston2016-01-197-14/+50
|/ / | | | | | | receipts, and are on that server
* | Handle glob -> regex errorsErik Johnston2016-01-191-29/+33
| |
* | Merge pull request #477 from matrix-org/erikj/access_token_logErik Johnston2016-01-191-3/+5
|\ \ | | | | | | Don't log urlencoded access_tokens
| * | Use compiled regexErik Johnston2016-01-131-2/+4
| | |
| * | Don't log urlencoded access_tokensErik Johnston2016-01-081-2/+2
| | |
* | | Use all_ephemeral_by_room in incremental_sync_with_gap_for_roomErik Johnston2016-01-191-3/+5
| | |
* | | Return don't breakErik Johnston2016-01-191-1/+1
| | |
* | | Except truthy valuesErik Johnston2016-01-191-1/+1
| | |
* | | Merge pull request #504 from matrix-org/erikj/highlight_countErik Johnston2016-01-193-8/+40
|\ \ \ | | | | | | | | Return highlight_count in /sync
| * | | Return highlight_count in /syncErik Johnston2016-01-193-8/+40
| | | |
* | | | Merge pull request #486 from matrix-org/default_notifyErik Johnston2016-01-191-1/+0
|\ \ \ \ | |/ / / |/| | | Change default pushrules back to notifying for all messages.
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into default_notifyErik Johnston2016-01-1929-1222/+945
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #502 from matrix-org/erikj/push_notif_perfErik Johnston2016-01-1913-954/+550
|\ \ \ \ | | | | | | | | | | Unread notification performance.
| * | | | Take a deepcopy of push rules before mutating themErik Johnston2016-01-191-1/+3
| | | | |
| * | | | Update _idErik Johnston2016-01-191-2/+3
| | | | |
| * | | | Preserve truthinessErik Johnston2016-01-181-1/+2
| | | | |
| * | | | You need to escape backslashesErik Johnston2016-01-181-2/+2
| | | | |
| * | | | Fix branch didn't check word_boundaryErik Johnston2016-01-181-3/+9
| | | | |
| * | | | Remove dead codeErik Johnston2016-01-181-22/+1
| | | | |
| * | | | Don't split at word boundaries, actually use regexErik Johnston2016-01-182-63/+48
| | | | |
| * | | | Drop log levelsErik Johnston2016-01-181-2/+2
| | | | |
| * | | | Add comments and remove dead codeErik Johnston2016-01-181-12/+11
| | | | |
| * | | | Do for loop once at startErik Johnston2016-01-181-8/+17
| | | | |
| * | | | Use static for const dictsErik Johnston2016-01-184-198/+209
| | | | |
| * | | | Remove internal idsErik Johnston2016-01-181-0/+4
| | | | |
| * | | | Don't edit rulesetErik Johnston2016-01-181-5/+4
| | | | |
| * | | | Make unit tests workErik Johnston2016-01-183-560/+1
| | | | |
| * | | | Re-enable urnead notificationsErik Johnston2016-01-183-13/+6
| | | | |
| * | | | Make notifications go quickerErik Johnston2016-01-184-131/+260
| | | | |
| * | | | Make Event objects behave more like dictsErik Johnston2016-01-181-0/+9
| | | | |
| * | | | Allow filtering events for multiple users at onceErik Johnston2016-01-182-39/+67
| | | | |
* | | | | Merge pull request #503 from matrix-org/daniel/nonghostsDaniel Wagner-Hall2016-01-191-31/+30
|\ \ \ \ \ | |/ / / / |/| | | | Don't error on AS non-ghost user use
| * | | | Don't error on AS non-ghost user useDaniel Wagner-Hall2016-01-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This will probably go away either when we fix our existing ASes, or when we kill the concept of non-ghost users.
| * | | | Pull out app service user lookupDaniel Wagner-Hall2016-01-181-31/+28
|/ / / / | | | | | | | | | | | | I find this a lot simpler than nested try-catches and stuff
* | | | Merge pull request #501 from matrix-org/daniel/unbanDaniel Wagner-Hall2016-01-156-58/+116
|\ \ \ \ | | | | | | | | | | Require unbanning before other membership changes
| * | | | Require unbanning before other membership changesDaniel Wagner-Hall2016-01-156-58/+116
|/ / / /
* | | | Merge pull request #500 from matrix-org/daniel/cleanupDaniel Wagner-Hall2016-01-152-16/+8
|\ \ \ \ | | | | | | | | | | Remove unused parameters
| * | | | Remove unused parametersDaniel Wagner-Hall2016-01-152-16/+8
|/ / / /
* | | | Merge branch 'invalid_user_name' into developDavid Baker2016-01-152-2/+2
|\ \ \ \
| * | | | M_INVALID_USERNAME to be consistent with the parameter nameDavid Baker2016-01-152-2/+2
| | | | |
* | | | | Merge pull request #499 from matrix-org/invalid_user_nameDavid Baker2016-01-152-1/+3
|\| | | | | | | | | | | | | | Add specific error code for invalid user names.
| * | | | Add specific error code for invalid user names.David Baker2016-01-142-1/+3
|/ / / /
* | | | Merge pull request #497 from matrix-org/erikj/max_limitErik Johnston2016-01-141-2/+5
|\ \ \ \ | | | | | | | | | | Clamp pagination limits to at most 1000
| * | | | Clamp pagination limits to at most 1000Erik Johnston2016-01-141-2/+5
| | | | |
* | | | | Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-142-12/+29
|\ \ \ \ \
| * \ \ \ \ Merge pull request #492 from matrix-org/rav/event_context_shiz_release github/release-v0.12.1 release-v0.12.1Richard van der Hoff2016-01-142-12/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | Add 'event' result to 'context' endpoint
| | * | | | | Add 'event' result to 'context' endpointRichard van der Hoff2016-01-132-12/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | ... because the context isn't much use without the event.
* | | | | | Merge pull request #496 from matrix-org/daniel/3Daniel Wagner-Hall2016-01-143-17/+111
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require ID and as_token be unique for ASs Defaults ID to as_token if not specified. This will change when IDs are fully supported.
| * | | | | | Require ID and as_token be unique for ASsDaniel Wagner-Hall2016-01-143-17/+111
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Defaults ID to as_token if not specified. This will change when IDs are fully supported.
* | | | | | Merge pull request #498 from matrix-org/push_rule_enabled_fixDavid Baker2016-01-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix enabling & disabling push rules
| * | | | | | Fix enabling & disabling push rulesDavid Baker2016-01-141-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-141-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-135-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour.
| * | | | | Merge pull request #476 from koobs/patch-1Matthew Hodgson2016-01-081-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | Add FreeBSD install section & instructions
| | * | | | | Add FreeBSD install section & instructionsKubilay Kocak2016-01-091-0/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Add FreeBSD installation instructions for both Ports and Packages now that matrix-synapse has landed [1] in the tree. [1] https://svnweb.freebsd.org/changeset/ports/405527
* | | | | | Merge pull request #487 from matrix-org/daniel/forceregistrationDaniel Wagner-Hall2016-01-141-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Require AS users to be registered before use
| * | | | | | Require AS users to be registered before useDaniel Wagner-Hall2016-01-131-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #494 from matrix-org/daniel/2Daniel Wagner-Hall2016-01-141-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't start server if ASes are invalidly configured
| * | | | | | Don't start server if ASes are invalidly configuredDaniel Wagner-Hall2016-01-131-0/+1
| |/ / / / /
* | | | | | Merge pull request #493 from matrix-org/daniel/1Daniel Wagner-Hall2016-01-141-59/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Delete unused code
| * | | | | Delete unused codeDaniel Wagner-Hall2016-01-131-59/+0
| |/ / / /
* | | | | Use logger not loggingErik Johnston2016-01-141-2/+2
| | | | |
* | | | | Merge pull request #495 from matrix-org/erikj/disable_notificationErik Johnston2016-01-143-6/+13
|\ \ \ \ \ | | | | | | | | | | | | Temporarily disable notification branch
| * | | | | Don't change signature. Return empty listErik Johnston2016-01-131-2/+2
| | | | | |
| * | | | | Temporarily disable notification branchErik Johnston2016-01-133-7/+14
|/ / / / /
* | | | | Merge pull request #488 from matrix-org/markjh/user_nameMark Haines2016-01-139-99/+99
|\ \ \ \ \ | |/ / / / |/| | | | Rename 'user_name' to 'user_id' in push
| * | | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵Mark Haines2016-01-139-99/+99
|/ / / / | | | | | | | | | | | | of the code
| | * / Change default pushrules back to notifying for all messages.David Baker2016-01-131-1/+0
| |/ / |/| |
* | | Merge pull request #482 from matrix-org/markjh/table_nameMark Haines2016-01-137-128/+41
|\ \ \ | | | | | | | | Finish removing the .*Table objects from the storage layer.
| * \ \ Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into ↵Mark Haines2016-01-133-26/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | markjh/table_name Conflicts: synapse/storage/push_rule.py
| * | | | Delete the table objects from TransactionStoreMark Haines2016-01-133-60/+10
| | | | |
| * | | | Remove the RoomsTable objectMark Haines2016-01-131-13/+3
| | | | |
| * | | | Remove the PushersTable and EventPushActionsTable objectsMark Haines2016-01-122-14/+6
| | | | |
| * | | | Remove the PushRuleTable and PushRuleEnableTable objectsMark Haines2016-01-121-50/+33
| | | | |
* | | | | Merge pull request #483 from matrix-org/erikj/bulk_get_push_rulesErik Johnston2016-01-131-21/+13
|\ \ \ \ \ | | |/ / / | |/| | | bulk_get_push_rules should handle empty lists
| * | | | bulk_get_push_rules should handle empty listsErik Johnston2016-01-131-21/+13
|/ / / /
* | | | Merge pull request #480 from matrix-org/erikj/guest_event_tightloopErik Johnston2016-01-131-7/+0
|\ \ \ \ | | | | | | | | | | Dont fire user_joined_room when guest hits /events
| * | | | Dont fire user_joined_room when guest hits /eventsErik Johnston2016-01-121-7/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firing the 'user_joined_room' signal everytime a guest hits /events causes all presence for that room to be returned in the stream. This may sound helpful, but causes clients to tightloop calling /events. In general, guest users should get the initial presence from (room) intial sync and so we don't require presence to sbsequently come down the event stream.
* | | | Merge pull request #481 from matrix-org/erikj/SYN-589Erik Johnston2016-01-121-1/+5
|\ \ \ \ | |/ / / |/| | | Don't include old left rooms in /sync
| * | | Don't include old left roomsErik Johnston2016-01-121-1/+5
|/ / /
* | | Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-1124-144/+178
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a User object I'm sick of passing around more and more things as tuple items around the whole world, and needing to edit every call site every time there is more information about a user. So pass them around together as an object. This object has incredibly poorly named fields because we have a convention that `user` indicates a UserID object, and `user_id` indicates a string. I tried to clean up the whole repo to fix this, but gave up. So instead, I introduce a second convention. A user_object is a User, and a user_id_object is a UserId. I may have cried a little bit.
| * | | Introduce a Requester objectDaniel Wagner-Hall2016-01-1124-144/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up.
* | | | Postgres doesn't like booleansDavid Baker2016-01-111-2/+2
| | | |
* | | | Remove rogue 'admin'David Baker2016-01-111-1/+1
| | | |
* | | | Merge pull request #474 from matrix-org/erikj/core_dumpErik Johnston2016-01-081-2/+5
|\ \ \ \ | | |_|/ | |/| | Turn on core dumps
| * | | Turn on core dumpsErik Johnston2016-01-071-2/+5
| |/ /
* | | Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-0819-36/+541
|\ \ \ | | | | | | | | Send unread notification counts
| * | | This comma is actually importantDavid Baker2016-01-071-1/+1
| | | |
| * | | more commasDavid Baker2016-01-071-1/+1
| | | |
| * | | comma styleDavid Baker2016-01-061-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-066-142/+60
| |\ \ \
| * | | | Adding is_guest here won't work because it just constructs a dict of uid -> ↵David Baker2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | password hash
| * | | | fix testsDavid Baker2016-01-063-1/+10
| | | | |
| * | | | Delete notifications for redacted eventsDavid Baker2016-01-062-0/+19
| | | | |
| * | | | Add schema change file for is_guest flagDavid Baker2016-01-061-0/+22
| | | | |
| * | | | Add is_guest flag to users db to track whether a user is a guest user or ↵David Baker2016-01-069-31/+69
| | | | | | | | | | | | | | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions.
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-0517-74/+139
| |\ \ \ \
| * | | | | comment typoDavid Baker2016-01-051-1/+1
| | | | | |
| * | | | | = not == in sqlDavid Baker2016-01-041-1/+1
| | | | | |
| * | | | | Only joined rooms have unread_notif_countDavid Baker2016-01-041-1/+1
| | | | | |
| * | | | | commaDavid Baker2016-01-041-1/+1
| | | | | |
| * | | | | Add unread_notif_count in incremental_sync_with_gapDavid Baker2016-01-041-0/+8
| | | | | |
| * | | | | fix testsDavid Baker2016-01-042-2/+2
| | | | | |
| * | | | | Rename event-actions to event_push_actions as per PR requestDavid Baker2016-01-046-17/+17
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-047-4/+208
| |\ \ \ \ \
| * | | | | | Address minor PR issuesDavid Baker2016-01-047-25/+12
| | | | | | |
| * | | | | | Fix merge fail with anon access stuffDavid Baker2015-12-221-2/+2
| | | | | | |
| * | | | | | Add mocks to make tests work againDavid Baker2015-12-222-0/+16
| | | | | | |
| * | | | | | pep8 & unused variableDavid Baker2015-12-223-4/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-226-91/+210
| |\ \ \ \ \ \
| * | | | | | | Add some comments to areas that could be optimised.David Baker2015-12-223-1/+14
| | | | | | | |
| * | | | | | | Remove the list of problems (moved to jira issues)David Baker2015-12-221-5/+0
| | | | | | | |
| * | | | | | | Insert push actions in a single db query rather than one per user/profile_tagDavid Baker2015-12-222-17/+24
| | | | | | | |
| * | | | | | | clarify problemsDavid Baker2015-12-221-1/+1
| | | | | | | |
| * | | | | | | Add bulk push rule evaluator which actually still evaluates rules one by ↵David Baker2015-12-224-22/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one, but does far fewer db queries to fetch the rules
| * | | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-2120-80/+320
| |\ \ \ \ \ \ \
| * | | | | | | | Only run pushers for users on this hs!David Baker2015-12-213-3/+9
| | | | | | | | |
| * | | | | | | | pep8David Baker2015-12-212-9/+9
| | | | | | | | |
| * | | | | | | | add list of things I want to fix with this branchDavid Baker2015-12-181-0/+5
| | | | | | | | |
| * | | | | | | | Make unread notification count sending work: put the correct count in ↵David Baker2015-12-182-20/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user...
| * | | | | | | | still very WIP, but now sends unread_notifications_count in the room object ↵David Baker2015-12-165-5/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).
| * | | | | | | | Store nothing instead of ['dont_notify'] for events with no notification ↵David Baker2015-12-103-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required: much as it would be nice to be able to tell between the event not having been processed and there being no notification for it, this isn't worth filling up the table with ['dont_notify'] I think. Consequently treat the empty actions array as dont_notify and filter dont_notify out of the result.
| * | | | | | | | Save event actions to the dbDavid Baker2015-12-104-2/+72
| | | | | | | | |
| * | | | | | | | Having consulted The Erikle, this should go at the end of on_receive_pdu, ↵David Baker2015-12-101-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise it will be triggered whenever we backfill too.
| * | | | | | | | Very first cut of calculating actions for events as they come in. Doesn't ↵David Baker2015-12-104-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store them yet. Not very efficient.
* | | | | | | | | Merge pull request #475 from matrix-org/markjh/fix_thumbnailMark Haines2016-01-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail.
| * | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail.Mark Haines2016-01-071-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Even though ones cropped with scale might be technically valid.
* | | | | | | | Use logger not loggingErik Johnston2016-01-071-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #473 from matrix-org/erikj/ssh_manholeErik Johnston2016-01-072-6/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change manhole to use ssh
| * | | | | | | | s/telnet/ssh/Erik Johnston2016-01-071-1/+1
| | | | | | | | |
| * | | | | | | | Change manhole to use sshErik Johnston2016-01-071-5/+21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #465 from matrix-org/syn-453Erik Johnston2016-01-071-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update readme to reflect change in signing key name
| * | | | | | | | Update readme to reflect change in signing key nameErik Johnston2016-01-061-2/+1
| |/ / / / / / /
* | | | | | | | copyrightsMatthew Hodgson2016-01-07295-297/+297
| | | | | | | |
* | | | | | | | Merge pull request #472 from roblabla/patch-1Matthew Hodgson2016-01-061-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Config Comment mixup in captcha public/private key
| * | | | | | | | Config Comment mixup in captcha public/private keyRobin Lambertz2016-01-061-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #468 from matrix-org/daniel/versionsyoDaniel Wagner-Hall2016-01-063-0/+43
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Add /_matrix/versions to report supported versions
| * | | | | | | Add /_matrix/versions to report supported versionsDaniel Wagner-Hall2016-01-063-0/+43
|/ / / / / / /
* | | | | | | Merge pull request #469 from matrix-org/markjh/joined_guest_accessMark Haines2016-01-064-139/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Guest users must be joined to a room to see it in /sync
| * | | | | | | Pass whether the user was a guest to some of the event streamsMark Haines2016-01-061-5/+3
| | | | | | | |
| * | | | | | | Guest users must be joined to a room to see it in /syncMark Haines2016-01-064-137/+50
|/ / / / / / /
* | | | | | | Log when starting stats reportingDaniel Wagner-Hall2016-01-061-0/+1
| | | | | | |
* | | | | | | Log on stats schedulingDaniel Wagner-Hall2016-01-061-0/+1
| | | | | | |
* | | | | | | Merge pull request #466 from matrix-org/daniel/logloglogDaniel Wagner-Hall2016-01-061-1/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Log when we skip daily messages
| * | | | | | Log when we skip daily messagesDaniel Wagner-Hall2016-01-061-1/+10
|/ / / / / /
* | | | | | Merge pull request #463 from matrix-org/daniel/hashtagnofilterDaniel Wagner-Hall2016-01-055-21/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip, rather than erroring, invalid guest requests Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour.
| * | | | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-055-21/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour.
* | | | | | Merge pull request #462 from matrix-org/daniel/guestupgradeDaniel Wagner-Hall2016-01-0511-40/+93
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow guests to upgrade their accounts
| * | | | | | Allow guests to upgrade their accountsDaniel Wagner-Hall2016-01-0511-40/+93
|/ / / / / /
* | | | | | Merge pull request #464 from matrix-org/erikj/crop_correctErik Johnston2016-01-051-4/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use larger thumbnails rather than smaller when method=crop
| * | | | | | Use larger thumbnail rather than smaller.Erik Johnston2016-01-051-4/+13
|/ / / / / /
* | | | | | Merge pull request #461 from matrix-org/erikj/sync_leaveErik Johnston2016-01-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return /sync when something under the 'leave' key has changed
| * | | | | | Return /sync when something under the 'leave' key has changedErik Johnston2016-01-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #460 from matrix-org/erikj/create_room_3pid_inviteErik Johnston2016-01-051-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support inviting 3pids in /createRoom
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-15 20:09:31 +0000