David Baker
|
3051c9d002
|
Address minor PR issues
|
2016-01-04 13:39:29 +00:00 |
|
David Baker
|
c061b47c57
|
Merge remote-tracking branch 'origin/develop' into store_event_actions
|
2015-12-21 15:30:26 +00:00 |
|
David Baker
|
f73f154ec2
|
Only run pushers for users on this hs!
|
2015-12-21 15:28:54 +00:00 |
|
Daniel Wagner-Hall
|
bdacee476d
|
Add display_name to 3pid invite in m.room.member invites
|
2015-12-17 18:55:08 +01:00 |
|
Daniel Wagner-Hall
|
8c5f252edb
|
Strip address and such out of 3pid invites
We're not meant to leak that into the graph
|
2015-12-17 18:09:51 +01:00 |
|
David Baker
|
a84a693327
|
Having consulted The Erikle, this should go at the end of on_receive_pdu, otherwise it will be triggered whenever we backfill too.
|
2015-12-10 17:18:46 +00:00 |
|
Paul "LeoNerd" Evans
|
99afb4b750
|
Ensure that the event that gets persisted is the one that was signed
|
2015-12-10 17:08:21 +00:00 |
|
David Baker
|
21f135ba76
|
Very first cut of calculating actions for events as they come in. Doesn't store them yet. Not very efficient.
|
2015-12-10 16:26:08 +00:00 |
|
Mark Haines
|
c2c70f7daf
|
Use the context returned by _handle_new_event
|
2015-12-02 12:01:24 +00:00 |
|
Mark Haines
|
c30cdb0d68
|
Add comments
|
2015-12-02 10:49:35 +00:00 |
|
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 |
|