Mark Haines
|
2a0ec3b89d
|
Merge branch 'develop' into markjh/edu_frequency
Conflicts:
synapse/handlers/federation.py
synapse/handlers/room.py
|
2015-12-02 10:40:22 +00:00 |
|
Mark Haines
|
a9526831a4
|
Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what
|
2015-12-01 20:53:04 +00:00 |
|
Mark Haines
|
ed0f79bdc5
|
Only fire user_joined_room if the membership has changed
|
2015-12-01 19:46:15 +00:00 |
|
Erik Johnston
|
c0b3554401
|
Fix missing profile data in federation joins
There was a regression where we stopped including profile data in
initial joins for rooms joined over federation.
|
2015-11-12 16:19:55 +00:00 |
|
Daniel Wagner-Hall
|
38d82edf0e
|
Allow guest users to join and message rooms
|
2015-11-10 16:57:13 +00:00 |
|
Daniel Wagner-Hall
|
2cebe53545
|
Exchange 3pid invites for m.room.member invites
|
2015-11-05 16:43:19 +00:00 |
|
Mark Haines
|
c452dabc3d
|
Remove the LockManager class because it wasn't being used
|
2015-11-04 14:08:15 +00:00 |
|
Daniel Wagner-Hall
|
137fafce4e
|
Allow rejecting invites
This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave.
|
2015-10-20 11:58:58 +01:00 |
|
Daniel Wagner-Hall
|
f38df51e8d
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-15 11:51:55 +01:00 |
|
Erik Johnston
|
858634e1d0
|
Remove unused room_id arg
|
2015-10-14 09:31:20 +01:00 |
|
Daniel Wagner-Hall
|
0c38e8637f
|
Remove unnecessary class-wrapping
|
2015-10-13 18:00:38 +01:00 |
|
Daniel Wagner-Hall
|
bb407cd624
|
Re-add accidentally removed code
|
2015-10-13 17:19:26 +01:00 |
|
Daniel Wagner-Hall
|
17dffef5ec
|
Move event contents into third_party_layout field
|
2015-10-13 15:48:12 +01:00 |
|
Daniel Wagner-Hall
|
d4bb28c59b
|
Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation""
This reverts commit 34d26d3687.
|
2015-10-06 09:58:21 -05:00 |
|
Daniel Wagner-Hall
|
c05b5ef7b0
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-06 08:10:34 -05:00 |
|
Daniel Wagner-Hall
|
34d26d3687
|
Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"
This reverts commit 5879edbb09, reversing
changes made to b43930d4c9.
|
2015-10-05 19:10:47 -05:00 |
|
Daniel Wagner-Hall
|
58e6a58eb7
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-05 10:33:41 -05:00 |
|
Erik Johnston
|
49ebd472fa
|
Explicitly add Create event as auth event
|
2015-10-02 13:22:36 +01:00 |
|
Erik Johnston
|
5879edbb09
|
Merge pull request #283 from matrix-org/erikj/atomic_join_federation
Atomically persist events when joining a room over federation/
|
2015-10-02 09:18:44 +01:00 |
|
Daniel Wagner-Hall
|
5b3e9713dd
|
Implement third party identifier invites
|
2015-10-01 17:49:52 +01:00 |
|
Erik Johnston
|
83892d0d30
|
Comment
|
2015-09-30 16:41:48 +01:00 |
|
Erik Johnston
|
9d39615b7d
|
Rename var
|
2015-09-30 16:37:59 +01:00 |
|
Mark Haines
|
60728c8c9e
|
synapse/handlers/federation.py:_handle_auth_events was unused
|
2015-09-23 10:25:26 +01:00 |
|
Erik Johnston
|
c34ffd2736
|
Fix getting an event for a room the server forgot it was in
|
2015-09-17 10:26:03 +01:00 |
|
Erik Johnston
|
54e688277a
|
Also persist state
|
2015-09-17 10:26:03 +01:00 |
|
Erik Johnston
|
3a01901d6c
|
Capture err
|
2015-09-17 10:26:03 +01:00 |
|
Erik Johnston
|
744e7d2790
|
Also handle state
|
2015-09-17 10:26:03 +01:00 |
|
Erik Johnston
|
a3e332af19
|
Don't bail out of joining if we encounter a rejected event
|
2015-09-17 10:26:03 +01:00 |
|
Erik Johnston
|
4678055173
|
Refactor do_invite_join
|
2015-09-17 10:24:51 +01:00 |
|
Erik Johnston
|
3e9ee62db0
|
Add missing param in store.get_state_groups invocation
|
2015-08-21 09:15:13 +01:00 |
|
Erik Johnston
|
9f7f228ec2
|
Remove pointless map
|
2015-08-13 17:20:59 +01:00 |
|
Erik Johnston
|
1b994a97dd
|
Fix application of ACLs
|
2015-08-11 10:41:40 +01:00 |
|
Erik Johnston
|
07507643cb
|
Use dictionary cache to do group -> state fetching
|
2015-08-05 15:11:42 +01:00 |
|
Erik Johnston
|
4d6cb8814e
|
Speed up event filtering (for ACL) logic
|
2015-08-04 09:32:23 +01:00 |
|
Erik Johnston
|
baa55fb69e
|
Merge pull request #193 from matrix-org/erikj/bulk_persist_event
Add bulk insert events API
|
2015-07-14 10:49:24 +01:00 |
|
Erik Johnston
|
b5f0d73ea3
|
Add comment
|
2015-07-09 17:09:26 +01:00 |
|
Erik Johnston
|
fb47c3cfbe
|
Rename key and values for m.room.history_visibility. Support 'invited' value
|
2015-07-06 13:05:52 +01:00 |
|
Erik Johnston
|
c3e2600c67
|
Filter and redact events that the other server doesn't have permission to see during backfill
|
2015-07-03 17:52:57 +01:00 |
|
Erik Johnston
|
5130d80d79
|
Add bulk insert events API
|
2015-06-25 17:29:34 +01:00 |
|
Erik Johnston
|
8047fd2434
|
Merge pull request #176 from matrix-org/erikj/backfill_auth
Improve backfill.
|
2015-06-03 17:25:37 +01:00 |
|
Erik Johnston
|
1c3d844e73
|
Don't needlessly compute context
|
2015-06-03 16:41:51 +01:00 |
|
Erik Johnston
|
09e23334de
|
Add a timeout
|
2015-06-02 11:00:37 +01:00 |
|
Erik Johnston
|
02410e9239
|
Handle the fact we might be missing auth events
|
2015-06-02 10:58:35 +01:00 |
|
Erik Johnston
|
e552b78d50
|
Add some logging
|
2015-06-02 10:28:14 +01:00 |
|
Erik Johnston
|
fde0da6f19
|
Correctly look up auth_events
|
2015-06-02 10:19:38 +01:00 |
|
Erik Johnston
|
3f04a08a0c
|
Don't process events we've already processed. Remember to process state events
|
2015-06-02 10:11:32 +01:00 |
|
Erik Johnston
|
4bbfbf898e
|
Correctly pass in auth_events
|
2015-06-01 17:02:23 +01:00 |
|
Erik Johnston
|
20814fabdd
|
Actually fetch state for new backwards extremeties when backfilling.
|
2015-05-20 11:59:02 +01:00 |
|
Erik Johnston
|
7223129916
|
Don't apply new room join hack if depth > 5
|
2015-05-19 14:16:08 +01:00 |
|
Erik Johnston
|
5e7883ec19
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 10:50:43 +01:00 |
|
Erik Johnston
|
ef910a0358
|
Do work in parellel when joining a room
|
2015-05-18 17:17:04 +01:00 |
|
Mark Haines
|
899d4675dd
|
Merge branch 'notifier_unify' into notifier_performance
|
2015-05-14 11:36:44 +01:00 |
|
Mark Haines
|
63878c0379
|
Don't bother checking for updates if the stream token hasn't advanced for a user
|
2015-05-13 13:42:21 +01:00 |
|
Erik Johnston
|
80fd2b574c
|
Don't talk to yourself when backfilling
|
2015-05-12 16:19:46 +01:00 |
|
Mark Haines
|
a6fb2aa2a5
|
Merge pull request #144 from matrix-org/erikj/logging_context
Preserving logging contexts
|
2015-05-12 15:23:50 +01:00 |
|
Erik Johnston
|
07a1223156
|
s/backfil/backfill/
|
2015-05-12 14:09:54 +01:00 |
|
Erik Johnston
|
0d31ad5101
|
Typos everywhere
|
2015-05-12 14:02:01 +01:00 |
|
Erik Johnston
|
a0dfffb33c
|
And another typo.
|
2015-05-12 14:00:31 +01:00 |
|
Erik Johnston
|
6e5ac4a28f
|
Err, gatherResults doesn't take a dict...
|
2015-05-12 13:58:14 +01:00 |
|
Erik Johnston
|
95dedb866f
|
Unwrap defer.gatherResults failures
|
2015-05-12 13:14:29 +01:00 |
|
Erik Johnston
|
367382b575
|
Handle the case where the other side is unreachable when backfilling
|
2015-05-12 10:35:45 +01:00 |
|
Erik Johnston
|
84e6b4001f
|
Initial hack at wiring together pagination and backfill
|
2015-05-11 18:01:31 +01:00 |
|
Erik Johnston
|
2236ef6c92
|
Fix up leak. Add warnings.
|
2015-05-08 19:53:34 +01:00 |
|
Erik Johnston
|
2d386d7038
|
That wasn't a deferred
|
2015-05-01 14:41:25 +01:00 |
|
Erik Johnston
|
4ac2823b3c
|
Remove inlineCallbacks from non-generator
|
2015-05-01 14:41:25 +01:00 |
|
Erik Johnston
|
42c12c04f6
|
Remove some run_on_reactors
|
2015-05-01 14:41:25 +01:00 |
|
Erik Johnston
|
a43b40449b
|
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
|
2015-04-08 16:46:56 +01:00 |
|
Erik Johnston
|
19234cc6c3
|
typo
|
2015-04-08 14:10:06 +01:00 |
|
Erik Johnston
|
e8f1521605
|
Don't yield on notifying all listeners
|
2015-04-08 14:08:30 +01:00 |
|
Erik Johnston
|
278149f533
|
Sanitize TransactionStore
|
2015-03-23 13:43:21 +00:00 |
|
Erik Johnston
|
bb24609158
|
Clean out event_forward_extremities table when the server rejoins the room
|
2015-03-18 11:19:47 +00:00 |
|
Erik Johnston
|
b2e6ee5b43
|
Remove concept of context.auth_events, instead use context.current_state
|
2015-03-16 13:06:23 +00:00 |
|
Erik Johnston
|
e25e0f4da9
|
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
|
2015-02-23 14:36:00 +00:00 |
|
Erik Johnston
|
db215b7e00
|
Implement and use new batched get missing pdu
|
2015-02-23 13:58:02 +00:00 |
|
Erik Johnston
|
2bafeca270
|
Add missing comma so that it generates a dict and not a set
|
2015-02-20 14:08:42 +00:00 |
|
Erik Johnston
|
0ac2a79faa
|
Initial stab at implementing a batched get_missing_pdus request
|
2015-02-19 17:24:14 +00:00 |
|
Erik Johnston
|
47281f8fa4
|
Change some debug logging to info
|
2015-02-17 13:14:11 +00:00 |
|
Erik Johnston
|
b99a33f283
|
resolve_events expect lists, not dicts
|
2015-02-15 20:20:51 +00:00 |
|
Erik Johnston
|
b11a6e1c3c
|
Fix wrong variable name
|
2015-02-13 15:37:18 +00:00 |
|
Erik Johnston
|
e441c10a73
|
pyflakes
|
2015-02-13 14:23:39 +00:00 |
|
Erik Johnston
|
8c652a2b5f
|
When we see a difference in current state, actually use state conflict resolution algorithm
|
2015-02-13 14:20:05 +00:00 |
|
Erik Johnston
|
76935078d1
|
Remove more debug logging
|
2015-02-11 16:51:22 +00:00 |
|
Erik Johnston
|
ed877d6585
|
Remove debug logging
|
2015-02-11 16:50:46 +00:00 |
|
Erik Johnston
|
ddb816cf60
|
Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict
|
2015-02-11 15:44:28 +00:00 |
|
Erik Johnston
|
cc0532a4bf
|
Explicitly list the RejectedReasons that we can prove
|
2015-02-06 15:16:26 +00:00 |
|
Erik Johnston
|
e890ce223c
|
Don't query auth if the only difference is events that were rejected due to auth.
|
2015-02-06 14:16:50 +00:00 |
|
Erik Johnston
|
c78b5fb1f1
|
Make seen_ids a set
|
2015-02-06 13:52:16 +00:00 |
|
Erik Johnston
|
3737329d9b
|
Handle the fact the list.remove raises if element doesn't exist
|
2015-02-06 10:53:18 +00:00 |
|
Erik Johnston
|
e1515c3e91
|
Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts
|
2015-02-05 13:44:42 +00:00 |
|
Erik Johnston
|
d45e2302ed
|
Merge branch 'signature_failures' of github.com:matrix-org/synapse into federation_client_retries
|
2015-02-04 16:30:15 +00:00 |
|
Erik Johnston
|
ae46f10fc5
|
Apply sanity to the transport client interface. Convert 'make_join' and 'send_join' to accept iterables of destinations
|
2015-02-04 16:28:12 +00:00 |
|
Erik Johnston
|
650e32d455
|
Change context.auth_events to what the auth_events would be bases on context.current_state, rather than based on the auth_events from the event.
|
2015-02-04 14:06:46 +00:00 |
|
Erik Johnston
|
c0462dbf15
|
Rearrange persist_event so that do all the queries that need to be done before returning early if we have already persisted that event.
|
2015-02-04 10:16:51 +00:00 |
|
Erik Johnston
|
7dd1c5c542
|
Neaten the handling of state and auth_chain up a bit
|
2015-02-03 16:12:04 +00:00 |
|
Erik Johnston
|
6efd4d1649
|
Don't completely die if get auth_chain or querying auth_chain requests fail
|
2015-02-03 13:57:54 +00:00 |
|
Erik Johnston
|
77a076bd25
|
Set combinations is | and not +
|
2015-02-03 13:35:17 +00:00 |
|
Erik Johnston
|
fed29251d7
|
Spelling
|
2015-02-03 13:23:58 +00:00 |
|
Erik Johnston
|
06c34bfbae
|
Give exception better message
|
2015-02-03 11:23:44 +00:00 |
|
Erik Johnston
|
4ff2273b30
|
Add FIXME note.
|
2015-02-03 11:23:26 +00:00 |
|
Erik Johnston
|
51969f9e5f
|
Return rejected events if asked for it over federation.
|
2015-02-03 10:40:14 +00:00 |
|