bf49d2dca8
Replace some ujson with simplejson to make it work
2018-03-16 00:55:44 +00:00
3bc5bd2d22
make incr syncs work
2018-03-16 00:52:04 +00:00
056a6df546
Merge branch 'develop' into matthew/filter_members
2018-03-14 15:38:05 +00:00
3959754de3
Merge pull request #2995 from matrix-org/erikj/enable_membership_worker
...
Register membership/state servlets in event_creator
2018-03-14 14:37:33 +00:00
4f28018c83
Register membership/state servlets in event_creator
2018-03-14 14:30:06 +00:00
57db62e554
Merge pull request #2992 from matrix-org/erikj/implement_member_workre
...
Implement RoomMemberWorkerHandler
2018-03-14 14:29:33 +00:00
0011ede3b0
Fix imports
2018-03-14 14:19:23 +00:00
62ad701326
s/join/joined/ in notify_user_membership_change
2018-03-14 14:17:43 +00:00
3f0f06cb31
Split RoomMemberWorkerHandler to separate file
2018-03-14 11:41:45 +00:00
3e839e0548
Merge pull request #2989 from matrix-org/erikj/profile_cache_master
...
Only update remote profile cache on master
2018-03-14 09:42:27 +00:00
ebd0127999
Merge pull request #2988 from matrix-org/erikj/split_profile_store
...
Split up ProfileStore
2018-03-14 09:41:06 +00:00
cfe75a9fb6
Merge pull request #2991 from matrix-org/erikj/fixup_rm
...
_remote_join and co take a requester
2018-03-14 09:40:57 +00:00
f51565e023
Merge pull request #2993 from matrix-org/erikj/is_blocked
...
Add is_blocked to worker store
2018-03-14 09:39:18 +00:00
9f77001e27
pep8
2018-03-14 00:07:47 +00:00
4d0cfef6ee
add copyright to nudge CI
2018-03-14 00:02:20 +00:00
c9d72e4571
oops
2018-03-13 23:46:45 +00:00
d144ed6ffb
fix bug #2926 (loading all state for a given type from the DB if the state_key is None) ( #2990 )
...
Fixes a regression that had crept in where the caching layer upholds requests for loading state which is filtered by type (but not by state_key), but the DB layer itself would interpret a missing state_key as a request to filter by null state_key rather than returning all state_keys.
2018-03-13 22:36:04 +00:00
ccca02846d
make it work
2018-03-13 22:31:41 +00:00
f0f9a0605b
remove comment now #2969 is fixed
2018-03-13 22:12:15 +00:00
12350e3f9a
merge proper fix to bug 2969
2018-03-13 22:11:58 +00:00
14a9d2f73d
ensure we always include the members for a given timeline block
2018-03-13 22:03:42 +00:00
afbf4d3dcc
typoe
2018-03-13 19:48:04 +00:00
865377a70d
disable optimisation for searching for state groups
...
when type filter includes wildcards on state_key
2018-03-13 19:46:04 +00:00
a08726fc42
Add is_blocked to worker store
2018-03-13 18:28:44 +00:00
b27320b550
Implement RoomMemberWorkerHandler
2018-03-13 18:26:00 +00:00
b2aba9e430
build where_clause sanely
2018-03-13 18:13:44 +00:00
52f7e23c72
PR feedbackz
2018-03-13 18:07:55 +00:00
1b1c137771
fix bug #2926
2018-03-13 17:52:52 +00:00
350331d466
_remote_join and co take a requester
2018-03-13 17:50:39 +00:00
1a69c6d590
Merge pull request #2987 from matrix-org/erikj/split_room_member_handler
...
Split RoomMemberHandler into base and master class
2018-03-13 17:40:00 +00:00
df8ff682a7
Only update remote profile cache on master
2018-03-13 17:38:21 +00:00
3518d0ea8f
Split up ProfileStore
2018-03-13 17:36:50 +00:00
d45a114824
Raise, don't return, exception
2018-03-13 17:24:34 +00:00
6dbebef141
Add missing param to docstrings
2018-03-13 17:15:32 +00:00
16adb11cc0
Correct import order
2018-03-13 16:57:07 +00:00
82f16faa78
Move user_*_room distributor stuff to master class
...
I added yields when calling user_left_room, but they shouldn't matter on
the master process as they always return None anyway.
2018-03-13 16:38:15 +00:00
b78717b87b
Split RoomMemberHandler into base and master class
...
The intention here is to split the class into the bits that can be done
on workers and the bits that have to be done on the master.
In future there will also be a class that can be run on the worker,
which will delegate work to the master when necessary.
2018-03-13 16:37:41 +00:00
95cb401ae0
Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer
...
Remove ReplicationLayer and user Client/Server directly
2018-03-13 15:45:08 +00:00
5d8476d8ff
Merge pull request #2981 from matrix-org/erikj/factor_remote_leave
...
Factor out _remote_reject_invite in RoomMember
2018-03-13 15:44:56 +00:00
56e709857c
Merge pull request #2979 from matrix-org/erikj/no_handlers
...
Don't build handlers on workers unnecessarily
2018-03-13 13:46:38 +00:00
cb9f8e527c
s/replication_client/federation_client/
2018-03-13 13:26:52 +00:00
cea462e285
s/replication_server/federation_server
2018-03-13 13:22:21 +00:00
bf8e97bd3c
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_remote_leave
2018-03-13 13:17:08 +00:00
ea3442c15c
Add docstring
2018-03-13 13:16:21 +00:00
16469a4f15
Merge pull request #2980 from matrix-org/erikj/rm_priv
...
Make RoomMemberHandler functions private that can be
2018-03-13 13:11:11 +00:00
c82111a55f
Merge pull request #2982 from matrix-org/erikj/fix_extra_users
...
extra_users is actually a list of UserIDs
2018-03-13 13:11:04 +00:00
da87791975
Merge pull request #2983 from matrix-org/erikj/rename_register_3pid
...
Refactor get_or_register_3pid_guest
2018-03-13 13:10:52 +00:00
99e9b4f26c
Merge pull request #2984 from matrix-org/erikj/fix_rest_regeix
...
RoomMembershipRestServlet doesn't handle /forget
2018-03-13 13:10:44 +00:00
f5160d4a3e
RoomMembershipRestServlet doesn't handle /forget
...
Due to the order we register the REST handlers `/forget` was handled by
the correct handler.
2018-03-13 12:12:55 +00:00
8b3573a8b2
Refactor get_or_register_3pid_guest
2018-03-13 12:08:58 +00:00
Erik Johnston