62514bb81b
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813
2019-01-25 10:07:08 +00:00
efb8ed1d45
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_format_version
2019-01-24 18:52:34 +00:00
edc1e21dbe
Merge pull request #4448 from matrix-org/erikj/get_pdu_versions
...
Add room_version param to get_pdu
2019-01-24 18:47:15 +00:00
80bcca659e
Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites
...
Store rejected remote invite events as outliers
2019-01-24 18:33:27 +00:00
664b7a2920
Merge pull request #4437 from matrix-org/erikj/event_format_version_v2
...
Add support for persisting event format versions
2019-01-24 18:32:30 +00:00
d148c43050
Review comments
2019-01-24 18:31:23 +00:00
26f44164c8
Review comments
2019-01-24 18:28:00 +00:00
5ee1f997a8
Update make_membership_event docs
2019-01-24 18:08:08 +00:00
9139b87be4
Remove unecessary setting of outlier bit
2019-01-24 18:04:02 +00:00
b8082a5445
Use term 'out of band membership' instead
2019-01-24 17:33:19 +00:00
a383289b0d
Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms
2019-01-24 17:23:51 +00:00
e1781b043b
Remove redundant create event None check
2019-01-24 17:23:39 +00:00
03c85335d1
Apply suggestions from code review
...
Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
2019-01-24 17:22:09 +00:00
8ea509a935
Update synapse/api/filtering.py
...
Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
2019-01-24 17:21:35 +00:00
50c396a7ee
Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix
...
Add a 60s timeout to filtered room directory queries
2019-01-24 15:24:35 +00:00
075ff3ede9
Change default timeout value from 0 to None
2019-01-24 15:10:22 +00:00
5b1dc94083
Use self.clock instead of datetime
2019-01-24 14:59:50 +00:00
a2d85144e5
isort
2019-01-24 14:22:26 +00:00
4a6e863843
Merge pull request #4464 from matrix-org/rav/fix_srv_lookup
...
MatrixFederationAgent: Look up the right SRV record
2019-01-24 13:57:51 +00:00
8c58c10697
Generate the debian config during build ( #4444 )
...
Rather than hardcoding a config which we always forget to update, generate it
from the default config.
2019-01-24 13:39:01 +00:00
f4697b5ec1
Fix UnboundLocalError in post_urlencoded_get_json ( #4460 )
...
This could cause exceptions if the id server returned 4xx responses.
2019-01-24 13:38:29 +00:00
afd69a0920
Look up the right SRV record
2019-01-24 13:31:43 +00:00
e1c8440e0c
lots more tests for MatrixFederationAgent
2019-01-24 13:28:07 +00:00
10b89d5c2e
Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check
...
Neilj/fix threepid auth check
2019-01-24 13:02:50 +00:00
2a360e834f
Add changelog
2019-01-24 12:47:35 +00:00
5541645e80
lint
2019-01-24 12:45:32 +00:00
068aa1d228
Time out filtered room dir queries after 60s
2019-01-24 12:44:27 +00:00
5c41b22359
Merge pull request #4458 from matrix-org/dbkr/public_baseurl_doc
...
Clarify docs for public_baseurl
2019-01-24 12:36:09 +00:00
0e27501ee5
Fix UPSERT check ( #4459 )
2019-01-24 22:57:41 +11:00
e8c9f15397
Replace missed usages of FrozenEvent
2019-01-24 11:14:07 +00:00
1f2058fca5
Changelog
2019-01-24 10:57:12 +00:00
92d8a068ad
Clarify docs for public_baseurl
...
This is leading to problems with people upgrading to clients that
support MSC1730 because people have this misconfigured, so try
to make the docs completely unambiguous.
2019-01-24 10:52:06 +00:00
58f6c48183
Use native UPSERTs where possible ( #4306 )
2019-01-24 21:31:54 +11:00
97fd29c019
Don't send IP addresses as SNI ( #4452 )
...
The problem here is that we have cut-and-pasted an impl from Twisted, and then
failed to maintain it. It was fixed in Twisted in
https://github.com/twisted/twisted/pull/1047/files ; let's do the same here.
2019-01-24 09:34:44 +00:00
e79ba9eb34
Fix tests
2019-01-24 09:28:16 +00:00
073173277c
Newsfile
2019-01-23 20:27:31 +00:00
f431ff3fb8
Require event format version to parse or create events
2019-01-23 20:21:33 +00:00
17898a5ba6
Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse into erikj/require_format_version
2019-01-23 20:13:07 +00:00
7c288c2250
Clarify the invite flows
2019-01-23 20:07:47 +00:00
07f62da55a
Remove unnecessary '_sign_event'
2019-01-23 20:04:57 +00:00
183738f469
Newsfile
2019-01-23 20:04:57 +00:00
886e5acc76
Store rejected remote invite events as outliers
...
Currently they're stored as non-outliers even though the server isn't in
the room, which can be problematic in places where the code assumes it
has the state for all non outlier events.
In particular, there is an edge case where persisting the leave event
triggers a state resolution, which requires looking up the room version
from state. Since the server doesn't have the state, this causes an
exception to be thrown.
2019-01-23 20:04:57 +00:00
2a8edbaf74
Merge branch 'erikj/get_pdu_versions' into erikj/require_format_version
2019-01-23 17:27:49 +00:00
fd654a4d54
Merge branch 'erikj/msc_1813' into erikj/require_format_version
2019-01-23 17:27:43 +00:00
c5a125b24f
Update newsfile
2019-01-23 17:26:06 +00:00
4a8b715679
Newsfile
2019-01-23 17:25:27 +00:00
a4ef8d8dd5
Newsfile
2019-01-23 17:24:44 +00:00
6a41d2a187
Add room_version param to get_pdu
...
When we add new event format we'll need to know the event format or room
version when parsing events.
2019-01-23 17:19:58 +00:00
67cd4dad81
Implement MSC 1813 - Add room version to make APIs
...
We also implement `make_membership_event` converting the returned
room version to an event format version.
2019-01-23 16:51:46 +00:00
6b90ae6efc
Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backport
...
Add metric for user dir current event stream position
2019-01-23 15:58:40 +00:00
Erik Johnston