From b4c07995d68dbeffa2161920cb4cd61ea2be8389 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 15 Jul 2020 11:30:32 +0100 Subject: [PATCH 1/2] Create FUNDING.yml --- .github/FUNDING.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..1a57677a0 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,4 @@ +# One username per supported platform and one custom link +patreon: matrixdotorg +liberapay: matrixdotorg +custom: https://paypal.me/matrixdotorg From c3c3fb4d0d60645f8b774d1b63df86cfa72c8626 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 15 Jul 2020 11:32:31 +0100 Subject: [PATCH 2/2] Blacklist test due to requiring rejected events --- sytest-blacklist | 4 ++++ sytest-whitelist | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sytest-blacklist b/sytest-blacklist index 11841204c..89c61c969 100644 --- a/sytest-blacklist +++ b/sytest-blacklist @@ -52,5 +52,9 @@ Remote invited user can see room metadata # this test thinks it's all fine... Inbound federation accepts a second soft-failed event +# Relies on a rejected PL event which will never be accepted into the DAG +# Caused by https://github.com/matrix-org/sytest/pull/911 +Outbound federation requests missing prev_events and then asks for /state_ids and resolves the state + # We don't implement lazy membership loading yet. The only membership state included in a gapped incremental sync is for senders in the timeline diff --git a/sytest-whitelist b/sytest-whitelist index ad7a67f6d..d385d9b0a 100644 --- a/sytest-whitelist +++ b/sytest-whitelist @@ -280,7 +280,6 @@ Inbound federation of state requires event_id as a mandatory paramater Inbound federation can get state_ids for a room Inbound federation of state_ids requires event_id as a mandatory paramater Federation rejects inbound events where the prev_events cannot be found -Outbound federation requests missing prev_events and then asks for /state_ids and resolves the state Alternative server names do not cause a routing loop Events whose auth_events are in the wrong room do not mess up the room state Inbound federation can return events