Create events for networt_tabs and network_content_init hooks

diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index c74b0a8df2ae5b307f3437632964b2788b86ca1e..72204ab11ef09ce39b3c5e640c236903ce62736b 100644 (file)
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -54,6 +54,8 @@ final class HookEventBridge
                ArrayFilterEvent::PREPARE_POST_END                => 'prepare_body_final',
                ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'photo_upload_form',
                ArrayFilterEvent::NETWORK_TO_NAME                 => 'network_to_name',
+               ArrayFilterEvent::NETWORK_CONTENT_START           => 'network_content_init',
+               ArrayFilterEvent::NETWORK_CONTENT_TABS            => 'network_tabs',
                ArrayFilterEvent::PARSE_LINK                      => 'parse_link',
                ArrayFilterEvent::CONVERSATION_START              => 'conversation_start',
                ArrayFilterEvent::FETCH_ITEM_BY_LINK              => 'item_by_link',
@@ -135,6 +137,8 @@ final class HookEventBridge
                        ArrayFilterEvent::PREPARE_POST_END                => 'onArrayFilterEvent',
                        ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'onArrayFilterEvent',
                        ArrayFilterEvent::NETWORK_TO_NAME                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::NETWORK_CONTENT_START           => 'onArrayFilterEvent',
+                       ArrayFilterEvent::NETWORK_CONTENT_TABS            => 'onArrayFilterEvent',
                        ArrayFilterEvent::PARSE_LINK                      => 'onArrayFilterEvent',
                        ArrayFilterEvent::CONVERSATION_START              => 'onArrayFilterEvent',
                        ArrayFilterEvent::FETCH_ITEM_BY_LINK              => 'onArrayFilterEvent',

diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 9435ab37b6b44562215ef7e6fb585af6121c0a13..01a9a90675519d96eb1e8e4e329fead594c209ca 100644 (file)
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -58,6 +58,10 @@ final class ArrayFilterEvent extends Event
 
        public const NETWORK_TO_NAME = 'friendica.data.network_to_name';
 
+       public const NETWORK_CONTENT_START = 'friendica.data.network_content_start';
+
+       public const NETWORK_CONTENT_TABS = 'friendica.data.network_content_tabs';
+
        public const PARSE_LINK = 'friendica.data.parse_link';
 
        public const CONVERSATION_START = 'friendica.data.conversation_start';

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 86c2fcf736f3cbb675d3532a63b43178dcee32c7..e50d2f4d61c789361e7ac06fbc70eb885a4496b3 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -39,6 +39,7 @@ use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Database\Database;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Circle;
 use Friendica\Model\Post;
@@ -49,6 +50,7 @@ use Friendica\Network\HTTPException;
 use Friendica\Navigation\SystemMessages;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class Network extends Timeline
@@ -90,12 +92,55 @@ class Network extends Timeline
        protected $community;
        /** @var NetworkFactory */
        protected $networkFactory;
-
-       public function __construct(UserDefinedChannelFactory $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, UserDefinedChannel $channel, AppHelper $appHelper, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-       {
-               parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+       private EventDispatcherInterface $eventDispatcher;
+
+       public function __construct(
+               UserDefinedChannelFactory $userDefinedChannel,
+               NetworkFactory $network,
+               CommunityFactory $community,
+               ChannelFactory $channelFactory,
+               UserDefinedChannel $channel,
+               AppHelper $appHelper,
+               EventDispatcherInterface $eventDispatcher,
+               TimelineFactory $timeline,
+               SystemMessages $systemMessages,
+               Mode $mode,
+               Conversation $conversation,
+               Page $page,
+               IHandleUserSessions $session,
+               Database $database,
+               IManagePersonalConfigValues $pConfig,
+               IManageConfigValues $config,
+               ICanCache $cache,
+               L10n $l10n,
+               BaseURL $baseUrl,
+               Arguments $args,
+               LoggerInterface $logger,
+               Profiler $profiler,
+               Response $response,
+               array $server,
+               array $parameters = []
+       ) {
+               parent::__construct(
+                       $channel,
+                       $mode,
+                       $session,
+                       $database,
+                       $pConfig,
+                       $config,
+                       $cache,
+                       $l10n,
+                       $baseUrl,
+                       $args,
+                       $logger,
+                       $profiler,
+                       $response,
+                       $server,
+                       $parameters,
+               );
 
                $this->appHelper          = $appHelper;
+               $this->eventDispatcher    = $eventDispatcher;
                $this->timeline           = $timeline;
                $this->systemMessages     = $systemMessages;
                $this->conversation       = $conversation;
@@ -116,8 +161,13 @@ class Network extends Timeline
 
                $module = 'network';
 
-               $arr = ['query' => $this->args->getQueryString()];
-               Hook::callAll('network_content_init', $arr);
+               $hook_data = [
+                       'query' => $this->args->getQueryString(),
+               ];
+
+               $this->eventDispatcher->dispatch(
+                       new ArrayFilterEvent(ArrayFilterEvent::NETWORK_CONTENT_START, $hook_data)
+               );
 
                $o = '';
 
@@ -275,19 +325,24 @@ class Network extends Timeline
                        $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'network', 'channel'));
                }
 
-               $arr = ['tabs' => $tabs];
-               Hook::callAll('network_tabs', $arr);
+               $hook_data = [
+                       'tabs' => $tabs,
+               ];
+
+               $hook_data = $this->eventDispatcher->dispatch(
+                       new ArrayFilterEvent(ArrayFilterEvent::NETWORK_CONTENT_TABS, $hook_data)
+               )->getArray();
 
                if (!empty($network_timelines)) {
                        $tabs = [];
 
-                       foreach ($arr['tabs'] as $tab) {
+                       foreach ($hook_data['tabs'] as $tab) {
                                if (in_array($tab['code'], $network_timelines)) {
                                        $tabs[] = $tab;
                                }
                        }
                } else {
-                       $tabs = $arr['tabs'];
+                       $tabs = $hook_data['tabs'];
                }
 
                $tpl = Renderer::getMarkupTemplate('common_tabs.tpl');

diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 348124b3894b2d66cf08ec54b0dbaf8a0d1f56e5..7b97e76a02b20cfd85cf4e1e4e686bf0196ad53c 100644 (file)
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -43,6 +43,8 @@ class HookEventBridgeTest extends TestCase
                        ArrayFilterEvent::PREPARE_POST_END                => 'onArrayFilterEvent',
                        ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'onArrayFilterEvent',
                        ArrayFilterEvent::NETWORK_TO_NAME                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::NETWORK_CONTENT_START           => 'onArrayFilterEvent',
+                       ArrayFilterEvent::NETWORK_CONTENT_TABS            => 'onArrayFilterEvent',
                        ArrayFilterEvent::PARSE_LINK                      => 'onArrayFilterEvent',
                        ArrayFilterEvent::CONVERSATION_START              => 'onArrayFilterEvent',
                        ArrayFilterEvent::FETCH_ITEM_BY_LINK              => 'onArrayFilterEvent',
@@ -465,6 +467,8 @@ class HookEventBridgeTest extends TestCase
                        [ArrayFilterEvent::PREPARE_POST_END, 'prepare_body_final'],
                        [ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'photo_upload_form'],
                        [ArrayFilterEvent::NETWORK_TO_NAME, 'network_to_name'],
+                       [ArrayFilterEvent::NETWORK_CONTENT_START, 'network_content_init'],
+                       [ArrayFilterEvent::NETWORK_CONTENT_TABS, 'network_tabs'],
                        [ArrayFilterEvent::PARSE_LINK, 'parse_link'],
                        [ArrayFilterEvent::CONVERSATION_START, 'conversation_start'],
                        [ArrayFilterEvent::FETCH_ITEM_BY_LINK, 'item_by_link'],

diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php
index a64080198e2db557fbec0616604ee1a5ffb091da..4e1a800435ca97ce238ddafd11436a4b47364220 100644 (file)
--- a/tests/Unit/Event/ArrayFilterEventTest.php
+++ b/tests/Unit/Event/ArrayFilterEventTest.php
@@ -40,6 +40,8 @@ class ArrayFilterEventTest extends TestCase
                        [ArrayFilterEvent::PREPARE_POST_END, 'friendica.data.prepare_post_end'],
                        [ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'friendica.data.photo_upload_form'],
                        [ArrayFilterEvent::NETWORK_TO_NAME, 'friendica.data.network_to_name'],
+                       [ArrayFilterEvent::NETWORK_CONTENT_START, 'friendica.data.network_content_start'],
+                       [ArrayFilterEvent::NETWORK_CONTENT_TABS, 'friendica.data.network_content_tabs'],
                        [ArrayFilterEvent::PARSE_LINK, 'friendica.data.parse_link'],
                        [ArrayFilterEvent::CONVERSATION_START, 'friendica.data.conversation_start'],
                        [ArrayFilterEvent::FETCH_ITEM_BY_LINK, 'friendica.data.fetch_item_by_link'],