summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2Erik Johnston2016-11-0157-807/+1566
|\
| * Bump version and changelogErik Johnston2016-11-012-1/+7
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2Erik Johnston2016-11-011-33/+42
| |\
| | * Merge pull request #1187 from matrix-org/paul/metrics-howtoPaul Evans2016-10-311-33/+42
| | |\ | | | | | | | | Update documentation about exported prometheus metrics
| | | * Add details of renamed metricsPaul "LeoNerd" Evans2016-10-311-0/+34
| | | |
| | | * Remove long-deprecated instructions about promethesus console; also fix for ↵Paul "LeoNerd" Evans2016-10-281-33/+8
| | |/ | | | | | | | | | modern config file format
| * | Changelog formattting v0.18.2-rc5Erik Johnston2016-10-281-0/+1
| | |
| * | Bump changelog and versionMark Haines2016-10-282-1/+8
| | |
| * | Merge branch 'develop' into release-v0.18.2Mark Haines2016-10-283-9/+9
| |\|
| | * Merge pull request #1184 from matrix-org/paul/metricsPaul Evans2016-10-273-9/+9
| | |\ | | | | | | | | Bugfix for process-wide metric export on split processes
| | | * Set up the process collector during metrics __init__; that way all ↵Paul "LeoNerd" Evans2016-10-272-2/+3
| | | | | | | | | | | | | | | | split-process workers have it
| | | * Pass the Metrics group into the process collector instead of having it find ↵Paul "LeoNerd" Evans2016-10-272-8/+4
| | | | | | | | | | | | | | | | its own one; this avoids it needing to import from synapse.metrics
| | | * Allow creation of a 'subspace' within a Metrics object, returning another onePaul "LeoNerd" Evans2016-10-271-0/+3
| | |/
| * / Bump changelog and version v0.18.2-rc4Erik Johnston2016-10-272-1/+10
| |/
| * Merge pull request #1183 from matrix-org/erikj/fix_email_updateErik Johnston2016-10-271-1/+30
| |\ | | | | | | Fix user_threepids schema delta
| | * Use most recently added binding, not most recently seen user.Erik Johnston2016-10-271-19/+11
| | |
| | * Fix user_threepids schema deltaErik Johnston2016-10-271-1/+38
| |/ | | | | | | | | | | | | | | | | | | | | The delta `37/user_threepids.sql` aimed to update all the email addresses to be lower case, however duplicate emails may exist in the table already. This commit adds a step where the delta moves the duplicate emails to a new `medium` `email_old`. Only the most recently used account keeps the binding intact. We move rather than delete so that we retain some record of which emails were associated with which account.
| * Update changelog v0.18.2-rc3Erik Johnston2016-10-271-0/+1
| |
| * Bump changelog and versionErik Johnston2016-10-272-2/+8
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2Erik Johnston2016-10-2727-170/+509
| |\
| | * Merge pull request #1098 from matrix-org/markjh/bearer_tokenMark Haines2016-10-256-23/+66
| | |\ | | | | | | | | Allow clients to supply access_tokens as headers
| | | * Merge branch 'develop' into markjh/bearer_tokenMark Haines2016-09-129-45/+108
| | | |\
| | | * | Fix unit testsMark Haines2016-09-126-15/+30
| | | | |
| | | * | Merge branch 'develop' into markjh/bearer_tokenMark Haines2016-09-097-9/+89
| | | |\ \
| | | * | | Allow clients to supply access_tokens as headersMark Haines2016-09-091-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients can continue to supply access tokens as query parameters or can supply the token as a header: Authorization: Bearer <access_token_goes_here> This matches the ouath2 format of https://tools.ietf.org/html/rfc6750#section-2.1
| | * | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into developErik Johnston2016-10-252-1/+20
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fixup change log v0.18.2-rc2Erik Johnston2016-10-251-2/+2
| | | | | |
| * | | | | Bump version and changelogErik Johnston2016-10-252-1/+20
| | | | | |
| | * | | | Merge pull request #1179 from matrix-org/erikj/typing_timer_paranoiaErik Johnston2016-10-251-2/+10
| | |\ \ \ \ | | | | | | | | | | | | | | Fix infinite typing bug
| | | * | | | Fix infinite typing bugErik Johnston2016-10-241-2/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a bug somewhere that causes typing notifications to not be timed out properly. By adding a paranoia timer and using correct inequalities notifications should stop being stuck, even if it the root cause hasn't been fixed.
| | * | | | Merge pull request #1178 from matrix-org/erikj/current_room_tokenErik Johnston2016-10-244-12/+48
| | |\ \ \ \ | | | | | | | | | | | | | | Fix incredibly slow back pagination query
| | | * | | | Actually use the new functionErik Johnston2016-10-241-1/+1
| | | | | | |
| | | * | | | Fix incredubly slow back pagination queryErik Johnston2016-10-244-12/+48
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a client didn't specify a from token when paginating backwards synapse would attempt to query the (global) maximum topological token. This a) doesn't make much sense since they're room specific and b) there are no indices that lets postgres do this efficiently.
| | * | | | Merge pull request #1177 from matrix-org/paul/standard-metric-namesPaul Evans2016-10-214-66/+191
| | |\ \ \ \ | | | | | | | | | | | | | | Standardise prometheus metrics
| | | * | | | Split callback metric lambda functions down onto their own lines to keep ↵Paul "LeoNerd" Evans2016-10-191-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | line lengths under 90
| | | * | | | Adjust code for <100 char line limitPaul "LeoNerd" Evans2016-10-191-1/+1
| | | | | | |
| | | * | | | Cut the raw /proc/self/stat line up into named fields at collection timePaul "LeoNerd" Evans2016-10-191-8/+22
| | | | | | |
| | | * | | | Move the process metrics collector code into its own filePaul "LeoNerd" Evans2016-10-193-141/+161
| | | | | | |
| | | * | | | A slightly neater way to manage metric collector functionsPaul "LeoNerd" Evans2016-10-191-2/+8
| | | | | | |
| | | * | | | appease pep8Paul "LeoNerd" Evans2016-10-191-3/+5
| | | | | | |
| | | * | | | Also guard /proc/self/fds-related code with a suitable psuedoconstantPaul "LeoNerd" Evans2016-10-191-3/+5
| | | | | | |
| | | * | | | Guard registration of process-wide metrics by existence of the requisite ↵Paul "LeoNerd" Evans2016-10-191-45/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | /proc entries
| | | * | | | Add standard process_start_time_seconds metricPaul "LeoNerd" Evans2016-10-191-0/+15
| | | | | | |
| | | * | | | Add standard process_max_fds metricPaul "LeoNerd" Evans2016-10-191-0/+13
| | | | | | |
| | | * | | | Add standard process_open_fds metricPaul "LeoNerd" Evans2016-10-191-20/+29
| | | | | | |
| | | * | | | Add standard process_*_memory_bytes metricsPaul "LeoNerd" Evans2016-10-191-0/+8
| | | | | | |
| | | * | | | Use /proc/self/stat to generate the new process_cpu_*_seconds_total metricsPaul "LeoNerd" Evans2016-10-191-4/+12
| | | | | | |
| | | * | | | Export CPU usage metrics also under prometheus-standard metric namePaul "LeoNerd" Evans2016-10-191-0/+15
| | | | | | |
| | | * | | | Callback metric values might not just be integers - allow floatsPaul "LeoNerd" Evans2016-10-191-2/+2
| | | | | | |
| | * | | | | Merge pull request #1175 from ↵Luke Barnard2016-10-205-12/+35
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/luke/feature-configurable-as-rate-limiting Allow Configurable Rate Limiting Per AS
| | | * | | | | StyleLuke Barnard2016-10-201-2/+3
| | | | | | | |
| | | * | | | | Closing brace on following lineLuke Barnard2016-10-201-1/+2
| | | | | | | |
| | | * | | | | as_user->app_service, less redundant comments, better positioned commentsLuke Barnard2016-10-203-14/+11
| | | | | | | |
| | | * | | | | flake8Luke Barnard2016-10-201-1/+3
| | | | | | | |
| | | * | | | | Use real AS object by passing it through the requesterLuke Barnard2016-10-203-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means synapse does not have to check if the AS is interested, but instead it effectively re-uses what it already knew about the requesting user
| | | * | | | | Allow Configurable Rate Limiting Per ASLuke Barnard2016-10-183-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a flag loaded from the registration file of an AS that will determine whether or not its users are rate limited (by ratelimit in _base.py). Needed for IRC bridge reasons - see https://github.com/matrix-org/matrix-appservice-irc/issues/240.
| | * | | | | | Merge pull request #1164 from pik/error-codesErik Johnston2016-10-194-48/+94
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clarify Error codes for GET /filter/
| | | * | | | | | Refactor test_filter to use real DataStorepik2016-10-183-46/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add tests for filter api errors
| | | * | | | | | Fix MockHttpRequest always returning M_UNKNOWN errcode in testingpik2016-10-141-1/+1
| | | | | | | | |
| | | * | | | | | Error codes for filtersAlexander Maznev2016-10-142-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add tests Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>
| | * | | | | | | Merge pull request #1176 from matrix-org/erikj/eager_ratelimit_checkErik Johnston2016-10-192-6/+25
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | Check whether to ratelimit sooner to avoid work
| | | * | | | | | CommentErik Johnston2016-10-191-0/+3
| | | | | | | | |
| | | * | | | | | Check whether to ratelimit sooner to avoid workErik Johnston2016-10-192-6/+22
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge pull request #1170 from matrix-org/dbkr/password_reset_case_insensitiveDavid Baker2016-10-192-0/+35
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make password reset email field case insensitive
| | | * | | | | | Latest delta is now 37David Baker2016-10-191-0/+0
| | | | | | | | |
| | | * | | | | | Merge remote-tracking branch 'origin/develop' into ↵David Baker2016-10-198-6/+117
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | dbkr/password_reset_case_insensitive
| | * | | | | | | Merge pull request #1174 from matrix-org/erikj/email_push_noopErik Johnston2016-10-182-1/+5
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | Reduce redundant database work in email pusher
| | | * | | | | | Fix push notifications for a single unread messageErik Johnston2016-10-181-1/+1
| | | | | | | | |
| | | * | | | | | Reduce redundant database work in email pusherErik Johnston2016-10-181-0/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the last stream ordering if the `get_unread_push_actions_for_user_in_range_for_email` returns no new push actions. This reduces the range that it needs to check next iteration.
| | * | | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into developErik Johnston2016-10-182-2/+29
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Update changelog v0.18.2-rc1Erik Johnston2016-10-171-4/+7
| | | | | | | |
| * | | | | | | Bump version and changelogErik Johnston2016-10-172-2/+26
| |/ / / / / /
| * | | | | | Merge pull request #1113 from matrix-org/erikj/remove_authErik Johnston2016-10-173-2/+82
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove redundant event_auth index
| | * | | | | | Bump schema versionErik Johnston2016-10-172-1/+1
| | | | | | | |
| | * | | | | | Remove TODOErik Johnston2016-10-171-2/+0
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_authErik Johnston2016-10-1780-1379/+2949
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #1162 from larroy/masterErik Johnston2016-10-141-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use sys.executable instead of hardcoded python. fixes #1161
| | * | | | | | | Use sys.executable instead of hardcoded python. fixes #1161Pedro Larroy2016-10-081-1/+1
| |/ / / / / / / |/| | | | | | |
| | * | | | | | Drop some unused indicesErik Johnston2016-10-173-17/+83
| | | | | | | |
| | * | | | | | Remove redundant event_auth indexErik Johnston2016-09-131-0/+16
| | | | | | | |
| | | * | | | | Convert emails to lowercase when storingDavid Baker2016-10-192-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And db migration sql to convert existing addresses.
| | | * | | | | Revert part of 6207399David Baker2016-10-141-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | older sqlite doesn't support indexes on expressions, lets just store things lowercase in the db
| | | * | | | | Merge remote-tracking branch 'origin/develop' into ↵David Baker2016-10-1417-477/+691
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | dbkr/password_reset_case_insensitive
| * | | | | | | Merge pull request #1169 from matrix-org/erikj/fix_email_notifsErik Johnston2016-10-141-14/+25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix email push notifs being dropped
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-10-1418-508/+734
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | erikj/fix_email_notifs
| * | | | | | | | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_deleteRichard van der Hoff2016-10-131-5/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | User-interactive auth on delete device
| | * | | | | | | | Handle delete device requests with no bodyRichard van der Hoff2016-10-121-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should probably return a 401 rather than a 400 for existing clients that don't know they have to do the UIA dance to delete a device.
| | * | | | | | | | User-interactive auth on delete deviceRichard van der Hoff2016-10-121-5/+11
| | | | | | | | | |
| * | | | | | | | | Merge pull request #1167 from matrix-org/markjh/fingerprintsMark Haines2016-10-122-13/+46
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add config option for adding additional TLS fingerprints
| | * | | | | | | | | Explain how long the servers can cache the TLS fingerprints forMark Haines2016-10-121-3/+4
| | | | | | | | | | |
| | * | | | | | | | | Improve comment formattingMark Haines2016-10-122-4/+7
| | | | | | | | | | |
| | * | | | | | | | | Add config option for adding additional TLS fingerprintsMark Haines2016-10-112-12/+41
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #1155 from matrix-org/erikj/pluggable_pwd_authErik Johnston2016-10-127-401/+486
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Implement pluggable password auth
| | * | | | | | | | | Implement pluggable password authErik Johnston2016-10-037-401/+486
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows delegating the password auth to an external module. This also moves the LDAP auth to using this system, allowing it to be removed from the synapse tree entirely in the future.
| * | | | | | | | | | Merge pull request #1141 from matrix-org/erikj/replication_noopErik Johnston2016-10-116-44/+114
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | Reduce DB hits for replication
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-10-1128-331/+599
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | erikj/replication_noop
| | * | | | | | | | | Fix check of wrong variableErik Johnston2016-10-111-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Reduce DB hits for replicationErik Johnston2016-09-236-45/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some streams will occaisonally advance their positions without actually having any new rows to send over federation. Currently this means that the token will not advance on the workers, leading to them repeatedly sending a slightly out of date token. This in turns requires the master to hit the DB to check if there are any new rows, rather than hitting the no op logic where we check if the given token matches the current token. This commit changes the API to always return an entry if the position for a stream has changed, allowing workers to advance their tokens correctly.
| | | | | * | | | | | Fix email push notifs being droppedErik Johnston2016-10-131-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of email push notifications were failing to be sent due to an exception being thrown along one of the (many) paths. This was due to a change where we moved from pulling out the full state for each room, but rather pulled out the event ids for the state and separately loaded the full events when needed.
| | | | | | | * | | | Make password reset email field case insensitiveDavid Baker2016-10-142-10/+36
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signupRichard van der Hoff2016-10-111-3/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Work around email-spamming Riot bug
| | * | | | | | | | | Work around email-spamming Riot bugRichard van der Hoff2016-10-111-3/+14
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d9546f9 introduced a change to synapse behaviour, in that failures in the interactive-auth process would return the flows and params data as well as an error code (as specced in https://github.com/matrix-org/matrix-doc/pull/397). That change exposed a bug in Riot which would make it request a new validation token (and send a new email) each time it got a 401 with a `flows` parameter (see https://github.com/vector-im/vector-web/issues/2447 and the fix at https://github.com/matrix-org/matrix-react-sdk/pull/510). To preserve compatibility with broken versions of Riot, grandfather in the old behaviour for the email validation stage.
| * | | | | | | | | Merge pull request #1157 from Rugvip/nolimitErik Johnston2016-10-1114-77/+64
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | Remove rate limiting from app service senders and fix get_or_create_user requester
| | * | | | | | | | rest/client/v1/register: use the correct requester in createUserPatrik Oldsberg2016-10-064-31/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| | * | | | | | | | handlers/profile: added admin override for set_displayname and set_avatar_urlPatrik Oldsberg2016-10-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| | * | | | | | | | handers: do not ratelimit app service sendersPatrik Oldsberg2016-10-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| | * | | | | | | | storage/appservice: make appservice methods only relying on the cache ↵Patrik Oldsberg2016-10-0610-41/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronous
| * | | | | | | | | Merge pull request #1150 from Rugvip/state_keyErik Johnston2016-10-111-10/+0
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | api/auth: fix for not being allowed to set your own state_key
| | * | | | | | | | api/auth: fix for not being allowed to set your own state_keyPatrik Oldsberg2016-09-301-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| * | | | | | | | | Merge pull request #1160 from matrix-org/rav/401_on_password_failRichard van der Hoff2016-10-071-32/+52
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Interactive Auth: Return 401 from for incorrect password
| | * | | | | | | | | Interactive Auth: Return 401 from for incorrect passwordRichard van der Hoff2016-10-071-32/+52
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires a bit of fettling, because I want to return a helpful error message too but we don't want to distinguish between unknown user and invalid password. To avoid hardcoding the error message into 15 places in the code, I've had to refactor a few methods to return None instead of throwing. Fixes https://matrix.org/jira/browse/SYN-744
| * | | | | | | | | Merge pull request #1159 from matrix-org/rav/uia_fallback_postmessageRichard van der Hoff2016-10-061-1/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | window.postmessage for Interactive Auth fallback
| | * | | | | | | | window.postmessage for Interactive Auth fallbackRichard van der Hoff2016-10-061-1/+3
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you're a webapp running the fallback in an iframe, you can't set set a window.onAuthDone function. Let's post a message back to window.opener instead.
| * | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-10-052-1/+30
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse v0.18.1Erik Johnston2016-10-0524-611/+942
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump changelog and versionErik Johnston2016-10-052-1/+7
| | | | | | | | | |
| * | | | | | | | | Update changelog v0.18.1-rc1Erik Johnston2016-09-301-0/+2
| | | | | | | | | |
| * | | | | | | | | Bump version and changelogErik Johnston2016-09-302-1/+22
| | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brandDavid Baker2016-10-041-1/+3
| |/| | | | | | | | | | | | | | | | | | | | | | | | | Add Riot brand to email notifs
| | * | | | | | | Add Riot brand to email notifsDavid Baker2016-10-041-1/+3
| |/ / / / / / /
| * | | | | | | Merge pull request #1153 from matrix-org/erikj/ldap_restructureErik Johnston2016-09-301-87/+192
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Restructure ldap authentication
| | * | | | | | | Restructure ldap authenticationMartin Weinelt2016-09-291-87/+192
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - properly parse return values of ldap bind() calls - externalize authentication methods - change control flow to be more error-resilient - unbind ldap connections in many places - improve log messages and loglevels
| * | | | | | | Merge pull request #1145 from matrix-org/erikj/fix_reindexErik Johnston2016-09-291-15/+29
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Fix background reindex of origin_server_ts
| | * | | | | | Fix background reindex of origin_server_tsErik Johnston2016-09-271-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The storage function `_get_events_txn` was removed everywhere except from this background reindex. The function was removed due to it being (almost) completely unused while also being large and complex. Therefore, instead of resurrecting `_get_events_txn` we manually reimplement the bits that are needed directly.
| * | | | | | | Merge pull request #1146 from matrix-org/erikj/port_script_fixErik Johnston2016-09-271-0/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update port script with recently added tables
| | * | | | | | | Update port script with recently added tablesErik Johnston2016-09-271-0/+9
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes a bug where the port script would explode when it encountered the newly added boolean column `public_room_list_stream.visibility`
| * | | | | | | Merge pull request #1144 from matrix-org/erikj/sqlite_state_perfErik Johnston2016-09-271-23/+29
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Fix perf of fetching state in SQLite
| | * | | | | | Remove duplicationErik Johnston2016-09-271-31/+19
| | | | | | | |
| | * | | | | | Remove unused variableErik Johnston2016-09-271-3/+0
| | | | | | | |
| | * | | | | | Fix perf of fetching state in SQLiteErik Johnston2016-09-261-20/+41
| |/ / / / / /
| * | | | | | Merge pull request #1140 from matrix-org/erikj/typing_fed_timeoutErik Johnston2016-09-266-83/+122
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Time out typing over federation
| | * | | | | | Move FEDERATION_PING_INTERVAL timer. Update log lineErik Johnston2016-09-231-8/+10
| | | | | | | |
| | * | | | | | Time out typing over federationErik Johnston2016-09-236-83/+120
| | |/ / / / /
| * | | | | | typoMatthew Hodgson2016-09-251-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-09-232-1/+55
| |\ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
* | | | | | Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse v0.18.0Erik Johnston2016-09-1980-777/+3089
|\ \ \ \ \ \
| * | | | | | Bump version and changelogErik Johnston2016-09-192-3/+16
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0Erik Johnston2016-09-195-118/+194
| |\ \ \ \ \ \
| * | | | | | | Update changelog v0.18.0-rc1Erik Johnston2016-09-161-2/+3
| | | | | | | |
| * | | | | | | Update changelog and bump versionErik Johnston2016-09-162-1/+41
| | | | | | | |
* | | | | | | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse v0.17.3Erik Johnston2016-09-093-3/+10
|\ \ \ \ \ \ \ \
| | | | * \ \ \ \ Merge pull request #1136 from matrix-org/erikj/fix_signed_3pidErik Johnston2016-09-223-12/+35
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow invites via 3pid to bypass sender sig check
| | | | | * | | | | Update commentsErik Johnston2016-09-221-2/+3
| | | | | | | | | |
| | | | | * | | | | Add commentsErik Johnston2016-09-222-0/+6
| | | | | | | | | |
| | | | | * | | | | Shuffle things around to make unit tests workErik Johnston2016-09-222-15/+16
| | | | | | | | | |
| | | | | * | | | | Allow invites via 3pid to bypass sender sig checkErik Johnston2016-09-222-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a server sends a third party invite another server may be the one that the inviting user registers with. In this case it is that remote server that will issue an actual invitation, and wants to do it "in the name of" the original invitee. However, the new proper invite will not be signed by the original server, and thus other servers would reject the invite if it was seen as coming from the original user. To fix this, a special case has been added to the auth rules whereby another server can send an invite "in the name of" another server's user, so long as that user had previously issued a third party invite that is now being accepted.
| | | | * | | | | | Merge pull request #1132 from matrix-org/erikj/initial_sync_splitErik Johnston2016-09-226-383/+461
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | Support /initialSync in synchrotron worker
| | | | | * | | | | Support /initialSync in synchrotron workerErik Johnston2016-09-216-383/+461
| | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merge pull request #1134 from matrix-org/erikj/fix_stream_public_deletionErik Johnston2016-09-213-6/+31
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix _delete_old_forward_extrem_cache query
| | | | | * | | | | Match against event_id, rather than room_idErik Johnston2016-09-211-1/+1
| | | | | | | | | |
| | | | | * | | | | Remove spurious AS clauseErik Johnston2016-09-211-1/+1
| | | | | | | | | |
| | | | | * | | | | Update correct tableErik Johnston2016-09-211-6/+10
| | | | | | | | | |
| | | | | * | | | | Readd entries to public_room_list_stream that were deletedErik Johnston2016-09-212-1/+23
| | | | | | | | | |
| | | | | * | | | | Fix _delete_old_forward_extrem_cache queryErik Johnston2016-09-211-5/+4
| | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merge pull request #1133 from matrix-org/erikj/public_room_countErik Johnston2016-09-211-0/+3
| | | |/| | | | | | | | | | | | | | | | | | | | | | | Add total_room_count_estimate to /publicRooms
| | | | * | | | | Add total_room_count_estimate to /publicRoomsErik Johnston2016-09-211-0/+3
| | | |/ / / / /
| | | * | | | | Merge pull request #1131 from matrix-org/matthew/e2e-notifsErik Johnston2016-09-191-0/+49
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Notify on e2e events
| | | | * | | | | _id field must uniquely identify different conditionsErik Johnston2016-09-191-2/+2
| | | | | | | | |
| | | | * | | | | proposal for notifying on e2e eventsMatthew Hodgson2016-09-171-0/+49
| | | | | | | | |
| | | * | | | | | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pagErik Johnston2016-09-191-12/+25
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle fact that _generate_room_entry may not return a room entry
| | | | * | | | | | PEP8Erik Johnston2016-09-171-1/+1
| | | | | | | | | |
| | | | * | | | | | Handle fact that _generate_room_entry may not return a room entryErik Johnston2016-09-171-12/+25
| | | | | | | | | |
| | | * | | | | | | Enable guest access to POST /publicRoomsErik Johnston2016-09-171-2/+2
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pagErik Johnston2016-09-171-110/+123
| | | |\| | | | | | | | | | | | | | | | | | | | | | | Fix and clean up publicRooms pagination
| | | | * | | | | SpellingErik Johnston2016-09-171-1/+1
| | | | | | | | |
| | | | * | | | | Fix and clean up publicRooms paginationErik Johnston2016-09-171-110/+123
| | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge pull request #1127 from matrix-org/dbkr/publicroom_search_case_insensitiveErik Johnston2016-09-171-4/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Make public room search case insensitive
| | | | * | | | | Make public room search case insensitiveDavid Baker2016-09-161-4/+4
| | | |/ / / / / | | |/| | | | |
| | | * | | | | mention client_reader workerMatthew Hodgson2016-09-171-0/+1
| | | | | | | |
| | | * | | | | fix logger for client_reader workerMatthew Hodgson2016-09-171-1/+1
| | |/ / / / /
| | * | | | | Fix public room pagination for client_reader appErik Johnston2016-09-161-0/+1
| | | | | | |
| | * | | | | Merge pull request #1126 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-167-24/+158
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Add very basic filter API to /publicRooms
| | | * | | | | CommentErik Johnston2016-09-161-0/+2
| | | | | | | |
| | | * | | | | Make POST /publicRooms require authErik Johnston2016-09-161-2/+1
| | | | | | | |
| | | * | | | | CommentErik Johnston2016-09-161-0/+2
| | | | | | | |
| | | * | | | | Add remote reoom cacheErik Johnston2016-09-161-2/+23
| | | | | | | |
| | | * | | | | Support filtering remote room listsErik Johnston2016-09-163-6/+18
| | | | | | | |
| | | * | | | | Filter remote rooms lists locallyErik Johnston2016-09-162-11/+25
| | | | | | | |
| | | * | | | | Don't cache searched in /publicRoomsErik Johnston2016-09-161-1/+5
| | | | | | | |
| | | * | | | | Add new storage function to slave storeErik Johnston2016-09-161-0/+1
| | | | | | | |
| | | * | | | | Add very basic filter API to /publicRoomsErik Johnston2016-09-151-5/+18
| | | | | | | |
| | | * | | | | Change the way we calculate new_limit in /publicRooms and add POST APIErik Johnston2016-09-152-15/+62
| | | | | | | |
| | | * | | | | Handling expiring stream extrems correctly.Erik Johnston2016-09-152-3/+22
| | |/ / / / /
| | * | | | | Merge pull request #1125 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-152-6/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Change get_pos_of_last_change to return upper bound
| | | * | | | | Change get_pos_of_last_change to return upper boundErik Johnston2016-09-152-6/+6
| | | | | | | |
| | * | | | | | Merge pull request #1124 from matrix-org/erikj/enable_state_caching_workersErik Johnston2016-09-156-0/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Enable state caches on workers
| | | * | | | | | Enable state caches on workersErik Johnston2016-09-156-0/+6
| | | | | | | | |
| | * | | | | | | Merge pull request #1123 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-153-2/+19
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / Use stream_change cache to make get_forward_extremeties_for_room cache more effective
| | | * | | | | Use stream_change cache to make get_forward_extremeties_for_room cache more ↵Erik Johnston2016-09-153-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effective
| | * | | | | | Merge pull request #1122 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-152-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | Add cache to get_forward_extremeties_for_room
| | | * | | | | Add cache to get_forward_extremeties_for_roomErik Johnston2016-09-152-1/+2
| | |/ / / / /
| | * | | | | Remove default public rooms limitErik Johnston2016-09-151-1/+1
| | | | | | |
| | * | | | | Merge pull request #1120 from matrix-org/erikj/push_invite_cacheErik Johnston2016-09-151-9/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Ensure we don't mutate the cache of push rules
| | | * | | | | Ensure we don't mutate the cache of push rulesErik Johnston2016-09-151-9/+1
| | | | | | | |
| | * | | | | | Merge pull request #1121 from matrix-org/erikj/public_room_paginateErik Johnston2016-09-1518-139/+595
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Add pagination support to publicRooms
| | | * | | | | By default limit /publicRooms to 100 entriesErik Johnston2016-09-151-1/+1
| | | | | | | |
| | | * | | | | Stream public room changes down replicationErik Johnston2016-09-154-1/+74
| | | | | | | |
| | | * | | | | Base public room list off of public_rooms streamErik Johnston2016-09-152-7/+79
| | | | | | | |
| | | * | | | | Pass since/from parameters over federationErik Johnston2016-09-156-57/+63
| | | | | | | |
| | | * | | | | Allow paginating both forwards and backwardsErik Johnston2016-09-152-24/+65
| | | | | | | |
| | | * | | | | Remove support for aggregate room listsErik Johnston2016-09-153-65/+1
| | | | | | | |
| | | * | | | | Accept optional token to public room listErik Johnston2016-09-152-7/+76
| | | | | | | |
| | | * | | | | Calculate the public room list from a stream_orderingErik Johnston2016-09-142-3/+43
| | | | | | | |
| | | * | | | | Refactor public rooms to not pull out the full state for each roomErik Johnston2016-09-142-16/+33
| | | | | | | |
| | | * | | | | Add a room visibility streamErik Johnston2016-09-144-16/+100
| | | | | | | |
| | | * | | | | Add a DB index to figure out past state at a stream ordering in a roomErik Johnston2016-09-142-0/+118
| | | | | | | |
| | * | | | | | Merge pull request #1117 from matrix-org/erikj/fix_stateErik Johnston2016-09-143-20/+30
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ensure we don't mutate state cache entries
| | | * | | | | | Amalgamate two identical consecutive if statementsErik Johnston2016-09-141-7/+5
| | | | | | | | |
| | | * | | | | | Fix reindexErik Johnston2016-09-141-15/+16
| | | | | | | | |
| | | * | | | | | Ensure we don't mutate state cache entriesErik Johnston2016-09-143-22/+33
| | | | | | | | |
| | * | | | | | | Merge pull request #1118 from matrix-org/erikj/public_rooms_splitoutErik Johnston2016-09-145-159/+403
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / Split out public room list into a worker process
| | | * | | | | Enable testing of client_readerErik Johnston2016-09-141-0/+2
| | | | | | | |
| | | * | | | | Split out public room list into a worker processErik Johnston2016-09-141-0/+215
| | | | | | | |
| | | * | | | | Move RoomListHandler into a separate fileErik Johnston2016-09-143-159/+186
| | |/ / / / /
| | * | | | | Merge pull request #1111 from matrix-org/matthew/device-idsMatthew Hodgson2016-09-141-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | make device IDs more useful for human disambiguation
| | | * | | | | make device IDs more useful for human disambiguationMatthew Hodgson2016-09-131-1/+1
| | | | | | | |
| | * | | | | | Merge pull request #1116 from matrix-org/paul/tiny-fixesPaul Evans2016-09-131-2/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo "persiting"
| | | * | | | | | Fix typo "persiting"Paul "LeoNerd" Evans2016-09-131-2/+2
| | | | | | | | |
| | * | | | | | | Merge pull request #1114 from matrix-org/markjh/limit_key_retriesMark Haines2016-09-131-11/+30
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | Limit how often we ask for keys from dead servers
| | | * | | | | | Limit how often we ask for keys from dead serversMark Haines2016-09-131-11/+30
| | |/ / / / / /
| | * | | | | | Merge pull request #1112 from matrix-org/markjh/e2e_key_handlerMark Haines2016-09-132-115/+118
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | Move the E2E key handling into the e2e handler
| | | * | | | | Move the E2E key handling into the e2e handlerMark Haines2016-09-132-115/+118
| | |/ / / / /
| | * | | | | Merge pull request #1110 from matrix-org/markjh/e2e_timeoutMark Haines2016-09-135-55/+115
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Add a timeout parameter for end2end key queries.
| | | * | | | | Add a timeout parameter for end2end key queries.Mark Haines2016-09-125-55/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a timeout parameter for controlling how long synapse will wait for responses from remote servers. For servers that fail include how they failed to make it easier to debug. Fetch keys from different servers in parallel rather than in series. Set the default timeout to 10s.
| | * | | | | | Merge pull request #1109 from matrix-org/erikj/partial_indicesErik Johnston2016-09-134-10/+41
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add WHERE clause support to index creation
| | | * | | | | | Remove where clauseErik Johnston2016-09-121-1/+0
| | | | | | | | |
| | | * | | | | | Index contains_url for file search queriesErik Johnston2016-09-122-0/+25
| | | | | | | | |
| | | * | | | | | Add WHERE clause support to index creationErik Johnston2016-09-122-10/+17
| | | | | | | | |
| | * | | | | | | Merge pull request #1108 from matrix-org/erikj/create_dmErik Johnston2016-09-121-0/+6
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | Add is_direct param to /createRoom
| | | * | | | | | Add is_direct param to /createRoomErik Johnston2016-09-121-0/+6
| | | |/ / / / /
| | * | | | | | Merge pull request #1107 from matrix-org/erikj/backfill_noneErik Johnston2016-09-121-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix backfill when cannot find an event.
| | | * | | | | | Fix backfill when cannot find an event.Erik Johnston2016-09-121-1/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | `get_pdu` can succeed but return None.
| | * | | | | | Merge pull request #1106 from matrix-org/erikj/state_reindex_concurrentErik Johnston2016-09-121-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Create new index concurrently
| | | * | | | | | Create new index concurrentlyErik Johnston2016-09-121-1/+1
| | | |/ / / / /
| | * | | | | | Merge pull request #1105 from matrix-org/erikj/make_notif_highlight_query_fastErik Johnston2016-09-122-1/+29
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Optimise /notifications query
| | | * | | | | Change the index to be stream_ordering, highlightErik Johnston2016-09-121-1/+1
| | | | | | | |
| | | * | | | | Remove unused importErik Johnston2016-09-121-1/+0
| | | | | | | |
| | | * | | | | Use register_background_index_updateErik Johnston2016-09-121-24/+4
| | | | | | | |
| | | * | | | | Add back in query changeErik Johnston2016-09-121-1/+3
| | | | | | | |
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-09-1216-48/+133
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/make_notif_highlight_query_fast
| | | * | | | | | Make reindex happen in bgErik Johnston2016-09-122-3/+32
| | | | | | | | |
| | * | | | | | | Merge pull request #1104 from matrix-org/markjh/direct_to_device_federation_syncMark Haines2016-09-121-0/+2
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | Fix direct to device messages recieved over federation to notify sync
| | | * | | | | | Fix direct to device messages recieved over federation to notify syncMark Haines2016-09-121-0/+2
| | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge pull request #1103 from matrix-org/markjh/comment_on_create_indexMark Haines2016-09-126-0/+24
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Add comments to existing schema deltas that used "CREATE INDEX" directly
| | | * | | | | Add comments to existing schema deltas that used "CREATE INDEX" directlyMark Haines2016-09-126-0/+24
| | |/ / / / /
| | * | | | | Merge pull request #1102 from ↵Erik Johnston2016-09-122-21/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/revert-1099-dbkr/make_notif_highlight_query_fast Revert "Add index to event_push_actions"
| | | * | | | | Revert "Add index to event_push_actions"Erik Johnston2016-09-122-21/+1
| | |/ / / / /
| | * | | | | Merge pull request #1101 from matrix-org/erikj/state_types_idxErik Johnston2016-09-121-19/+35
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Change state fetch query for postgres to be faster
| | | * | | | | Change state fetch query for postgres to be fasterErik Johnston2016-09-121-19/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that postgres doesn't like doing a list of OR's and is about 1000x slower, so we just issue a query for each specific type seperately.
| | * | | | | | Merge pull request #1097 from matrix-org/erikj/replication_typing_restErik Johnston2016-09-122-1/+11
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Correctly handle typing stream id resetting
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-22 05:28:58 +0000