From 4ddd00a091f788b6aad2c2977ae0161599a5f88b Mon Sep 17 00:00:00 2001
From: Diogo Peralta Cordeiro <mail@diogo.site>
Date: Mon, 29 Nov 2021 23:58:27 +0000
Subject: [PATCH] [NOTIFICATION] Add FreeNetwork distribution

---
 components/FreeNetwork/FreeNetwork.php   |  8 +++--
 components/Notification/Notification.php | 38 ++++++++++++------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/components/FreeNetwork/FreeNetwork.php b/components/FreeNetwork/FreeNetwork.php
index 7dc6f72002..e5b429e00a 100644
--- a/components/FreeNetwork/FreeNetwork.php
+++ b/components/FreeNetwork/FreeNetwork.php
@@ -265,9 +265,13 @@ class FreeNetwork extends Component
         return Event::stop;
     }
 
-    public static function notify(Actor $sender, Activity $activity, Actor $target, ?string $reason = null): bool
+    public static function notify(Actor $sender, Activity $activity, array $targets, ?string $reason = null): bool
     {
-        // TODO: implement
+        $protocols = [];
+        Event::handle('AddFreeNetworkProtocol', [&$protocols]);
+        foreach ($protocols as $protocol) {
+            $protocol::freeNetworkDistribute($sender, $activity, $targets, $reason);
+        }
         return false;
     }
 
diff --git a/components/Notification/Notification.php b/components/Notification/Notification.php
index def7940d11..074ace08cf 100644
--- a/components/Notification/Notification.php
+++ b/components/Notification/Notification.php
@@ -21,15 +21,12 @@ declare(strict_types=1);
 
 namespace Component\Notification;
 
-use App\Core\DB\DB;
 use App\Core\Event;
 use App\Core\Log;
 use App\Core\Modules\Component;
 use App\Entity\Activity;
 use App\Entity\Actor;
 use Component\FreeNetwork\FreeNetwork;
-use DateTime;
-use DateTimeInterface;
 
 class Notification extends Component
 {
@@ -40,29 +37,32 @@ class Notification extends Component
     public function onNewNotification(Actor $sender, Activity $activity, array $ids_already_known = [], ?string $reason = null): bool
     {
         $targets = $activity->getNotificationTargets($ids_already_known);
-        foreach ($targets as $target) {
-            $this->notify($sender, $activity, $target, $reason);
-        }
+        $this->notify($sender, $activity, $targets, $reason);
 
         return Event::next;
     }
 
-    public function notify(Actor $sender, Activity $activity, Actor $target, ?string $reason = null): bool
+    public function notify(Actor $sender, Activity $activity, array $targets, ?string $reason = null): bool
     {
-        if ($target->isGroup()) {
-            // FIXME: Make sure we check (for both local and remote) users are in the groups they send to!
-        } else {
-            if ($target->hasBlocked($activity->getActor())) {
-                Log::info("Not saving reply to actor {$target->getId()} from sender {$sender->getId()} because of a block.");
-                return false;
+        $remote_targets = [];
+        foreach ($targets as $target) {
+            if ($target->getIsLocal()) {
+                if ($target->isGroup()) {
+                    // FIXME: Make sure we check (for both local and remote) users are in the groups they send to!
+                } else {
+                    if ($target->hasBlocked($activity->getActor())) {
+                        Log::info("Not saving reply to actor {$target->getId()} from sender {$sender->getId()} because of a block.");
+                        continue;
+                    }
+                }
+                // TODO: use https://symfony.com/doc/current/notifier.html
+            } else {
+                $remote_targets[] = $target;
             }
         }
 
-        if ($target->getIsLocal()) {
-            // TODO: use https://symfony.com/doc/current/notifier.html
-        } else {
-            return FreeNetwork::notify($sender, $activity, $target, $reason);
-        }
-        return true;
+        FreeNetwork::notify($sender, $activity, $remote_targets, $reason);
+
+        return Event::next;
     }
 }