summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #921 from matrix-org/erikj/account_deactivateErik Johnston2016-07-141-0/+44
|\ | | | | Feature: Add an /account/deactivate endpoint
| * Add hs objectErik Johnston2016-07-141-0/+1
| |
| * Only accept password authErik Johnston2016-07-141-12/+0
| |
| * Add an /account/deactivate endpointErik Johnston2016-07-141-0/+55
| |
* | Merge pull request #918 from negzi/bugfix_for_token_expiryErik Johnston2016-07-141-1/+1
|\ \ | |/ |/| Bug fix: expire invalid access tokens
| * Bug fix: expire invalid access tokensNegar Fazeli2016-07-131-1/+1
| |
* | be more pythonicDavid Baker2016-07-121-1/+1
| |
* | on_OPTIONS isn't neccessaryDavid Baker2016-07-122-10/+1
| |
* | Remove other debug loggingDavid Baker2016-07-121-2/+0
| |
* | Separate out requestTokens to separate handlersDavid Baker2016-07-112-65/+93
| |
* | Oops, remove debug loggingDavid Baker2016-07-111-4/+0
| |
* | Implement https://github.com/matrix-org/matrix-doc/pull/346/filesDavid Baker2016-07-081-0/+59
|/
* Add rest servlet. Fix SQL.Erik Johnston2016-07-061-0/+1
|
* Merge branch 'erikj/shared_secret' into erikj/test2Erik Johnston2016-07-061-4/+16
|\
| * Check that there are no null bytes in user and passswordErik Johnston2016-07-061-0/+6
| |
| * Add null separator to hmacErik Johnston2016-07-061-0/+2
| |
| * Add an admin option to shared secret registrationErik Johnston2016-07-051-0/+1
| |
| * Protect password when registering using shared secretErik Johnston2016-07-051-4/+7
| |
* | Add purge_history APIErik Johnston2016-07-051-0/+18
|/
* Fix style violationsKent Shikama2016-07-041-1/+2
| | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* Use .get() instead of [] to access password_hashKent Shikama2016-07-041-1/+1
|
* Optionally include password hash in createUser endpointKent Shikama2016-07-031-1/+3
| | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* Feature: Add deactivate account admin APIErik Johnston2016-06-301-0/+26
| | | | | | | | | | Allows server admins to "deactivate" accounts, which: - Revokes all access tokens - Removes all threepids - Removes password The API is a POST to `/admin/deactivate/<user_id>`
* Remove raceErik Johnston2016-06-291-11/+0
|
* Implement purge_media_cache admin APIErik Johnston2016-06-293-20/+96
|
* Track approximate last access time for remote mediaErik Johnston2016-06-291-0/+24
|
* Remove the legacy v0 content upload API.Mark Haines2016-06-211-110/+2
| | | | | | The existing content can still be downloaded. The last upload to the matrix.org server was in January 2015, so it is probably safe to remove the upload API.
* Line lengthsErik Johnston2016-06-151-3/+3
|
* Handle floats as img widthsErik Johnston2016-06-151-1/+1
|
* Handle og props with not contentErik Johnston2016-06-151-1/+2
|
* 502 on /thumbnail when can't contact remote serverErik Johnston2016-06-091-4/+10
|
* Remove redundant exception log in /eventsErik Johnston2016-06-091-24/+21
|
* Don't make rooms visibile by defaultErik Johnston2016-06-081-2/+0
|
* Log user that is making /publicRooms callsErik Johnston2016-06-081-0/+7
|
* Load push rules in storage layer, so that they get cachedErik Johnston2016-06-031-4/+2
|
* Working unsubscribe links going straight to the HSDavid Baker2016-06-021-1/+3
| | | | and authed by macaroons that let you delete pushers and nothing else
* Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribeDavid Baker2016-06-025-10/+11
|\
| * Split out the auth handlerDavid Baker2016-06-025-10/+11
| |
* | WIP on unsubscribing email notifs without logging inDavid Baker2016-06-011-1/+54
|/
* Basic, un-cached support for secondary_directory_serversDavid Baker2016-05-311-1/+2
|
* Split out the room list handlerDavid Baker2016-05-311-1/+1
| | | | So I can use it from federation bits without pulling in all the handlers.
* Allow clients to specify a server_name to avoid 'No known servers'Kegan Dougal2016-05-191-1/+4
| | | | Multiple server_names are supported via ?server_name=foo&server_name=bar
* Move typing handler out of the Handlers objectMark Haines2016-05-171-4/+3
|
* Move SyncHandler out of the Handlers objectMark Haines2016-05-161-2/+1
|
* Move the presence handler out of the Handlers objectMark Haines2016-05-164-9/+17
|
* Clean up the blacklist/whitelist handling.Mark Haines2016-05-161-33/+30
| | | | | | | Always set the config key with an empty list, even if a list isn't specified. This means that the codepaths are the same for both the empty list and for a missing key. Since the behaviour is the same for both cases this makes the code somewhat easier to reason about.
* Create user with expiryNegi Fazeli2016-05-131-0/+71
| | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
* Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-05-103-0/+159
|\
| * Rename openid/token to openid/request_tokenMark Haines2016-05-051-2/+2
| |
| * Add an openidish mechanism for proving to third parties that you own a given ↵Mark Haines2016-05-052-0/+98
| | | | | | | | user_id
| * Add timestamp and auto incrementing IDErik Johnston2016-05-041-0/+2
| |
| * Move event_id to pathErik Johnston2016-05-041-4/+2
| |
| * Add /report endpointErik Johnston2016-05-042-0/+61
| |
* | More consistent config namingDavid Baker2016-05-101-1/+1
| |
* | Add config option to not send email notifs for new usersDavid Baker2016-05-101-1/+4
| |
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-04-291-0/+1
|\|
| * Fix password resetDavid Baker2016-04-291-0/+1
| | | | | | | | Default requester to None, otherwise it isn't defined when resetting using email auth
* | Add an email pusher for new usersDavid Baker2016-04-291-0/+26
|/ | | | If they registered with an email address and email notifs are enabled on the HS
* Report per request metrics for all of the things using request_handlerMark Haines2016-04-286-7/+9
|
* Make pyjwt dependency optionalErik Johnston2016-04-251-5/+7
|
* Merge pull request #687 from nikriek/jwt-fixErik Johnston2016-04-211-3/+6
|\ | | | | Fix issues with JWT login
| * Fix issues with JWT loginNiklas Riekenbrauck2016-04-211-3/+6
| |
* | Add self.media_repo to PreviewUrlResourceErik Johnston2016-04-191-0/+1
| |
* | _make_dirs was moved to MediaRepositoryErik Johnston2016-04-191-1/+1
| |
* | Add store to PreviewUrlResourceErik Johnston2016-04-191-0/+1
| |
* | Reorder importsErik Johnston2016-04-191-7/+8
| |
* | Move MediaRepository to media_repository moduleErik Johnston2016-04-195-489/+496
| |
* | Split out BaseMediaResource into MediaRepositoryErik Johnston2016-04-196-138/+180
| | | | | | | | | | | | | | | | | | This is so that a single MediaRepository can be shared across all resources, rather than having a "copy" per resource. In particular this allows us to guard against both the thumbnail and download resource triggering a download of remote content at the same time.
* | explicitly pass in the charset from Content-Type to lxml to fix cyrillic ↵Matthew Hodgson2016-04-151-6/+18
| | | | | | | | woes better
* | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, ↵Matthew Hodgson2016-04-151-16/+8
| | | | | | | | rather than relying on lxml's heuristics which seem to get it wrong
* | fix urlparse import thinko breaking tiny URLsMatthew Hodgson2016-04-141-5/+5
| |
* | Make v2_alpha reg follow the AS API specificationKegan Dougal2016-04-141-0/+5
| | | | | | | | | | | | The spec is clear the key should be 'user' not 'username' and this is indeed the case for v1. This is not true for v2_alpha though, which is what this commit is fixing.
* | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of ↵Matthew Hodgson2016-04-141-16/+16
| | | | | | | | https://en.wikipedia.org/wiki/Billion_laughs attacks - thanks @torhve
* | Sanitize the optional dependencies for spider APIErik Johnston2016-04-132-27/+3
| |
* | Make the /set part mandatoryDavid Baker2016-04-121-1/+1
| |
* | Mis-named functionDavid Baker2016-04-121-1/+1
| |
* | Split into separate servlet classesDavid Baker2016-04-121-11/+16
| |
* | Add get endpoint for pushersDavid Baker2016-04-111-1/+34
| | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/308
* | PEP8Erik Johnston2016-04-111-1/+0
| |
* | fix typos and needless try/except from PR reviewMatthew Hodgson2016-04-111-143/+140
| |
* | actually throw meaningful errorsMatthew Hodgson2016-04-081-9/+24
| |
* | Fix pep8 warningMark Haines2016-04-081-3/+4
| |
* | more PR feedbackMatthew Hodgson2016-04-081-4/+8
| |
* | Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵Matthew Hodgson2016-04-082-18/+64
| | | | | | | | | | | | | | | | | | defaults to off. Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered. Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered. Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist Add commentary and generally address PR feedback
* | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-04-043-36/+133
|\|
| * Use google style doc strings.Mark Haines2016-04-011-36/+43
| | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format.
| * Remove spurious commentErik Johnston2016-03-301-1/+0
| |
| * Require user to have left room to forget roomErik Johnston2016-03-301-0/+38
| | | | | | | | | | This dramatically simplifies the forget API code - in particular it no longer generates a leave event.
| * Add JWT supportNiklas Riekenbrauck2016-03-291-0/+53
| |
* | report image size (bytewise) in OG metaMatthew Hodgson2016-04-031-0/+2
| |
* | char encodingMatthew Hodgson2016-04-031-0/+1
| |
* | pep8Matthew Hodgson2016-04-032-55/+73
| |
* | fix etag typing error. fix timestamp typing errorMatthew Hodgson2016-04-031-2/+2
| |
* | rebase all image URLsMatthew Hodgson2016-04-031-4/+4
| |
* | remove stale todoMatthew Hodgson2016-04-031-3/+0
| |
* | Ensure only one download for a given URL is active at a timeMatthew Hodgson2016-04-031-1/+18
| |
* | add a persistent cache of URL lookups, and fix up the in-memory one to workMatthew Hodgson2016-04-031-10/+54
| |
* | support gzip compression, and don't pass through error msgsMatthew Hodgson2016-04-021-2/+3
| |
* | how was _respond_default_thumbnail ever meant to work?Matthew Hodgson2016-04-021-0/+2
| |
* | pass back SVGs as their own thumbnailsMatthew Hodgson2016-04-021-0/+20
| |
* | handle missing dimensions without crashingMatthew Hodgson2016-04-021-4/+13
| |
* | make meta comparisons case insensitiveMatthew Hodgson2016-04-021-2/+2
| |
* | refactor calc_og; spider image URLs; fix xpath; add a (broken) ↵Matthew Hodgson2016-04-021-81/+121
| | | | | | | | expiringcache; loads of other fixes
* | fix assorted redirect, unicode and screenscraping bugsMatthew Hodgson2016-04-011-78/+96
| |
* | handle spidered relative images correctlyMatthew Hodgson2016-03-311-2/+12
| |
* | prevent choking on invalid utf-8, and handle image thumbnailing smarterMatthew Hodgson2016-03-311-5/+18
| |
* | synthesise basig OG metadata from pages lacking itMatthew Hodgson2016-03-311-0/+47
| |
* | handle requests with missing content-length headers (e.g. YouTube)Matthew Hodgson2016-03-311-2/+2
| |
* | fix bugsMatthew Hodgson2016-03-291-5/+6
| |
* | debugMatthew Hodgson2016-03-291-3/+2
| |
* | make it workMatthew Hodgson2016-03-292-55/+77
| |
* | make it buildMatthew Hodgson2016-03-291-8/+9
| |
* | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-292-0/+45
|\|
| * Deduplicate identical /sync requestsMark Haines2016-03-241-0/+3
| |
| * Add published room list edit APIErik Johnston2016-03-211-0/+42
| |
* | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-2728-661/+466
|\|
| * Merge pull request #652 from matrix-org/erikj/delete_aliasErik Johnston2016-03-181-1/+2
| |\ | | | | | | Update aliases event after deletion
| | * Update aliases event after deletionErik Johnston2016-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Attempt to update the appropriate `m.room.aliases` event after deleting an alias. This may fail due to the deleter not being in the room. Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it.
| * | remove debug loggingDavid Baker2016-03-161-3/+0
| | |
| * | Unused importDavid Baker2016-03-161-1/+0
| | |
| * | Make registration idempotent, part 2: be idempotent if the client specifies ↵David Baker2016-03-161-5/+17
| |/ | | | | | | a username.
| * take extra return val from check_auth in account tooDavid Baker2016-03-161-1/+1
| |
| * pep8 & remove debug loggingDavid Baker2016-03-161-4/+5
| |
| * Make registration idempotent: if you specify the same session, make it give ↵David Baker2016-03-161-1/+26
| | | | | | | | you an access token for the user that was registered on previous uses of that session. Tweak the UI auth layer to not delete sessions when their auth has completed and hence expire themn so they don't hang around until server restart. Allow server-side data to be associated with UI auth sessions.
| * Hook up adding a pusher to the notifier for replication.Mark Haines2016-03-151-0/+6
| |
| * Fix regression where synapse checked whether push rules were valid JSON ↵Mark Haines2016-03-141-2/+2
| | | | | | | | before the compatibility hack that handled clients sending invalid JSON
| * Merge pull request #642 from matrix-org/erikj/logoutErik Johnston2016-03-112-0/+74
| |\ | | | | | | Implement logout
| | * Implement logoutErik Johnston2016-03-112-0/+74
| | |
| * | Use parse_json_object_from_request to parse JSON out of request bodiesMark Haines2016-03-118-81/+31
| |/
| * Fix cache invalidation so deleting access tokens (which we did when changing ↵David Baker2016-03-111-1/+1
| | | | | | | | password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f05491ce65a4fc34326519754cd1edd9c54
| * Register endpoint returns refresh_tokenblide2016-03-101-5/+8
| | | | | | | | Guest registration still doesn't return refresh_token
| * Add a parse_json_object functionMark Haines2016-03-0910-116/+32
| | | | | | | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.
| * Fix relative imports so they work in both py3 and py27Mark Haines2016-03-086-6/+6
| |
| * Use syntax that works on both py2.7 and py3Mark Haines2016-03-071-1/+1
| |
| * Merge branch 'develop' into markjh/pushrule_streamMark Haines2016-03-043-10/+11
| |\
| | * Merge pull request #614 from matrix-org/erikj/alias_deleteErik Johnston2016-03-041-3/+0
| | |\ | | | | | | | | Allow alias creators to delete aliases
| | | * Allow alias creators to delete aliasesErik Johnston2016-03-011-3/+0
| | | |
| | * | Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-033-7/+11
| | |/ | | | | | | | | | This will enable more detailed decisions
| * | Hook up the push rules stream to account_data in /syncMark Haines2016-03-041-1/+1
| | |
| * | Move the code for formatting push rules into a separate functionMark Haines2016-03-031-86/+4
| | |
| * | Hook up the push rules to the notifierMark Haines2016-03-031-15/+29
| |/
| * Add support for changing the actions for default rulesMark Haines2016-02-261-4/+27
| | | | | | | | | | | | See matrix-org/matrix-doc#283 Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules``
| * Fix to appease the PEP8 dragonGergely Polonkai2016-02-261-1/+3
| |
| * Add error codes for malformed/bad JSON in /loginGergely Polonkai2016-02-261-2/+2
| | | | | | | | Signed-off-by: Gergely Polonkai <gergely@polonkaieu>
| * Make sure we return a JSON object when returning the values of specif…Mark Haines2016-02-251-1/+3
| | | | | | | | …ic keys from a push rule
| * Remove unused get_rule_attr methodMark Haines2016-02-241-8/+0
| |
| * Ignore invalid POST bodies when joining roomsDaniel Wagner-Hall2016-02-241-2/+12
| |
| * Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-231-0/+4
| |
| * Merge pull request #582 from matrix-org/erikj/presenceErik Johnston2016-02-194-28/+35
| |\ | | | | | | Rewrite presence for performance.
| | * "You are not..."Erik Johnston2016-02-181-1/+1
| | |
| | * Initial cutErik Johnston2016-02-174-28/+35
| | |
| * | Remove dead code for setting device specific rules.Mark Haines2016-02-182-88/+8
| | | | | | | | | | | | | | | | | | It wasn't possible to hit the code from the API because of a typo in parsing the request path. Since no-one was using the feature we might as well remove the dead code.
| * | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-172-2/+2
| |\| | | | | | | | | | | | | Conflicts: synapse/rest/client/v1/room.py
| | * client/v1/room: include event_id in response to state event PUT, in ↵Patrik Oldsberg2016-02-171-2/+2
| | | | | | | | | | | | | | | | | | accordance with the spec Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| | * Fix typo in request validation for adding push rules.Mark Haines2016-02-161-1/+1
| | |
| | * Simplify room creation codeDaniel Wagner-Hall2016-02-151-15/+3
| | |
| * | Some cleanupDaniel Wagner-Hall2016-02-171-3/+3
| | | | | | | | | | | | | | | I'm not particularly happy with the "action" switching, but there's no convenient way to defer the work that needs to happen after it, so... :(
| * | Branch off member and non member sendsDaniel Wagner-Hall2016-02-151-5/+16
| | | | | | | | | | | | Unclean, needs tidy-up, but works
| * | Simplify room creation codeDaniel Wagner-Hall2016-02-151-15/+3
| | |
| * | Reuse update_membership from /joinDaniel Wagner-Hall2016-02-151-16/+5
| | |
| * | Merge implementation of /join by alias or IDDaniel Wagner-Hall2016-02-151-37/+31
| | | | | | | | | | | | | | | This code is kind of rough (passing the remote servers down a long chain), but is a step towards improvement.
| * | Merge some room joining codepathsDaniel Wagner-Hall2016-02-151-1/+1
| |/ | | | | | | | | | | Force joining by alias to go through the send_membership_event checks, rather than bypassing them straight into _do_join. This is the first of many stages of cleanup.
| * Revert "Merge two of the room join codepaths"Daniel Wagner-Hall2016-02-121-13/+55
| | | | | | | | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check
| * Merge two of the room join codepathsDaniel Wagner-Hall2016-02-121-55/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point.
| * Catch the exceptions thrown by twisted when you write to a closed connectionMark Haines2016-02-124-10/+13
| |
| * Add some paranoia loggingErik Johnston2016-02-111-0/+10
| |
| * Revert "Reject additional path segments"Daniel Wagner-Hall2016-02-093-6/+6
| | | | | | | | | | | | This reverts commit 1d19a5ec0fff73af9cee8c21118020b31be47379. iOS Console is apparently relying on these paths.
| * Merge pull request #564 from matrix-org/erikj/logcontextErik Johnston2016-02-082-4/+4
| |\ | | | | | | Fix up logcontexts
| | * Fix up logcontextsErik Johnston2016-02-082-4/+4
| | |
| * | Reject additional path segmentsDaniel Wagner-Hall2016-02-083-6/+6
| |/
| * Merge pull request #557 from matrix-org/dbkr/profile_dont_return_nullDavid Baker2016-02-041-6/+17
| |\ | | | | | | Omit keys rather then returning null in profile API
| | * No braces hereDavid Baker2016-02-031-1/+1
| | |
| | * Don't return null if profile display name / avatar url isn't set: omit them ↵David Baker2016-02-031-6/+17
| | | | | | | | | | | | instead
| * | Remove old log lineErik Johnston2016-02-031-2/+0
| | |
| * | Preserve log context over when deferring to thread pool in media repoErik Johnston2016-02-031-4/+7
| |/
| * Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-032-3/+3
| |
| * Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-025-8/+8
| |
| * Merge pull request #545 from matrix-org/erikj/syncErik Johnston2016-02-021-75/+0
| |\ | | | | | | Move /sync state calculations from rest to handler
| | * Move state calculations from rest to handlerErik Johnston2016-02-011-75/+0
| | |
| * | Pull guest access token out of the auth session params, otherwise it will ↵David Baker2016-02-011-0/+1
| |/ | | | | | | break if you open the email on a different device.
| * Allow three_pid_creds as well as threePidCreds in /account/3pidMark Haines2016-01-291-2/+3
| |
| * Fix adding push rules relative to other rulesMark Haines2016-01-271-5/+10
| |
| * 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
| | |
| * | Move logic from rest/ to handlers/Erik Johnston2016-01-251-34/+23
| |/
| * Sanitize filtersErik Johnston2016-01-222-13/+13
| |
* | initial WIP of a tentative preview_url endpoint - incomplete, untested, ↵Matthew Hodgson2016-01-242-0/+167
|/ | | | experimental, etc. just putting it here for safekeeping for now
* Fix change_passwordErik Johnston2016-01-201-3/+2
|
* Whine if we give a from param to /syncErik Johnston2016-01-201-0/+7
|
* Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-202-4/+3
|
* Only compute unread notifications for rooms we send down streamErik Johnston2016-01-191-2/+1
|
* Return highlight_count in /syncErik Johnston2016-01-191-0/+1
|
* Take a deepcopy of push rules before mutating themErik Johnston2016-01-191-1/+3
|
* Use static for const dictsErik Johnston2016-01-181-1/+7
|
* Remove internal idsErik Johnston2016-01-181-0/+4
|
* Require unbanning before other membership changesDaniel Wagner-Hall2016-01-151-39/+12
|
* Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-141-0/+6
|\
| * Add 'event' result to 'context' endpointRichard van der Hoff2016-01-131-0/+6
| | | | | | | | ... because the context isn't much use without the event.
* | Fix enabling & disabling push rulesDavid Baker2016-01-141-1/+1
| |
* | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵Mark Haines2016-01-132-7/+7
| | | | | | | | of the code
* | Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-1119-128/+159
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1119-128/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-082-1/+5
|\ \ \ | | | | | | | | Send unread notification counts
| * \ \ Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-061-6/+1
| |\ \ \
| * | | | Add is_guest flag to users db to track whether a user is a guest user or ↵David Baker2016-01-061-1/+4
| | | | | | | | | | | | | | | | | | | | 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-052-8/+23
| |\ \ \ \
| * | | | | Only joined rooms have unread_notif_countDavid Baker2016-01-041-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-041-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-221-1/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-212-7/+22
| |\ \ \ \ \ \
| * | | | | | | still very WIP, but now sends unread_notifications_count in the room object ↵David Baker2015-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).
* | | | | | | | 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.
* | | | | | | copyrightsMatthew Hodgson2016-01-0743-43/+43
| | | | | | |
* | | | | | | Add /_matrix/versions to report supported versionsDaniel Wagner-Hall2016-01-062-0/+42
| |_|_|_|_|/ |/| | | | |
* | | | | | Guest users must be joined to a room to see it in /syncMark Haines2016-01-061-6/+1
| |_|_|_|/ |/| | | |
* | | | | Allow guests to upgrade their accountsDaniel Wagner-Hall2016-01-052-4/+10
| | | | |
* | | | | Use larger thumbnail rather than smaller.Erik Johnston2016-01-051-4/+13
| |_|_|/ |/| | |
* | | | Expose /login under r0Richard van der Hoff2016-01-021-1/+1
| |_|/ |/| | | | | | | | The spec says /login should be available at r0 and 'unstable', so make it so.
* | | Allow guest access if the user provides a list of rooms in the filterMark Haines2015-12-221-1/+9
| |/ |/|
* | Remove accidentally committed debug loggingMark Haines2015-12-211-1/+0
| |
* | Fix spacingMark Haines2015-12-141-1/+1
| |
* | Fix logging to lie lessMark Haines2015-12-141-2/+9
| |
* | Add commentary for fix in PR#442Mark Haines2015-12-141-0/+6
| |
* | Combine the prev content testsMark Haines2015-12-141-14/+12
| |
* | Check whether prev_content or prev_sender is set before trying to rollback stateMark Haines2015-12-141-8/+13
| |
* | Missing yieldMark Haines2015-12-101-1/+1
|/
* Allow filter JSON object in the filter query parameter in /syncMark Haines2015-12-091-9/+21
| | | | Documented by matrix-org/matrix-doc#224
* Actually host r0 and unstable prefixesDaniel Wagner-Hall2015-12-083-67/+67
|
* also do more structured loggingDavid Baker2015-12-071-0/+1
|
* pep8David Baker2015-12-071-0/+1
|
* Add logging to pushers API to log the body of the requestDavid Baker2015-12-071-0/+4
|
* Take object not boolDaniel Wagner-Hall2015-12-071-0/+5
| | | | | | Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212
* Merge pull request #415 from matrix-org/daniel/endpointsDaniel Wagner-Hall2015-12-036-35/+11
|\ | | | | Merge pull request #415 from matrix-org/daniel/endpoints
| * Update endpoints to reflect current specDaniel Wagner-Hall2015-12-026-35/+11
| |
* | Fix implementation of /admin/whoisDaniel Wagner-Hall2015-12-021-1/+1
|/
* Reuse a single http client, rather than creating new onesMark Haines2015-12-021-5/+2
|
* Add API for setting account_data globaly or on a per room basisMark Haines2015-12-013-0/+119
|
* Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0123-104/+118
|
* Rename presence_handler.send_invite to presence_handler.send_presence_invite ↵Mark Haines2015-12-011-1/+1
| | | | to distinguish it from normal invites
* Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-201-3/+10
|\ | | | | Allow users to forget rooms
| * Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-192-5/+5
| |\
| * | Allow users to forget roomsDaniel Wagner-Hall2015-11-171-3/+10
| | |
* | | Merge pull request #389 from matrix-org/rav/flatten_sync_responseRichard van der Hoff2015-11-201-25/+16
|\ \ \ | | | | | | | | v2 sync: Get rid of the event_map, and rename the keys of the rooms obj
| * \ \ Merge branch 'develop' into rav/flatten_sync_responsePaul "LeoNerd" Evans2015-11-192-5/+5
| |\ \ \ | | | |/ | | |/|
| * | | Put back the 'state.events' subobjectRichard van der Hoff2015-11-191-1/+1
| | | | | | | | | | | | | | | | We're keeping 'events', in case we decide to add more keys later.
| * | | v2 /sync: Rename the keys of the 'rooms' object to match member statesRichard van der Hoff2015-11-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | joined->join invited->invite archived->leave
| * | | Flatten the /sync response to remove the event_mapRichard van der Hoff2015-11-191-22/+13
| | |/ | |/|
* | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flowErik Johnston2015-11-201-1/+10
|\ \ \ | |_|/ |/| | Remove m.login.token from advertised flows.
| * | CommentErik Johnston2015-11-201-0/+8
| | |
| * | Remove m.login.token from advertised flows.Erik Johnston2015-11-191-1/+2
| |/
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-01 18:34:52 +0000