fc1f932cc0
Move arg default to the start of the function
...
Also don't overwrite the list that gets passed in.
2016-03-02 16:44:14 +00:00
863d3f26b3
fix pyflakes quibble
2016-03-02 15:52:50 +00:00
9ff940a0ef
Address review comments
2016-03-02 15:40:30 +00:00
05ea111c47
Fix pyflakes warning
2016-03-01 17:45:24 +00:00
8a1d3b86af
Handle rejections of invites from local users locally
...
Slightly hacky fix to SYN-642, which avoids the federation codepath when trying
to reject invites from local users.
2016-03-01 17:27:22 +00:00
bfdcc7b9b6
Merge pull request #607 from matrix-org/dbkr/send_inviter_member_event
...
Send the invier's member event in room invite state
2016-02-26 14:32:08 +00:00
de27f7fc79
Add support for changing the actions for default rules
...
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``
2016-02-26 14:28:19 +00:00
413e36b17a
Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_event
2016-02-26 13:40:25 +00:00
87acd8fb07
Fix to appease the PEP8 dragon
2016-02-26 12:05:38 +01:00
a53774721a
Add error codes for malformed/bad JSON in /login
...
Signed-off-by: Gergely Polonkai <gergely@polonkaieu>
2016-02-26 10:22:35 +01:00
0f0b011440
Send the invier's member event in room invite state so the invitee has their display name and avatar.
2016-02-25 18:12:09 +00:00
15c2ac2cac
Make sure we return a JSON object when returning the values of specif…
...
…ic keys from a push rule
2016-02-25 15:13:07 +00:00
4ecfbac85f
Merge branch 'develop' into markjh/dead_code
2016-02-24 16:37:46 +00:00
9892d017b2
Remove unused get_rule_attr method
2016-02-24 16:31:07 +00:00
33300673b7
Generate guest access token on 3pid invites
...
This means that following the same link across multiple sessions or
devices can re-use the same guest account.
Note that this is somewhat of an abuse vector; we can't throw up
captchas on this flow, so this is a way of registering ephemeral
accounts for spam, whose sign-up we don't rate limit.
2016-02-24 14:41:25 +00:00
869580206d
Ignore invalid POST bodies when joining rooms
2016-02-24 08:50:28 +00:00
e7ab0e0f9f
Merge pull request #603 from matrix-org/erikj/presence
...
Create a new stream_id per presence update
2016-02-23 16:14:01 +00:00
6451fcd085
Create a new stream_id per presence update
2016-02-23 15:51:39 +00:00
b5f77eb12a
Check presence token interval is less than 100, rather than the token itself
2016-02-23 15:47:37 +00:00
e3e0ac6ec7
Merge pull request #602 from matrix-org/erikj/presence
...
Change the way we figure out presence updates for small deltas
2016-02-23 15:18:41 +00:00
577951b032
Allow third_party_signed to be specified on /join
2016-02-23 15:11:25 +00:00
13f86c3489
Handle get_all_entities_changed returning None
2016-02-23 15:05:37 +00:00
6e0209112b
Add comments
2016-02-23 14:57:45 +00:00
c77dae7a1a
Change the way we figure out presence updates for small deltas
2016-02-23 14:54:40 +00:00
a7b2ce32f7
Merge pull request #600 from matrix-org/erikj/presence
...
Measure PresenceEventSource.get_new_events
2016-02-23 14:54:26 +00:00
02e928cf9b
Don't include defer.returnValue in Measure block
2016-02-23 14:52:16 +00:00
56a94ccd9e
Measure PresenceEventSource.get_new_events
2016-02-23 14:52:16 +00:00
baf056bae8
handlers/sync: style fix, line too long
...
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
2016-02-23 15:49:36 +01:00
138c405974
Pick up currently_active across federation
2016-02-23 10:40:11 +00:00
1dcfb201c4
handlers/sync: fix SyncResult not counting account_data change when converting to bool
...
This fixes account_data events not triggering an immediate /sync response
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
2016-02-23 00:21:59 +01:00
f7e3de02ef
Merge pull request #587 from matrix-org/rav/guest_access_after_room_join
...
Allow guest users access to messages in rooms they have joined
2016-02-22 16:36:06 +00:00
5be3944730
address review comments
...
drop commented-out special casing for historyvisibility event
s/he/they/ for users
2016-02-22 15:27:44 +00:00
9e696bd6a3
Remove superfluous call to get_state_at when we already have an event for that stream position
2016-02-22 13:54:46 +00:00
6c5b147a39
Interpret unknown visibilities the same as shared
2016-02-19 17:11:11 +00:00
3dbaeef58c
Correctly filter states
2016-02-19 12:27:35 +00:00
42ac5f0c1a
Only send presence updates to remote hosts if user is ours
2016-02-19 12:19:56 +00:00
05aee12652
Merge branch 'develop' into rav/guest_access_after_room_join
2016-02-19 12:00:16 +00:00
24d9f2c140
Add Measures to presence
2016-02-19 11:50:48 +00:00
b71ca2b014
Allow guest users access to messages in rooms they have joined
...
There should be no difference between guest users and non-guest users in terms
of access to messages. Define the semantics of the is_peeking argument to
filter_events_for_clients (slightly) better; interpret it appropriately, and
set it correctly from /sync.
2016-02-19 11:41:02 +00:00
4a95eb0a12
Add presence metric
2016-02-19 11:32:04 +00:00
be799453aa
Remove spurious extra metrics
2016-02-19 11:29:33 +00:00
ea7786e8ca
Merge pull request #586 from matrix-org/erikj/presence
...
Fix presence `currently_active`. Add presence metrics.
2016-02-19 11:26:32 +00:00
929cb0ed7d
Don't set currently_active for remote presence
2016-02-19 10:58:27 +00:00
5f4eca3816
More metrics
2016-02-19 10:21:41 +00:00
5614b4dafb
Add presence metrics
2016-02-19 09:50:54 +00:00
e5ad2e5267
Merge pull request #582 from matrix-org/erikj/presence
...
Rewrite presence for performance.
2016-02-19 09:37:50 +00:00
e12ec335a5
"You are not..."
2016-02-18 17:01:53 +00:00
220231d8e3
Merge pull request #573 from matrix-org/erikj/sync_fix
...
Mitigate against incorrect old state in /sync.
2016-02-18 16:40:58 +00:00
e6c5e3f28a
Close cursor
2016-02-18 16:39:28 +00:00
42109a62a4
Remove unused param from get_max_token
2016-02-18 16:37:28 +00:00
Richard van der Hoff