From 5abbec0139e9c48823d530e00c7af5f367fc7c92 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Wed, 28 Jul 2021 10:42:41 -0100 Subject: [PATCH] local circles starts local Signed-off-by: Maxence Lange --- lib/FederatedItems/CircleConfig.php | 10 ++++++++++ lib/Model/Circle.php | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/FederatedItems/CircleConfig.php b/lib/FederatedItems/CircleConfig.php index d44c6a1bf..f850e1d3a 100644 --- a/lib/FederatedItems/CircleConfig.php +++ b/lib/FederatedItems/CircleConfig.php @@ -90,6 +90,16 @@ public function verify(FederatedEvent $event): void { } } + if ($circle->isConfig(Circle::CFG_LOCAL, $config) + && !$circle->isConfig(Circle::CFG_LOCAL)) { + $config -= Circle::CFG_LOCAL; + } + + if (!$circle->isConfig(Circle::CFG_LOCAL, $config) + && $circle->isConfig(Circle::CFG_LOCAL)) { + $config += Circle::CFG_LOCAL; + } + if (!$circle->isConfig(Circle::CFG_OPEN, $config) && $circle->isConfig(Circle::CFG_OPEN) && $circle->isConfig(Circle::CFG_REQUEST, $config) diff --git a/lib/Model/Circle.php b/lib/Model/Circle.php index 16de83feb..fe5cdb169 100644 --- a/lib/Model/Circle.php +++ b/lib/Model/Circle.php @@ -157,8 +157,7 @@ class Circle extends ManagedModel implements IMemberships, IDeserializable, INC2 public static $DEF_CFG_CORE_FILTER = [ 1, 2, - 4, - 4096 + 4 ]; public static $DEF_CFG_SYSTEM_FILTER = [