From 649ddf7ab9145fdae497850ecedbe374afeb4008 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 8 Feb 2025 07:58:33 +0000
Subject: [PATCH 01/35] Add events for post_local, post_local_start and
 post_local_end

---
 src/Core/Hooks/HookEventBridge.php            | 50 +++++++++++--------
 src/Event/ArrayFilterEvent.php                |  6 +++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 28 +++++++----
 3 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 2dad2d2b23..306434609b 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -34,17 +34,20 @@ final class HookEventBridge
 	 * This maps the new event names to the legacy Hook names.
 	 */
 	private static array $eventMapper = [
-		Event::INIT                       => 'init_1',
-		ConfigLoadedEvent::CONFIG_LOADED  => 'load_config',
-		ArrayFilterEvent::APP_MENU        => 'app_menu',
-		ArrayFilterEvent::NAV_INFO        => 'nav_info',
-		ArrayFilterEvent::FEATURE_ENABLED => 'isEnabled',
-		ArrayFilterEvent::FEATURE_GET     => 'get',
-		HtmlFilterEvent::HEAD             => 'head',
-		HtmlFilterEvent::FOOTER           => 'footer',
-		HtmlFilterEvent::PAGE_HEADER      => 'page_header',
-		HtmlFilterEvent::PAGE_CONTENT_TOP => 'page_content_top',
-		HtmlFilterEvent::PAGE_END         => 'page_end',
+		Event::INIT                        => 'init_1',
+		ConfigLoadedEvent::CONFIG_LOADED   => 'load_config',
+		ArrayFilterEvent::APP_MENU         => 'app_menu',
+		ArrayFilterEvent::NAV_INFO         => 'nav_info',
+		ArrayFilterEvent::FEATURE_ENABLED  => 'isEnabled',
+		ArrayFilterEvent::FEATURE_GET      => 'get',
+		ArrayFilterEvent::POST_LOCAL_START => 'post_local_start',
+		ArrayFilterEvent::POST_LOCAL       => 'post_local',
+		ArrayFilterEvent::POST_LOCAL_END   => 'post_local_end',
+		HtmlFilterEvent::HEAD              => 'head',
+		HtmlFilterEvent::FOOTER            => 'footer',
+		HtmlFilterEvent::PAGE_HEADER       => 'page_header',
+		HtmlFilterEvent::PAGE_CONTENT_TOP  => 'page_content_top',
+		HtmlFilterEvent::PAGE_END          => 'page_end',
 	];
 
 	/**
@@ -53,17 +56,20 @@ final class HookEventBridge
 	public static function getStaticSubscribedEvents(): array
 	{
 		return [
-			Event::INIT                       => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED  => 'onConfigLoadedEvent',
-			ArrayFilterEvent::APP_MENU        => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO        => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET     => 'onArrayFilterEvent',
-			HtmlFilterEvent::HEAD             => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER           => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER      => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END         => 'onHtmlFilterEvent',
+			Event::INIT                        => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED   => 'onConfigLoadedEvent',
+			ArrayFilterEvent::APP_MENU         => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO         => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED  => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET      => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL       => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END   => 'onArrayFilterEvent',
+			HtmlFilterEvent::HEAD              => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER            => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER       => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP  => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END          => 'onHtmlFilterEvent',
 		];
 	}
 
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 839aa40b75..8d552755ee 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -24,6 +24,12 @@ final class ArrayFilterEvent extends Event
 
 	public const FEATURE_GET = 'friendica.data.feature_get';
 
+	public const POST_LOCAL_START = 'friendica.data.post_local_start';
+
+	public const POST_LOCAL = 'friendica.data.post_local';
+
+	public const POST_LOCAL_END = 'friendica.data.post_local_end';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 671eb23e94..8a207684b1 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -22,17 +22,20 @@ class HookEventBridgeTest extends TestCase
 	public function testGetStaticSubscribedEventsReturnsStaticMethods(): void
 	{
 		$expected = [
-			Event::INIT                       => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED  => 'onConfigLoadedEvent',
-			ArrayFilterEvent::APP_MENU        => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO        => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET     => 'onArrayFilterEvent',
-			HtmlFilterEvent::HEAD             => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER           => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER      => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END         => 'onHtmlFilterEvent',
+			Event::INIT                        => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED   => 'onConfigLoadedEvent',
+			ArrayFilterEvent::APP_MENU         => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO         => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED  => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET      => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL       => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END   => 'onArrayFilterEvent',
+			HtmlFilterEvent::HEAD              => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER            => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER       => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP  => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END          => 'onHtmlFilterEvent',
 		];
 
 		$this->assertSame(
@@ -119,6 +122,9 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::NAV_INFO, 'nav_info'],
 			[ArrayFilterEvent::FEATURE_ENABLED, 'isEnabled'],
 			[ArrayFilterEvent::FEATURE_GET, 'get'],
+			[ArrayFilterEvent::POST_LOCAL_START, 'post_local_start'],
+			[ArrayFilterEvent::POST_LOCAL, 'post_local'],
+			[ArrayFilterEvent::POST_LOCAL_END, 'post_local_end'],
 		];
 	}
 

From aabf9a8b01f7de8a38047e0e1e67fa262512b88f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 8 Feb 2025 08:17:30 +0000
Subject: [PATCH 02/35] Replace hooks post_local_start, post_local and
 post_local_end with EventDispatcher

---
 mod/item.php                | 13 +++++++++++--
 src/Content/Item.php        | 30 ++++++++++++++++++------------
 src/Model/Item.php          | 14 +++++++++-----
 src/Module/Post/Tag/Add.php | 13 ++++++++++---
 4 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index de9a51915a..98528b59b1 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -24,6 +24,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
@@ -43,7 +44,11 @@ function item_post()
 		item_drop($uid, $_REQUEST['dropitems']);
 	}
 
-	Hook::callAll('post_local_start', $_REQUEST);
+	$eventDispatcher = DI::eventDispatcher();
+
+	$_REQUEST = $eventDispatcher->dispatch(
+		new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_START, $_REQUEST)
+	)->getArray();
 
 	$return_path = $_REQUEST['return'] ?? '';
 	$preview     = intval($_REQUEST['preview'] ?? 0);
@@ -275,7 +280,11 @@ function item_process(array $post, array $request, bool $preview, string $return
 		System::jsonExit(['preview' => $o]);
 	}
 
-	Hook::callAll('post_local', $post);
+	$eventDispatcher = DI::eventDispatcher();
+
+	$post = $eventDispatcher->dispatch(
+		new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL, $post)
+	)->getArray();
 
 	unset($post['edit']);
 	unset($post['self']);
diff --git a/src/Content/Item.php b/src/Content/Item.php
index aec01ae292..ee20e3d168 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -20,6 +20,7 @@ use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Attach;
 use Friendica\Model\Circle;
 use Friendica\Model\Contact;
@@ -43,6 +44,7 @@ use Friendica\Util\Proxy;
 use Friendica\Util\XML;
 use GuzzleHttp\Psr7\Uri;
 use ImagickException;
+use Psr\EventDispatcher\EventDispatcherInterface;
 
 /**
  * A content helper class for displaying items
@@ -69,19 +71,21 @@ class Item
 	private $emailer;
 	/** @var AppHelper */
 	private $appHelper;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(Profiler $profiler, Activity $activity, L10n $l10n, IHandleUserSessions $userSession, Video $bbCodeVideo, ACLFormatter $aclFormatter, IManagePersonalConfigValues $pConfig, BaseURL $baseURL, Emailer $emailer, AppHelper $appHelper)
+	public function __construct(Profiler $profiler, Activity $activity, L10n $l10n, IHandleUserSessions $userSession, Video $bbCodeVideo, ACLFormatter $aclFormatter, IManagePersonalConfigValues $pConfig, BaseURL $baseURL, Emailer $emailer, AppHelper $appHelper, EventDispatcherInterface $eventDispatcher)
 	{
-		$this->profiler     = $profiler;
-		$this->activity     = $activity;
-		$this->l10n         = $l10n;
-		$this->userSession  = $userSession;
-		$this->bbCodeVideo  = $bbCodeVideo;
-		$this->aclFormatter = $aclFormatter;
-		$this->baseURL      = $baseURL;
-		$this->pConfig      = $pConfig;
-		$this->emailer      = $emailer;
-		$this->appHelper    = $appHelper;
+		$this->profiler        = $profiler;
+		$this->activity        = $activity;
+		$this->l10n            = $l10n;
+		$this->userSession     = $userSession;
+		$this->bbCodeVideo     = $bbCodeVideo;
+		$this->aclFormatter    = $aclFormatter;
+		$this->baseURL         = $baseURL;
+		$this->pConfig         = $pConfig;
+		$this->emailer         = $emailer;
+		$this->appHelper       = $appHelper;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	/**
@@ -1006,7 +1010,9 @@ class Item
 			Tag::createImplicitMentions($post['uri-id'], $post['thr-parent-id']);
 		}
 
-		Hook::callAll('post_local_end', $post);
+		$post = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_END, $post)
+		)->getArray();
 
 		$author = DBA::selectFirst('contact', ['thumb'], ['uid' => $post['uid'], 'self' => true]);
 
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 00435e2d4d..c796a1e5bf 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -22,6 +22,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Post\Category;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
@@ -1119,6 +1120,8 @@ class Item
 			$item['private'] = self::PRIVATE;
 		}
 
+		$eventDispatcher = DI::eventDispatcher();
+
 		if ($notify && $post_local) {
 			$item['edit']   = false;
 			$item['parent'] = $parent_id;
@@ -1137,7 +1140,9 @@ class Item
 				$dummy_session = false;
 			}
 
-			Hook::callAll('post_local', $item);
+			$item = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL, $item)
+			)->getArray();
 
 			if ($dummy_session) {
 				unset($_SESSION['authenticated']);
@@ -1237,7 +1242,9 @@ class Item
 		}
 
 		if (empty($item['event-id'])) {
-			unset($item['event-id']);
+			if (array_key_exists('event-id', $item)) {
+				unset($item['event-id']);
+			}
 
 			$ev = Event::fromBBCode($item['body']);
 			if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
@@ -3010,9 +3017,6 @@ class Item
 	 * @return bool
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
-	 * @hook  'post_local_end'
-	 *            array $arr
-	 *            'post_id' => ID of posted item
 	 */
 	public static function performActivity(int $item_id, string $verb, int $uid, string $allow_cid = null, string $allow_gid = null, string $deny_cid = null, string $deny_gid = null): bool
 	{
diff --git a/src/Module/Post/Tag/Add.php b/src/Module/Post/Tag/Add.php
index b536ef848d..f1fa23a082 100644
--- a/src/Module/Post/Tag/Add.php
+++ b/src/Module/Post/Tag/Add.php
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
@@ -22,6 +23,7 @@ use Friendica\Protocol\Activity;
 use Friendica\Protocol\Delivery;
 use Friendica\Util\Profiler;
 use Friendica\Util\XML;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -31,12 +33,14 @@ class Add extends \Friendica\BaseModule
 {
 	/** @var IHandleUserSessions */
 	private $session;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	public function __construct(IHandleUserSessions $session, EventDispatcherInterface $eventDispatcher, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-		$this->session = $session;
+		$this->session         = $session;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	protected function post(array $request = [])
@@ -149,7 +153,10 @@ EOT;
 		Tag::store($item['uri-id'], Tag::HASHTAG, $term);
 
 		$post['id'] = $post_id;
-		Hook::callAll('post_local_end', $post);
+
+		$post = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_END, $post)
+		)->getArray();
 
 		$post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]);
 

From 742cde89e628fff9fac4e6af2cd693c5f94088dd Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 8 Feb 2025 16:33:07 +0000
Subject: [PATCH 03/35] Implement home_init hook as Event

---
 src/Core/Hooks/HookEventBridge.php            |  2 ++
 src/Event/Event.php                           |  2 ++
 src/Module/Home.php                           |  9 +++++----
 src/Module/User/Delegation.php                | 12 ++++++++----
 tests/Unit/Core/Hooks/HookEventBridgeTest.php |  2 ++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 306434609b..9f35828ebf 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -35,6 +35,7 @@ final class HookEventBridge
 	 */
 	private static array $eventMapper = [
 		Event::INIT                        => 'init_1',
+		Event::HOME_INIT                   => 'home_init',
 		ConfigLoadedEvent::CONFIG_LOADED   => 'load_config',
 		ArrayFilterEvent::APP_MENU         => 'app_menu',
 		ArrayFilterEvent::NAV_INFO         => 'nav_info',
@@ -57,6 +58,7 @@ final class HookEventBridge
 	{
 		return [
 			Event::INIT                        => 'onNamedEvent',
+			Event::HOME_INIT                   => 'onNamedEvent',
 			ConfigLoadedEvent::CONFIG_LOADED   => 'onConfigLoadedEvent',
 			ArrayFilterEvent::APP_MENU         => 'onArrayFilterEvent',
 			ArrayFilterEvent::NAV_INFO         => 'onArrayFilterEvent',
diff --git a/src/Event/Event.php b/src/Event/Event.php
index 90defc3204..7a6fca3840 100644
--- a/src/Event/Event.php
+++ b/src/Event/Event.php
@@ -21,6 +21,8 @@ class Event implements NamedEvent
 	 */
 	public const INIT = 'friendica.init';
 
+	public const HOME_INIT = 'friendica.home_init';
+
 	private string $name;
 
 	public function __construct(string $name)
diff --git a/src/Module/Home.php b/src/Module/Home.php
index 9c72398f7a..692d10ba5f 100644
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -11,6 +11,7 @@ use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Event\Event;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Protocol\ActivityPub;
@@ -34,11 +35,11 @@ class Home extends BaseModule
 	{
 		$basePath = DI::appHelper()->getBasePath();
 		$config = DI::config();
+		$eventDispatcher = DI::eventDispatcher();
 
-		// currently no returned data is used
-		$ret = [];
-
-		Hook::callAll('home_init', $ret);
+		$eventDispatcher->dispatch(
+			new Event(Event::HOME_INIT)
+		);
 
 		if (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserNickname())) {
 			DI::baseUrl()->redirect('network');
diff --git a/src/Module/User/Delegation.php b/src/Module/User/Delegation.php
index 2c13891348..1658e72c18 100644
--- a/src/Module/User/Delegation.php
+++ b/src/Module/User/Delegation.php
@@ -12,11 +12,11 @@ use Friendica\App\BaseURL;
 use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Contact\Introduction\Repository\Introduction;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\Database;
+use Friendica\Event\Event;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
 use Friendica\Module\Response;
@@ -25,6 +25,7 @@ use Friendica\Navigation\SystemMessages;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Security\Authentication;
 use Friendica\Util;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -46,8 +47,9 @@ class Delegation extends BaseModule
 	private $intro;
 	/** @var AppHelper */
 	private $appHelper;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(AppHelper $appHelper, Introduction $intro, Notify $notify, SystemMessages $systemMessages, Authentication $auth, Database $db, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Util\Profiler $profiler, Response $response, array $server, array $parameters = [])
+	public function __construct(EventDispatcherInterface $eventDispatcher, AppHelper $appHelper, Introduction $intro, Notify $notify, SystemMessages $systemMessages, Authentication $auth, Database $db, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Util\Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -58,6 +60,7 @@ class Delegation extends BaseModule
 		$this->notify         = $notify;
 		$this->intro          = $intro;
 		$this->appHelper      = $appHelper;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	protected function post(array $request = [])
@@ -128,8 +131,9 @@ class Delegation extends BaseModule
 			$this->session->setSubManagedUserId($original_id);
 		}
 
-		$ret = [];
-		Hook::callAll('home_init', $ret);
+		$this->eventDispatcher->dispatch(
+			new Event(Event::HOME_INIT)
+		);
 
 		$this->systemMessages->addNotice($this->t('You are now logged in as %s', $user['username']));
 
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 8a207684b1..6e82ab09f6 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -23,6 +23,7 @@ class HookEventBridgeTest extends TestCase
 	{
 		$expected = [
 			Event::INIT                        => 'onNamedEvent',
+			Event::HOME_INIT                   => 'onNamedEvent',
 			ConfigLoadedEvent::CONFIG_LOADED   => 'onConfigLoadedEvent',
 			ArrayFilterEvent::APP_MENU         => 'onArrayFilterEvent',
 			ArrayFilterEvent::NAV_INFO         => 'onArrayFilterEvent',
@@ -61,6 +62,7 @@ class HookEventBridgeTest extends TestCase
 		return [
 			['test', 'test'],
 			[Event::INIT, 'init_1'],
+			[Event::HOME_INIT, 'home_init'],
 		];
 	}
 

From f4624b05912e2cea5559ad7b7b1d924c4d0063ee Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 8 Feb 2025 16:38:01 +0000
Subject: [PATCH 04/35] Fix cs

---
 mod/item.php                   |  1 -
 src/Module/Home.php            |  8 ++++----
 src/Module/Post/Tag/Add.php    |  1 -
 src/Module/User/Delegation.php | 14 +++++++-------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 98528b59b1..46f2a219e3 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -18,7 +18,6 @@
 
 use Friendica\Content\Conversation;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
diff --git a/src/Module/Home.php b/src/Module/Home.php
index 692d10ba5f..7e7d59d760 100644
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -33,8 +33,8 @@ class Home extends BaseModule
 
 	protected function content(array $request = []): string
 	{
-		$basePath = DI::appHelper()->getBasePath();
-		$config = DI::config();
+		$basePath        = DI::appHelper()->getBasePath();
+		$config          = DI::config();
 		$eventDispatcher = DI::eventDispatcher();
 
 		$eventDispatcher->dispatch(
@@ -49,11 +49,11 @@ class Home extends BaseModule
 			DI::baseUrl()->redirect('/profile/' . $config->get('system', 'singleuser'));
 		}
 
-		$customHome = '';
+		$customHome    = '';
 		$defaultHeader = ($config->get('config', 'sitename') ? DI::l10n()->t('Welcome to %s', $config->get('config', 'sitename')) : '');
 
 		$homeFilePath = $basePath . '/home.html';
-		$cssFilePath = $basePath . '/home.css';
+		$cssFilePath  = $basePath . '/home.css';
 
 		if (file_exists($homeFilePath)) {
 			$customHome = $homeFilePath;
diff --git a/src/Module/Post/Tag/Add.php b/src/Module/Post/Tag/Add.php
index f1fa23a082..bf704a50c0 100644
--- a/src/Module/Post/Tag/Add.php
+++ b/src/Module/Post/Tag/Add.php
@@ -8,7 +8,6 @@
 namespace Friendica\Module\Post\Tag;
 
 use Friendica\App;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
diff --git a/src/Module/User/Delegation.php b/src/Module/User/Delegation.php
index 1658e72c18..935ac83a6b 100644
--- a/src/Module/User/Delegation.php
+++ b/src/Module/User/Delegation.php
@@ -53,13 +53,13 @@ class Delegation extends BaseModule
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-		$this->session        = $session;
-		$this->db             = $db;
-		$this->auth           = $auth;
-		$this->systemMessages = $systemMessages;
-		$this->notify         = $notify;
-		$this->intro          = $intro;
-		$this->appHelper      = $appHelper;
+		$this->session         = $session;
+		$this->db              = $db;
+		$this->auth            = $auth;
+		$this->systemMessages  = $systemMessages;
+		$this->notify          = $notify;
+		$this->intro           = $intro;
+		$this->appHelper       = $appHelper;
 		$this->eventDispatcher = $eventDispatcher;
 	}
 

From 7298ad29c18a2f102bda7873d5f5a2171d519d67 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 8 Feb 2025 21:04:35 +0000
Subject: [PATCH 05/35] Implement photo_upload_form hook as Event

---
 mod/photos.php                                |  8 ++-
 src/Core/Hooks/HookEventBridge.php            | 62 ++++++++++---------
 src/Event/ArrayFilterEvent.php                |  2 +
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 32 +++++-----
 4 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index c2831270ab..25eac8c533 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -12,12 +12,12 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
 use Friendica\Core\Addon;
-use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
@@ -648,7 +648,11 @@ function photos_content()
 			'default_upload' => true
 		];
 
-		Hook::callAll('photo_upload_form', $ret);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD_FORM, $ret)
+		);
 
 		$default_upload_box    = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
 		$default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 9f35828ebf..23cd209e11 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -34,21 +34,22 @@ final class HookEventBridge
 	 * This maps the new event names to the legacy Hook names.
 	 */
 	private static array $eventMapper = [
-		Event::INIT                        => 'init_1',
-		Event::HOME_INIT                   => 'home_init',
-		ConfigLoadedEvent::CONFIG_LOADED   => 'load_config',
-		ArrayFilterEvent::APP_MENU         => 'app_menu',
-		ArrayFilterEvent::NAV_INFO         => 'nav_info',
-		ArrayFilterEvent::FEATURE_ENABLED  => 'isEnabled',
-		ArrayFilterEvent::FEATURE_GET      => 'get',
-		ArrayFilterEvent::POST_LOCAL_START => 'post_local_start',
-		ArrayFilterEvent::POST_LOCAL       => 'post_local',
-		ArrayFilterEvent::POST_LOCAL_END   => 'post_local_end',
-		HtmlFilterEvent::HEAD              => 'head',
-		HtmlFilterEvent::FOOTER            => 'footer',
-		HtmlFilterEvent::PAGE_HEADER       => 'page_header',
-		HtmlFilterEvent::PAGE_CONTENT_TOP  => 'page_content_top',
-		HtmlFilterEvent::PAGE_END          => 'page_end',
+		Event::INIT                         => 'init_1',
+		Event::HOME_INIT                    => 'home_init',
+		ConfigLoadedEvent::CONFIG_LOADED    => 'load_config',
+		ArrayFilterEvent::APP_MENU          => 'app_menu',
+		ArrayFilterEvent::NAV_INFO          => 'nav_info',
+		ArrayFilterEvent::FEATURE_ENABLED   => 'isEnabled',
+		ArrayFilterEvent::FEATURE_GET       => 'get',
+		ArrayFilterEvent::POST_LOCAL_START  => 'post_local_start',
+		ArrayFilterEvent::POST_LOCAL        => 'post_local',
+		ArrayFilterEvent::POST_LOCAL_END    => 'post_local_end',
+		ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'photo_upload_form',
+		HtmlFilterEvent::HEAD               => 'head',
+		HtmlFilterEvent::FOOTER             => 'footer',
+		HtmlFilterEvent::PAGE_HEADER        => 'page_header',
+		HtmlFilterEvent::PAGE_CONTENT_TOP   => 'page_content_top',
+		HtmlFilterEvent::PAGE_END           => 'page_end',
 	];
 
 	/**
@@ -57,21 +58,22 @@ final class HookEventBridge
 	public static function getStaticSubscribedEvents(): array
 	{
 		return [
-			Event::INIT                        => 'onNamedEvent',
-			Event::HOME_INIT                   => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED   => 'onConfigLoadedEvent',
-			ArrayFilterEvent::APP_MENU         => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO         => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED  => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET      => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL       => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END   => 'onArrayFilterEvent',
-			HtmlFilterEvent::HEAD              => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER            => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER       => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP  => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END          => 'onHtmlFilterEvent',
+			Event::INIT                         => 'onNamedEvent',
+			Event::HOME_INIT                    => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED    => 'onConfigLoadedEvent',
+			ArrayFilterEvent::APP_MENU          => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO          => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED   => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET       => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START  => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL        => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END    => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
+			HtmlFilterEvent::HEAD               => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER             => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP   => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END           => 'onHtmlFilterEvent',
 		];
 	}
 
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 8d552755ee..2afb92998f 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -30,6 +30,8 @@ final class ArrayFilterEvent extends Event
 
 	public const POST_LOCAL_END = 'friendica.data.post_local_end';
 
+	public const PHOTO_UPLOAD_FORM = 'friendica.data.photo_upload_form';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 6e82ab09f6..adca43d239 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -22,21 +22,22 @@ class HookEventBridgeTest extends TestCase
 	public function testGetStaticSubscribedEventsReturnsStaticMethods(): void
 	{
 		$expected = [
-			Event::INIT                        => 'onNamedEvent',
-			Event::HOME_INIT                   => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED   => 'onConfigLoadedEvent',
-			ArrayFilterEvent::APP_MENU         => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO         => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED  => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET      => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL       => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END   => 'onArrayFilterEvent',
-			HtmlFilterEvent::HEAD              => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER            => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER       => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP  => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END          => 'onHtmlFilterEvent',
+			Event::INIT                         => 'onNamedEvent',
+			Event::HOME_INIT                    => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED    => 'onConfigLoadedEvent',
+			ArrayFilterEvent::APP_MENU          => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO          => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED   => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET       => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START  => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL        => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END    => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
+			HtmlFilterEvent::HEAD               => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER             => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP   => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END           => 'onHtmlFilterEvent',
 		];
 
 		$this->assertSame(
@@ -127,6 +128,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::POST_LOCAL_START, 'post_local_start'],
 			[ArrayFilterEvent::POST_LOCAL, 'post_local'],
 			[ArrayFilterEvent::POST_LOCAL_END, 'post_local_end'],
+			[ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'photo_upload_form'],
 		];
 	}
 

From 18369854b784f6456259efbc69284418927c30f1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 8 Feb 2025 21:59:28 +0000
Subject: [PATCH 06/35] Implement route_collection hook as CollectRoutesEvent

---
 src/App/Router.php                            | 17 +++--
 src/Core/Hooks/HookEventBridge.php            | 10 +++
 src/Event/CollectRoutesEvent.php              | 41 ++++++++++++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 33 +++++++++
 tests/Unit/Event/CollectRoutesEventTest.php   | 67 +++++++++++++++++++
 5 files changed, 162 insertions(+), 6 deletions(-)
 create mode 100644 src/Event/CollectRoutesEvent.php
 create mode 100644 tests/Unit/Event/CollectRoutesEventTest.php

diff --git a/src/App/Router.php b/src/App/Router.php
index deb0155cf0..2a8281a855 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -7,12 +7,10 @@
 
 namespace Friendica\App;
 
-use Dice\Dice;
 use FastRoute\DataGenerator\GroupCountBased;
 use FastRoute\Dispatcher;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std;
-use Friendica\Capabilities\ICanHandleRequests;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Cache\Capability\ICanCache;
@@ -21,6 +19,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Lock\Capability\ICanLock;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Event\CollectRoutesEvent;
 use Friendica\LegacyModule;
 use Friendica\Module\HTTPException\MethodNotAllowed;
 use Friendica\Module\HTTPException\PageNotFound;
@@ -30,6 +29,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Network\HTTPException\MethodNotAllowedException;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Util\Router\FriendicaGroupCountBased;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -86,6 +86,8 @@ class Router
 	/** @var LoggerInterface */
 	private $logger;
 
+	private EventDispatcherInterface $eventDispatcher;
+
 	/** @var bool */
 	private $isLocalUser;
 
@@ -110,7 +112,7 @@ class Router
 	 * @param IHandleUserSessions $userSession
 	 * @param RouteCollector|null $routeCollector
 	 */
-	public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICanCache $cache, ICanLock $lock, IManageConfigValues $config, Arguments $args, LoggerInterface $logger, IHandleUserSessions $userSession, RouteCollector $routeCollector = null)
+	public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICanCache $cache, ICanLock $lock, IManageConfigValues $config, Arguments $args, LoggerInterface $logger, EventDispatcherInterface $eventDispatcher, IHandleUserSessions $userSession, RouteCollector $routeCollector = null)
 	{
 		$this->baseRoutesFilepath      = $baseRoutesFilepath;
 		$this->l10n                    = $l10n;
@@ -120,6 +122,7 @@ class Router
 		$this->config                  = $config;
 		$this->server                  = $server;
 		$this->logger                  = $logger;
+		$this->eventDispatcher         = $eventDispatcher;
 		$this->isLocalUser             = !empty($userSession->getLocalUserId());
 
 		$this->routeCollector = $routeCollector ?? new RouteCollector(new Std(), new GroupCountBased());
@@ -147,10 +150,12 @@ class Router
 
 		$this->addRoutes($routeCollector, $routes);
 
-		$this->routeCollector = $routeCollector;
-
 		// Add routes from addons
-		Hook::callAll('route_collection', $this->routeCollector);
+		$routeCollector = $this->eventDispatcher->dispatch(
+			new CollectRoutesEvent(CollectRoutesEvent::COLLECT_ROUTES, $routeCollector),
+		)->getRouteCollector();
+
+		$this->routeCollector = $routeCollector;
 
 		return $this;
 	}
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 23cd209e11..1a66b74221 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -11,6 +11,7 @@ namespace Friendica\Core\Hooks;
 
 use Friendica\Core\Hook;
 use Friendica\Event\ArrayFilterEvent;
+use Friendica\Event\CollectRoutesEvent;
 use Friendica\Event\ConfigLoadedEvent;
 use Friendica\Event\Event;
 use Friendica\Event\HtmlFilterEvent;
@@ -37,6 +38,7 @@ final class HookEventBridge
 		Event::INIT                         => 'init_1',
 		Event::HOME_INIT                    => 'home_init',
 		ConfigLoadedEvent::CONFIG_LOADED    => 'load_config',
+		CollectRoutesEvent::COLLECT_ROUTES  => 'route_collection',
 		ArrayFilterEvent::APP_MENU          => 'app_menu',
 		ArrayFilterEvent::NAV_INFO          => 'nav_info',
 		ArrayFilterEvent::FEATURE_ENABLED   => 'isEnabled',
@@ -61,6 +63,7 @@ final class HookEventBridge
 			Event::INIT                         => 'onNamedEvent',
 			Event::HOME_INIT                    => 'onNamedEvent',
 			ConfigLoadedEvent::CONFIG_LOADED    => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES  => 'onCollectRoutesEvent',
 			ArrayFilterEvent::APP_MENU          => 'onArrayFilterEvent',
 			ArrayFilterEvent::NAV_INFO          => 'onArrayFilterEvent',
 			ArrayFilterEvent::FEATURE_ENABLED   => 'onArrayFilterEvent',
@@ -87,6 +90,13 @@ final class HookEventBridge
 		static::callHook($event->getName(), $event->getConfig());
 	}
 
+	public static function onCollectRoutesEvent(CollectRoutesEvent $event): void
+	{
+		$event->setRouteCollector(
+			static::callHook($event->getName(), $event->getRouteCollector())
+		);
+	}
+
 	public static function onArrayFilterEvent(ArrayFilterEvent $event): void
 	{
 		$event->setArray(
diff --git a/src/Event/CollectRoutesEvent.php b/src/Event/CollectRoutesEvent.php
new file mode 100644
index 0000000000..61e481ba9e
--- /dev/null
+++ b/src/Event/CollectRoutesEvent.php
@@ -0,0 +1,41 @@
+<?php
+
+// Copyright (C) 2010-2024, the Friendica project
+// SPDX-FileCopyrightText: 2010-2024 the Friendica project
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+namespace Friendica\Event;
+
+use FastRoute\RouteCollector;
+
+/**
+ * Allow addons to collect routes.
+ *
+ * @internal
+ */
+final class CollectRoutesEvent extends Event
+{
+	public const COLLECT_ROUTES = 'friendica.collect_routes';
+
+	private RouteCollector $routeCollector;
+
+	public function __construct(string $name, RouteCollector $routeCollector)
+	{
+		parent::__construct($name);
+
+		$this->routeCollector = $routeCollector;
+	}
+
+	public function getRouteCollector(): RouteCollector
+	{
+		return $this->routeCollector;
+	}
+
+	public function setRouteCollector(RouteCollector $routeCollector): void
+	{
+		$this->routeCollector = $routeCollector;
+	}
+}
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index adca43d239..688e39ecfa 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -9,9 +9,11 @@ declare(strict_types=1);
 
 namespace Friendica\Test\Unit\Core\Hooks;
 
+use FastRoute\RouteCollector;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hooks\HookEventBridge;
 use Friendica\Event\ArrayFilterEvent;
+use Friendica\Event\CollectRoutesEvent;
 use Friendica\Event\ConfigLoadedEvent;
 use Friendica\Event\Event;
 use Friendica\Event\HtmlFilterEvent;
@@ -25,6 +27,7 @@ class HookEventBridgeTest extends TestCase
 			Event::INIT                         => 'onNamedEvent',
 			Event::HOME_INIT                    => 'onNamedEvent',
 			ConfigLoadedEvent::CONFIG_LOADED    => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES  => 'onCollectRoutesEvent',
 			ArrayFilterEvent::APP_MENU          => 'onArrayFilterEvent',
 			ArrayFilterEvent::NAV_INFO          => 'onArrayFilterEvent',
 			ArrayFilterEvent::FEATURE_ENABLED   => 'onArrayFilterEvent',
@@ -117,6 +120,36 @@ class HookEventBridgeTest extends TestCase
 		HookEventBridge::onConfigLoadedEvent($event);
 	}
 
+	public static function getCollectRoutesEventData(): array
+	{
+		return [
+			['test', 'test'],
+			[CollectRoutesEvent::COLLECT_ROUTES, 'route_collection'],
+		];
+	}
+
+	/**
+	 * @dataProvider getCollectRoutesEventData
+	 */
+	public function testOnCollectRoutesEventCallsHookWithCorrectValue($name, $expected): void
+	{
+		$routeCollector = $this->createStub(RouteCollector::class);
+
+		$event = new CollectRoutesEvent($name, $routeCollector);
+
+		$reflectionProperty = new \ReflectionProperty(HookEventBridge::class, 'mockedCallHook');
+		$reflectionProperty->setAccessible(true);
+
+		$reflectionProperty->setValue(null, function (string $name, $data) use ($expected, $routeCollector) {
+			$this->assertSame($expected, $name);
+			$this->assertSame($routeCollector, $data);
+
+			return $data;
+		});
+
+		HookEventBridge::onCollectRoutesEvent($event);
+	}
+
 	public static function getArrayFilterEventData(): array
 	{
 		return [
diff --git a/tests/Unit/Event/CollectRoutesEventTest.php b/tests/Unit/Event/CollectRoutesEventTest.php
new file mode 100644
index 0000000000..0a1bb88d59
--- /dev/null
+++ b/tests/Unit/Event/CollectRoutesEventTest.php
@@ -0,0 +1,67 @@
+<?php
+
+// Copyright (C) 2010-2024, the Friendica project
+// SPDX-FileCopyrightText: 2010-2024 the Friendica project
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+namespace Friendica\Test\Unit\Event;
+
+use FastRoute\RouteCollector;
+use Friendica\Event\CollectRoutesEvent;
+use Friendica\Event\NamedEvent;
+use PHPUnit\Framework\TestCase;
+
+class CollectRoutesEventTest extends TestCase
+{
+	public function testImplementationOfInstances(): void
+	{
+		$event = new CollectRoutesEvent('test', $this->createStub(RouteCollector::class));
+
+		$this->assertInstanceOf(NamedEvent::class, $event);
+	}
+
+	public static function getPublicConstants(): array
+	{
+		return [
+			[CollectRoutesEvent::COLLECT_ROUTES, 'friendica.collect_routes'],
+		];
+	}
+
+	/**
+	 * @dataProvider getPublicConstants
+	 */
+	public function testPublicConstantsAreAvailable($value, $expected): void
+	{
+		$this->assertSame($expected, $value);
+	}
+
+	public function testGetNameReturnsName(): void
+	{
+		$event = new CollectRoutesEvent('test', $this->createStub(RouteCollector::class));
+
+		$this->assertSame('test', $event->getName());
+	}
+
+	public function testGetRouteCollectorReturnsCorrectString(): void
+	{
+		$routeCollector = $this->createStub(RouteCollector::class);
+
+		$event = new CollectRoutesEvent('test', $routeCollector);
+
+		$this->assertSame($routeCollector, $event->getRouteCollector());
+	}
+
+	public function testSetRouteCollector(): void
+	{
+		$event = new CollectRoutesEvent('test', $this->createStub(RouteCollector::class));
+
+		$routeCollector = $this->createStub(RouteCollector::class);
+
+		$event->setRouteCollector($routeCollector);
+
+		$this->assertSame($routeCollector, $event->getRouteCollector());
+	}
+}

From 23ce65c5d043254db5a1957cfaae65096b507a57 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 8 Feb 2025 22:00:30 +0000
Subject: [PATCH 07/35] Fix code style

---
 src/App/Router.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/App/Router.php b/src/App/Router.php
index 2a8281a855..5490f07e19 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -114,16 +114,16 @@ class Router
 	 */
 	public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICanCache $cache, ICanLock $lock, IManageConfigValues $config, Arguments $args, LoggerInterface $logger, EventDispatcherInterface $eventDispatcher, IHandleUserSessions $userSession, RouteCollector $routeCollector = null)
 	{
-		$this->baseRoutesFilepath      = $baseRoutesFilepath;
-		$this->l10n                    = $l10n;
-		$this->cache                   = $cache;
-		$this->lock                    = $lock;
-		$this->args                    = $args;
-		$this->config                  = $config;
-		$this->server                  = $server;
-		$this->logger                  = $logger;
-		$this->eventDispatcher         = $eventDispatcher;
-		$this->isLocalUser             = !empty($userSession->getLocalUserId());
+		$this->baseRoutesFilepath = $baseRoutesFilepath;
+		$this->l10n               = $l10n;
+		$this->cache              = $cache;
+		$this->lock               = $lock;
+		$this->args               = $args;
+		$this->config             = $config;
+		$this->server             = $server;
+		$this->logger             = $logger;
+		$this->eventDispatcher    = $eventDispatcher;
+		$this->isLocalUser        = !empty($userSession->getLocalUserId());
 
 		$this->routeCollector = $routeCollector ?? new RouteCollector(new Std(), new GroupCountBased());
 
@@ -280,14 +280,14 @@ class Router
 		try {
 			// Check if the HTTP method is OPTIONS and return the special Options Module with the possible HTTP methods
 			if ($this->args->getMethod() === static::OPTIONS) {
-				$this->moduleClass = Options::class;
+				$this->moduleClass  = Options::class;
 				$this->parameters[] = ['AllowedMethods' => $dispatcher->getOptions($cmd)];
 			} else {
 				$routeInfo = $dispatcher->dispatch($this->args->getMethod(), $cmd);
 				if ($routeInfo[0] === Dispatcher::FOUND) {
-					$this->moduleClass = $routeInfo[1];
+					$this->moduleClass  = $routeInfo[1];
 					$this->parameters[] = $routeInfo[2];
-				} else if ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) {
+				} elseif ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) {
 					throw new HTTPException\MethodNotAllowedException($this->l10n->t('Method not allowed for this module. Allowed method(s): %s', implode(', ', $routeInfo[1])));
 				} else {
 					throw new HTTPException\NotFoundException($this->l10n->t('Page not found.'));

From 3295b9055f28ab520e4f7fa74aa09b74feb888b2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Feb 2025 15:29:52 +0000
Subject: [PATCH 08/35] Create event for network_to_name hook

---
 src/Content/ContactSelector.php               | 7 ++++++-
 src/Core/Hooks/HookEventBridge.php            | 2 ++
 src/Event/ArrayFilterEvent.php                | 2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 2 ++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 1bd891a844..4cdb78e996 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -11,6 +11,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Util\Strings;
 
 /**
@@ -113,6 +114,8 @@ class ContactSelector
 	 */
 	public static function networkToName(string $network, string $protocol = '', int $gsid = null): string
 	{
+		$eventDispatcher = DI::eventDispatcher();
+
 		$nets = [
 			Protocol::DFRN      =>   DI::l10n()->t('DFRN'),
 			Protocol::OSTATUS   =>   DI::l10n()->t('OStatus'),
@@ -135,7 +138,9 @@ class ContactSelector
 			Protocol::BLUESKY   =>   DI::l10n()->t('Bluesky'),
 		];
 
-		Hook::callAll('network_to_name', $nets);
+		$nets = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::NETWORK_TO_NAME, $nets),
+		)->getArray();
 
 		$search  = array_keys($nets);
 		$replace = array_values($nets);
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 1a66b74221..fca179a75b 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -47,6 +47,7 @@ final class HookEventBridge
 		ArrayFilterEvent::POST_LOCAL        => 'post_local',
 		ArrayFilterEvent::POST_LOCAL_END    => 'post_local_end',
 		ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'photo_upload_form',
+		ArrayFilterEvent::NETWORK_TO_NAME   => 'network_to_name',
 		HtmlFilterEvent::HEAD               => 'head',
 		HtmlFilterEvent::FOOTER             => 'footer',
 		HtmlFilterEvent::PAGE_HEADER        => 'page_header',
@@ -72,6 +73,7 @@ final class HookEventBridge
 			ArrayFilterEvent::POST_LOCAL        => 'onArrayFilterEvent',
 			ArrayFilterEvent::POST_LOCAL_END    => 'onArrayFilterEvent',
 			ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME   => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD               => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER             => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 2afb92998f..15579788a6 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -32,6 +32,8 @@ final class ArrayFilterEvent extends Event
 
 	public const PHOTO_UPLOAD_FORM = 'friendica.data.photo_upload_form';
 
+	public const NETWORK_TO_NAME = 'friendica.data.network_to_name';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 688e39ecfa..195f0a0d0b 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -36,6 +36,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::POST_LOCAL        => 'onArrayFilterEvent',
 			ArrayFilterEvent::POST_LOCAL_END    => 'onArrayFilterEvent',
 			ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME   => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD               => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER             => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
@@ -162,6 +163,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::POST_LOCAL, 'post_local'],
 			[ArrayFilterEvent::POST_LOCAL_END, 'post_local_end'],
 			[ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'photo_upload_form'],
+			[ArrayFilterEvent::NETWORK_TO_NAME, 'network_to_name'],
 		];
 	}
 

From 134d85b9c19b7fd1d6cfc382fd49be4b978ff936 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 07:24:47 +0000
Subject: [PATCH 09/35] Fix code style

---
 src/Content/ContactSelector.php | 47 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 4cdb78e996..c864f159bb 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Content;
 
-use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -25,8 +24,8 @@ class ContactSelector
 	const SVG_COLOR_WHITE = 2;
 	const SVG_WHITE       = 3;
 
-	static $serverdata = [];
-	static $server_id  = [];
+	public static $serverdata = [];
+	public static $server_id  = [];
 
 	/**
 	 * @param string  $current  current
@@ -36,7 +35,7 @@ class ContactSelector
 	public static function pollInterval(string $current, bool $disabled = false): string
 	{
 		$dis = (($disabled) ? ' disabled="disabled" ' : '');
-		$o = '';
+		$o   = '';
 		$o .= "<select id=\"contact-poll-interval\" name=\"poll\" $dis />" . "\r\n";
 
 		$rep = [
@@ -117,25 +116,25 @@ class ContactSelector
 		$eventDispatcher = DI::eventDispatcher();
 
 		$nets = [
-			Protocol::DFRN      =>   DI::l10n()->t('DFRN'),
-			Protocol::OSTATUS   =>   DI::l10n()->t('OStatus'),
-			Protocol::FEED      =>   DI::l10n()->t('RSS/Atom'),
-			Protocol::MAIL      =>   DI::l10n()->t('Email'),
-			Protocol::DIASPORA  =>   DI::l10n()->t('Diaspora'),
-			Protocol::ZOT       =>   DI::l10n()->t('Zot!'),
-			Protocol::LINKEDIN  =>   DI::l10n()->t('LinkedIn'),
-			Protocol::XMPP      =>   DI::l10n()->t('XMPP/IM'),
-			Protocol::MYSPACE   =>   DI::l10n()->t('MySpace'),
-			Protocol::GPLUS     =>   DI::l10n()->t('Google+'),
-			Protocol::PUMPIO    =>   DI::l10n()->t('pump.io'),
-			Protocol::TWITTER   =>   DI::l10n()->t('Twitter'),
-			Protocol::DISCOURSE =>   DI::l10n()->t('Discourse'),
-			Protocol::DIASPORA2 =>   DI::l10n()->t('Diaspora Connector'),
-			Protocol::STATUSNET =>   DI::l10n()->t('GNU Social Connector'),
+			Protocol::DFRN        => DI::l10n()->t('DFRN'),
+			Protocol::OSTATUS     => DI::l10n()->t('OStatus'),
+			Protocol::FEED        => DI::l10n()->t('RSS/Atom'),
+			Protocol::MAIL        => DI::l10n()->t('Email'),
+			Protocol::DIASPORA    => DI::l10n()->t('Diaspora'),
+			Protocol::ZOT         => DI::l10n()->t('Zot!'),
+			Protocol::LINKEDIN    => DI::l10n()->t('LinkedIn'),
+			Protocol::XMPP        => DI::l10n()->t('XMPP/IM'),
+			Protocol::MYSPACE     => DI::l10n()->t('MySpace'),
+			Protocol::GPLUS       => DI::l10n()->t('Google+'),
+			Protocol::PUMPIO      => DI::l10n()->t('pump.io'),
+			Protocol::TWITTER     => DI::l10n()->t('Twitter'),
+			Protocol::DISCOURSE   => DI::l10n()->t('Discourse'),
+			Protocol::DIASPORA2   => DI::l10n()->t('Diaspora Connector'),
+			Protocol::STATUSNET   => DI::l10n()->t('GNU Social Connector'),
 			Protocol::ACTIVITYPUB => DI::l10n()->t('ActivityPub'),
-			Protocol::PNUT      =>   DI::l10n()->t('pnut'),
-			Protocol::TUMBLR    =>   DI::l10n()->t('Tumblr'),
-			Protocol::BLUESKY   =>   DI::l10n()->t('Bluesky'),
+			Protocol::PNUT        => DI::l10n()->t('pnut'),
+			Protocol::TUMBLR      => DI::l10n()->t('Tumblr'),
+			Protocol::BLUESKY     => DI::l10n()->t('Bluesky'),
 		];
 
 		$nets = $eventDispatcher->dispatch(
@@ -217,7 +216,7 @@ class ContactSelector
 		$network_svg = str_replace($search, $replace, $network);
 
 		if (in_array($network, Protocol::FEDERATED) && !empty($gsid)) {
-			$gserver = self::getServerForId($gsid);
+			$gserver  = self::getServerForId($gsid);
 			$platform = $gserver['platform'];
 		}
 
@@ -238,7 +237,7 @@ class ContactSelector
 			'takahē', 'takesama', 'threads', 'tumblr', 'vernissage', 'vervis', 'vidzy', 'vocata', 'wafrn',
 			'wildebeest', 'wordpress', 'write.as', 'writefreely', 'wxwclub', 'xwiki', 'zap'];
 
-		if (in_array($platform_icon_style,[self::SVG_WHITE, self::SVG_COLOR_WHITE])) {
+		if (in_array($platform_icon_style, [self::SVG_WHITE, self::SVG_COLOR_WHITE])) {
 			$svg = ['activitypub', 'akkoma', 'andstatus', 'bluesky', 'bonfire', 'bookwyrm', 'bridgy_fed',
 				'calckey', 'castopod', 'diaspora', 'discourse', 'dolphin', 'drupal', 'email', 'firefish',
 				'flipboard', 'flohmarkt', 'forgejo', 'friendica', 'funkwhale', 'ghost', 'gitlab',

From 7260f2929205eb29015dbb3a1c6254cfbffcb356 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 08:12:59 +0000
Subject: [PATCH 10/35] Create Event for jot_tool hook

---
 src/Content/Conversation.php                  | 15 ++++++++-------
 src/Core/Hooks/HookEventBridge.php            |  2 ++
 src/Event/HtmlFilterEvent.php                 |  2 ++
 src/Module/Item/Compose.php                   | 12 ++++++++----
 src/Module/Post/Edit.php                      | 15 ++++++++++-----
 tests/Unit/Core/Hooks/HookEventBridgeTest.php |  2 ++
 6 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 3394b3c798..205be399ef 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -11,7 +11,6 @@ use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Mode;
 use Friendica\App\Page;
-use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Core\ACL;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -23,6 +22,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Theme;
 use Friendica\Database\DBA;
+use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Item as ItemModel;
 use Friendica\Model\Post;
@@ -42,6 +42,7 @@ use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 use ImagickException;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class Conversation
@@ -75,8 +76,6 @@ class Conversation
 	private $baseURL;
 	/** @var IManageConfigValues */
 	private $config;
-	/** @var AppHelper */
-	private $appHelper;
 	/** @var Page */
 	private $page;
 	/** @var Mode */
@@ -85,8 +84,9 @@ class Conversation
 	private $session;
 	/** @var UserGServerRepository */
 	private $userGServer;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(UserGServerRepository $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, Mode $mode, AppHelper $appHelper, IHandleUserSessions $session)
+	public function __construct(UserGServerRepository $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, Mode $mode, EventDispatcherInterface $eventDispatcher, IHandleUserSessions $session)
 	{
 		$this->activity    = $activity;
 		$this->item        = $item;
@@ -99,7 +99,7 @@ class Conversation
 		$this->args        = $args;
 		$this->pConfig     = $pConfig;
 		$this->page        = $page;
-		$this->appHelper   = $appHelper;
+		$this->eventDispatcher = $eventDispatcher;
 		$this->session     = $session;
 		$this->userGServer = $userGServer;
 	}
@@ -332,8 +332,9 @@ class Conversation
 			'$is_mobile' => $this->mode->isMobile(),
 		]);
 
-		$jotplugins = '';
-		Hook::callAll('jot_tool', $jotplugins);
+		$jotplugins = $this->eventDispatcher->dispatch(
+			new HtmlFilterEvent(HtmlFilterEvent::JOT_TOOL, ''),
+		)->getHtml();
 
 		if ($this->config->get('system', 'set_creation_date')) {
 			$created_at = Temporal::getDateTimeField(
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index fca179a75b..d04a3e60bd 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -53,6 +53,7 @@ final class HookEventBridge
 		HtmlFilterEvent::PAGE_HEADER        => 'page_header',
 		HtmlFilterEvent::PAGE_CONTENT_TOP   => 'page_content_top',
 		HtmlFilterEvent::PAGE_END           => 'page_end',
+		HtmlFilterEvent::JOT_TOOL           => 'jot_tool',
 	];
 
 	/**
@@ -79,6 +80,7 @@ final class HookEventBridge
 			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_CONTENT_TOP   => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_END           => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL           => 'onHtmlFilterEvent',
 		];
 	}
 
diff --git a/src/Event/HtmlFilterEvent.php b/src/Event/HtmlFilterEvent.php
index 7d1bbb2b55..83a852e08b 100644
--- a/src/Event/HtmlFilterEvent.php
+++ b/src/Event/HtmlFilterEvent.php
@@ -26,6 +26,8 @@ final class HtmlFilterEvent extends Event
 
 	public const PAGE_END = 'friendica.html.page_end';
 
+	public const JOT_TOOL = 'friendica.html.jot_tool';
+
 	private string $html;
 
 	public function __construct(string $name, string $html)
diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 727b8ba04f..4463e6dbd8 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -16,13 +16,13 @@ use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\ACL;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Model\UserSession;
 use Friendica\Core\Theme;
 use Friendica\Database\DBA;
+use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
@@ -34,6 +34,7 @@ use Friendica\Util\ACLFormatter;
 use Friendica\Util\Crypto;
 use Friendica\Util\Profiler;
 use Friendica\Util\Temporal;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class Compose extends BaseModule
@@ -59,8 +60,9 @@ class Compose extends BaseModule
 	/** @var AppHelper */
 	private $appHelper;
 
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(AppHelper $appHelper, UserSession $session, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, ACLFormatter $ACLFormatter, SystemMessages $systemMessages, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	public function __construct(EventDispatcherInterface $eventDispatcher, AppHelper $appHelper, UserSession $session, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, ACLFormatter $ACLFormatter, SystemMessages $systemMessages, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -71,6 +73,7 @@ class Compose extends BaseModule
 		$this->config         = $config;
 		$this->session        = $session;
 		$this->appHelper      = $appHelper;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	protected function post(array $request = [])
@@ -153,8 +156,9 @@ class Compose extends BaseModule
 		$location      = $_REQUEST['location']      ?? $user['default-location'];
 		$wall          = $_REQUEST['wall']          ?? $type == 'post';
 
-		$jotplugins = '';
-		Hook::callAll('jot_tool', $jotplugins);
+		$jotplugins = $this->eventDispatcher->dispatch(
+			new HtmlFilterEvent(HtmlFilterEvent::JOT_TOOL, ''),
+		)->getHtml();
 
 		// Output
 		$this->page->registerFooterScript(Theme::getPathForFile('js/ajaxupload.js'));
diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index c07ba9d78f..76b39389a0 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -15,10 +15,10 @@ use Friendica\App\Page;
 use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Post;
 use Friendica\Model\User;
@@ -27,6 +27,7 @@ use Friendica\Navigation\SystemMessages;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Crypto;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -44,10 +45,13 @@ class Edit extends BaseModule
 	protected $mode;
 	/** @var AppHelper */
 	protected $appHelper;
+
+	private EventDispatcherInterface $eventDispatcher;
+
 	/** @var bool */
 	protected $isModal = false;
 
-	public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, Page $page, Mode $mode, AppHelper $appHelper, array $server, array $parameters = [])
+	public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, Page $page, Mode $mode, AppHelper $appHelper, EventDispatcherInterface $eventDispatcher, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -56,6 +60,7 @@ class Edit extends BaseModule
 		$this->page        = $page;
 		$this->mode        = $mode;
 		$this->appHelper   = $appHelper;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 
@@ -109,9 +114,9 @@ class Edit extends BaseModule
 		$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
 		$item = Post\Media::addHTMLAttachmentToItem($item);
 
-		$jotplugins = '';
-
-		Hook::callAll('jot_tool', $jotplugins);
+		$jotplugins = $this->eventDispatcher->dispatch(
+			new HtmlFilterEvent(HtmlFilterEvent::JOT_TOOL, ''),
+		)->getHtml();
 
 		$output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('jot.tpl'), [
 			'$is_edit'             => true,
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 195f0a0d0b..efafdd8395 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -42,6 +42,7 @@ class HookEventBridgeTest extends TestCase
 			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_CONTENT_TOP   => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_END           => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL           => 'onHtmlFilterEvent',
 		];
 
 		$this->assertSame(
@@ -196,6 +197,7 @@ class HookEventBridgeTest extends TestCase
 			[HtmlFilterEvent::PAGE_HEADER, 'page_header'],
 			[HtmlFilterEvent::PAGE_CONTENT_TOP, 'page_content_top'],
 			[HtmlFilterEvent::PAGE_END, 'page_end'],
+			[HtmlFilterEvent::JOT_TOOL, 'jot_tool'],
 		];
 	}
 

From 4bdd5f6bbe44bda2126b75fa6ba917f7ff048ad8 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 08:14:27 +0000
Subject: [PATCH 11/35] Fix code style

---
 src/Content/Conversation.php | 26 +++++++-------
 src/Module/Item/Compose.php  | 69 +++++++++++++++++++-----------------
 src/Module/Post/Edit.php     | 12 +++----
 3 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 205be399ef..e8c193926d 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -88,20 +88,20 @@ class Conversation
 
 	public function __construct(UserGServerRepository $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, Mode $mode, EventDispatcherInterface $eventDispatcher, IHandleUserSessions $session)
 	{
-		$this->activity    = $activity;
-		$this->item        = $item;
-		$this->config      = $config;
-		$this->mode        = $mode;
-		$this->baseURL     = $baseURL;
-		$this->profiler    = $profiler;
-		$this->logger      = $logger;
-		$this->l10n        = $l10n;
-		$this->args        = $args;
-		$this->pConfig     = $pConfig;
-		$this->page        = $page;
+		$this->activity        = $activity;
+		$this->item            = $item;
+		$this->config          = $config;
+		$this->mode            = $mode;
+		$this->baseURL         = $baseURL;
+		$this->profiler        = $profiler;
+		$this->logger          = $logger;
+		$this->l10n            = $l10n;
+		$this->args            = $args;
+		$this->pConfig         = $pConfig;
+		$this->page            = $page;
 		$this->eventDispatcher = $eventDispatcher;
-		$this->session     = $session;
-		$this->userGServer = $userGServer;
+		$this->session         = $session;
+		$this->userGServer     = $userGServer;
 	}
 
 	/**
diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 4463e6dbd8..af58c8ead7 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -66,13 +66,13 @@ class Compose extends BaseModule
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-		$this->systemMessages = $systemMessages;
-		$this->ACLFormatter   = $ACLFormatter;
-		$this->page           = $page;
-		$this->pConfig        = $pConfig;
-		$this->config         = $config;
-		$this->session        = $session;
-		$this->appHelper      = $appHelper;
+		$this->systemMessages  = $systemMessages;
+		$this->ACLFormatter    = $ACLFormatter;
+		$this->page            = $page;
+		$this->pConfig         = $pConfig;
+		$this->config          = $config;
+		$this->session         = $session;
+		$this->appHelper       = $appHelper;
 		$this->eventDispatcher = $eventDispatcher;
 	}
 
@@ -118,29 +118,28 @@ class Compose extends BaseModule
 
 		switch ($posttype) {
 			case Item::PT_PERSONAL_NOTE:
-				$compose_title = $this->l10n->t('Compose new personal note');
-				$type = 'note';
-				$doesFederate = false;
+				$compose_title      = $this->l10n->t('Compose new personal note');
+				$type               = 'note';
+				$doesFederate       = false;
 				$contact_allow_list = [$this->appHelper->getContactId()];
-				$circle_allow_list = [];
-				$contact_deny_list = [];
-				$circle_deny_list = [];
+				$circle_allow_list  = [];
+				$contact_deny_list  = [];
+				$circle_deny_list   = [];
 				break;
 			default:
 				$compose_title = $this->l10n->t('Compose new post');
-				$type = 'post';
-				$doesFederate = true;
+				$type          = 'post';
+				$doesFederate  = true;
 
 				$contact_allow = $_REQUEST['contact_allow'] ?? '';
-				$circle_allow = $_REQUEST['circle_allow'] ?? '';
-				$contact_deny = $_REQUEST['contact_deny'] ?? '';
-				$circle_deny = $_REQUEST['circle_deny'] ?? '';
+				$circle_allow  = $_REQUEST['circle_allow']  ?? '';
+				$contact_deny  = $_REQUEST['contact_deny']  ?? '';
+				$circle_deny   = $_REQUEST['circle_deny']   ?? '';
 
 				if ($contact_allow
 					. $circle_allow
 					. $contact_deny
-				    . $circle_deny)
-				{
+					. $circle_deny) {
 					$contact_allow_list = $contact_allow ? explode(',', $contact_allow) : [];
 					$circle_allow_list  = $circle_allow  ? explode(',', $circle_allow)  : [];
 					$contact_deny_list  = $contact_deny  ? explode(',', $contact_deny)  : [];
@@ -150,11 +149,11 @@ class Compose extends BaseModule
 				break;
 		}
 
-		$title         = $_REQUEST['title']         ?? '';
-		$category      = $_REQUEST['category']      ?? '';
-		$body          = $_REQUEST['body']          ?? '';
-		$location      = $_REQUEST['location']      ?? $user['default-location'];
-		$wall          = $_REQUEST['wall']          ?? $type == 'post';
+		$title    = $_REQUEST['title']    ?? '';
+		$category = $_REQUEST['category'] ?? '';
+		$body     = $_REQUEST['body']     ?? '';
+		$location = $_REQUEST['location'] ?? $user['default-location'];
+		$wall     = $_REQUEST['wall']     ?? $type == 'post';
 
 		$jotplugins = $this->eventDispatcher->dispatch(
 			new HtmlFilterEvent(HtmlFilterEvent::JOT_TOOL, ''),
@@ -206,8 +205,12 @@ class Compose extends BaseModule
 				'wait'                 => $this->l10n->t('Please wait'),
 				'placeholdertitle'     => $this->l10n->t('Set title'),
 				'placeholdercategory'  => Feature::isEnabled($this->session->getLocalUserId(), Feature::CATEGORIES) ? $this->l10n->t('Categories (comma-separated list)') : '',
-				'always_open_compose'  => $this->pConfig->get($this->session->getLocalUserId(), 'frio', 'always_open_compose',
-					$this->config->get('frio', 'always_open_compose', false)) ? '' :
+				'always_open_compose'  => $this->pConfig->get(
+					$this->session->getLocalUserId(),
+					'frio',
+					'always_open_compose',
+					$this->config->get('frio', 'always_open_compose', false)
+				) ? '' :
 						$this->l10n->t('You can make this page always open when you use the New Post button in the <a href="/settings/display">Theme Customization settings</a>.'),
 			],
 
@@ -224,11 +227,11 @@ class Compose extends BaseModule
 				$this->l10n->t('Scheduled at'),
 				'scheduled_at'
 			),
-			'$created_at'   => $created_at,
-			'$title'        => $title,
-			'$category'     => $category,
-			'$body'         => $body,
-			'$location'     => $location,
+			'$created_at' => $created_at,
+			'$title'      => $title,
+			'$category'   => $category,
+			'$body'       => $body,
+			'$location'   => $location,
 
 			'$contact_allow' => implode(',', $contact_allow_list),
 			'$circle_allow'  => implode(',', $circle_allow_list),
@@ -237,7 +240,7 @@ class Compose extends BaseModule
 
 			'$jotplugins'   => $jotplugins,
 			'$rand_num'     => Crypto::randomDigits(12),
-			'$acl_selector'  => ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), $doesFederate, [
+			'$acl_selector' => ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), $doesFederate, [
 				'allow_cid' => $contact_allow_list,
 				'allow_gid' => $circle_allow_list,
 				'deny_cid'  => $contact_deny_list,
diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index 76b39389a0..937ebcae5a 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -55,11 +55,11 @@ class Edit extends BaseModule
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-		$this->session     = $session;
-		$this->sysMessages = $sysMessages;
-		$this->page        = $page;
-		$this->mode        = $mode;
-		$this->appHelper   = $appHelper;
+		$this->session         = $session;
+		$this->sysMessages     = $sysMessages;
+		$this->page            = $page;
+		$this->mode            = $mode;
+		$this->appHelper       = $appHelper;
 		$this->eventDispatcher = $eventDispatcher;
 	}
 
@@ -112,7 +112,7 @@ class Edit extends BaseModule
 		}
 
 		$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
-		$item = Post\Media::addHTMLAttachmentToItem($item);
+		$item         = Post\Media::addHTMLAttachmentToItem($item);
 
 		$jotplugins = $this->eventDispatcher->dispatch(
 			new HtmlFilterEvent(HtmlFilterEvent::JOT_TOOL, ''),

From d4ba28a9971a408f7a045350b09539bb03b66ad3 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 08:38:59 +0000
Subject: [PATCH 12/35] create event for conversation_start hook

---
 src/Content/Conversation.php                  | 6 +++++-
 src/Core/Hooks/HookEventBridge.php            | 2 ++
 src/Event/ArrayFilterEvent.php                | 2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index e8c193926d..16ca762698 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -22,6 +22,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Theme;
 use Friendica\Database\DBA;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Item as ItemModel;
@@ -564,7 +565,10 @@ class Conversation
 		}
 
 		$cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview];
-		Hook::callAll('conversation_start', $cb);
+
+		$cb = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::CONVERSATION_START, $cb),
+		)->getArray();
 
 		$items = $cb['items'];
 
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index d04a3e60bd..f2fd9572f3 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -48,6 +48,7 @@ final class HookEventBridge
 		ArrayFilterEvent::POST_LOCAL_END    => 'post_local_end',
 		ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'photo_upload_form',
 		ArrayFilterEvent::NETWORK_TO_NAME   => 'network_to_name',
+		ArrayFilterEvent::CONVERSATION_START => 'conversation_start',
 		HtmlFilterEvent::HEAD               => 'head',
 		HtmlFilterEvent::FOOTER             => 'footer',
 		HtmlFilterEvent::PAGE_HEADER        => 'page_header',
@@ -75,6 +76,7 @@ final class HookEventBridge
 			ArrayFilterEvent::POST_LOCAL_END    => 'onArrayFilterEvent',
 			ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
 			ArrayFilterEvent::NETWORK_TO_NAME   => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD               => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER             => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 15579788a6..6c90a9d01d 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -34,6 +34,8 @@ final class ArrayFilterEvent extends Event
 
 	public const NETWORK_TO_NAME = 'friendica.data.network_to_name';
 
+	public const CONVERSATION_START = 'friendica.data.conversation_start';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index efafdd8395..037eb33c3a 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -37,6 +37,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::POST_LOCAL_END    => 'onArrayFilterEvent',
 			ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
 			ArrayFilterEvent::NETWORK_TO_NAME   => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD               => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER             => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
@@ -165,6 +166,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::POST_LOCAL_END, 'post_local_end'],
 			[ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'photo_upload_form'],
 			[ArrayFilterEvent::NETWORK_TO_NAME, 'network_to_name'],
+			[ArrayFilterEvent::CONVERSATION_START, 'conversation_start'],
 		];
 	}
 

From 02976067c3f1267177b1411aa0cc1e0ce7b1c70e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 08:39:58 +0000
Subject: [PATCH 13/35] Fix code style

---
 src/Core/Hooks/HookEventBridge.php            | 76 +++++++++----------
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 38 +++++-----
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index f2fd9572f3..ffe16210c7 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -35,26 +35,26 @@ final class HookEventBridge
 	 * This maps the new event names to the legacy Hook names.
 	 */
 	private static array $eventMapper = [
-		Event::INIT                         => 'init_1',
-		Event::HOME_INIT                    => 'home_init',
-		ConfigLoadedEvent::CONFIG_LOADED    => 'load_config',
-		CollectRoutesEvent::COLLECT_ROUTES  => 'route_collection',
-		ArrayFilterEvent::APP_MENU          => 'app_menu',
-		ArrayFilterEvent::NAV_INFO          => 'nav_info',
-		ArrayFilterEvent::FEATURE_ENABLED   => 'isEnabled',
-		ArrayFilterEvent::FEATURE_GET       => 'get',
-		ArrayFilterEvent::POST_LOCAL_START  => 'post_local_start',
-		ArrayFilterEvent::POST_LOCAL        => 'post_local',
-		ArrayFilterEvent::POST_LOCAL_END    => 'post_local_end',
-		ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'photo_upload_form',
-		ArrayFilterEvent::NETWORK_TO_NAME   => 'network_to_name',
+		Event::INIT                          => 'init_1',
+		Event::HOME_INIT                     => 'home_init',
+		ConfigLoadedEvent::CONFIG_LOADED     => 'load_config',
+		CollectRoutesEvent::COLLECT_ROUTES   => 'route_collection',
+		ArrayFilterEvent::APP_MENU           => 'app_menu',
+		ArrayFilterEvent::NAV_INFO           => 'nav_info',
+		ArrayFilterEvent::FEATURE_ENABLED    => 'isEnabled',
+		ArrayFilterEvent::FEATURE_GET        => 'get',
+		ArrayFilterEvent::POST_LOCAL_START   => 'post_local_start',
+		ArrayFilterEvent::POST_LOCAL         => 'post_local',
+		ArrayFilterEvent::POST_LOCAL_END     => 'post_local_end',
+		ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'photo_upload_form',
+		ArrayFilterEvent::NETWORK_TO_NAME    => 'network_to_name',
 		ArrayFilterEvent::CONVERSATION_START => 'conversation_start',
-		HtmlFilterEvent::HEAD               => 'head',
-		HtmlFilterEvent::FOOTER             => 'footer',
-		HtmlFilterEvent::PAGE_HEADER        => 'page_header',
-		HtmlFilterEvent::PAGE_CONTENT_TOP   => 'page_content_top',
-		HtmlFilterEvent::PAGE_END           => 'page_end',
-		HtmlFilterEvent::JOT_TOOL           => 'jot_tool',
+		HtmlFilterEvent::HEAD                => 'head',
+		HtmlFilterEvent::FOOTER              => 'footer',
+		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
+		HtmlFilterEvent::PAGE_CONTENT_TOP    => 'page_content_top',
+		HtmlFilterEvent::PAGE_END            => 'page_end',
+		HtmlFilterEvent::JOT_TOOL            => 'jot_tool',
 	];
 
 	/**
@@ -63,26 +63,26 @@ final class HookEventBridge
 	public static function getStaticSubscribedEvents(): array
 	{
 		return [
-			Event::INIT                         => 'onNamedEvent',
-			Event::HOME_INIT                    => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED    => 'onConfigLoadedEvent',
-			CollectRoutesEvent::COLLECT_ROUTES  => 'onCollectRoutesEvent',
-			ArrayFilterEvent::APP_MENU          => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO          => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED   => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET       => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START  => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL        => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END    => 'onArrayFilterEvent',
-			ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
-			ArrayFilterEvent::NETWORK_TO_NAME   => 'onArrayFilterEvent',
+			Event::INIT                          => 'onNamedEvent',
+			Event::HOME_INIT                     => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED     => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES   => 'onCollectRoutesEvent',
+			ArrayFilterEvent::APP_MENU           => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO           => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED    => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET        => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START   => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL         => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END     => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
 			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
-			HtmlFilterEvent::HEAD               => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER             => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP   => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END           => 'onHtmlFilterEvent',
-			HtmlFilterEvent::JOT_TOOL           => 'onHtmlFilterEvent',
+			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP    => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END            => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL            => 'onHtmlFilterEvent',
 		];
 	}
 
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 037eb33c3a..0e9e476590 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -24,26 +24,26 @@ class HookEventBridgeTest extends TestCase
 	public function testGetStaticSubscribedEventsReturnsStaticMethods(): void
 	{
 		$expected = [
-			Event::INIT                         => 'onNamedEvent',
-			Event::HOME_INIT                    => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED    => 'onConfigLoadedEvent',
-			CollectRoutesEvent::COLLECT_ROUTES  => 'onCollectRoutesEvent',
-			ArrayFilterEvent::APP_MENU          => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO          => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED   => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET       => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START  => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL        => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END    => 'onArrayFilterEvent',
-			ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
-			ArrayFilterEvent::NETWORK_TO_NAME   => 'onArrayFilterEvent',
+			Event::INIT                          => 'onNamedEvent',
+			Event::HOME_INIT                     => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED     => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES   => 'onCollectRoutesEvent',
+			ArrayFilterEvent::APP_MENU           => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO           => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED    => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET        => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START   => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL         => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END     => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
 			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
-			HtmlFilterEvent::HEAD               => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER             => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER        => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP   => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END           => 'onHtmlFilterEvent',
-			HtmlFilterEvent::JOT_TOOL           => 'onHtmlFilterEvent',
+			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP    => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END            => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL            => 'onHtmlFilterEvent',
 		];
 
 		$this->assertSame(

From ca3edb866aa18c590e73ba3d4948613ce4eb9448 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 09:42:57 +0000
Subject: [PATCH 14/35] Create Event for display_item hook

---
 src/Content/Conversation.php                  | 5 ++++-
 src/Core/Hooks/HookEventBridge.php            | 2 ++
 src/Event/ArrayFilterEvent.php                | 2 ++
 src/Object/Post.php                           | 8 +++++++-
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 2 ++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 16ca762698..4175398a64 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -1572,7 +1572,10 @@ class Conversation
 			];
 
 			$arr = ['item' => $item, 'output' => $tmp_item];
-			Hook::callAll('display_item', $arr);
+
+			$arr = $this->eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::DISPLAY_ITEM, $arr),
+			)->getArray();
 
 			$threads[] = [
 				'id'      => $item['id'],
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index ffe16210c7..50f8945b47 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -49,6 +49,7 @@ final class HookEventBridge
 		ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'photo_upload_form',
 		ArrayFilterEvent::NETWORK_TO_NAME    => 'network_to_name',
 		ArrayFilterEvent::CONVERSATION_START => 'conversation_start',
+		ArrayFilterEvent::DISPLAY_ITEM       => 'display_item',
 		HtmlFilterEvent::HEAD                => 'head',
 		HtmlFilterEvent::FOOTER              => 'footer',
 		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
@@ -77,6 +78,7 @@ final class HookEventBridge
 			ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'onArrayFilterEvent',
 			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
 			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
+			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 6c90a9d01d..75f1eb8620 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -36,6 +36,8 @@ final class ArrayFilterEvent extends Event
 
 	public const CONVERSATION_START = 'friendica.data.conversation_start';
 
+	public const DISPLAY_ITEM = 'friendica.data.display_item';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/src/Object/Post.php b/src/Object/Post.php
index b5ad33f56e..769d74576c 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -14,6 +14,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Item;
@@ -630,8 +631,13 @@ class Post
 			],
 		];
 
+		$eventDispatcher = DI::eventDispatcher();
+
 		$arr = ['item' => $item, 'output' => $tmp_item];
-		Hook::callAll('display_item', $arr);
+
+		$arr = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::DISPLAY_ITEM, $arr),
+		)->getArray();
 
 		$result = $arr['output'];
 
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 0e9e476590..eed89c343a 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -38,6 +38,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'onArrayFilterEvent',
 			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
 			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
+			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -167,6 +168,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'photo_upload_form'],
 			[ArrayFilterEvent::NETWORK_TO_NAME, 'network_to_name'],
 			[ArrayFilterEvent::CONVERSATION_START, 'conversation_start'],
+			[ArrayFilterEvent::DISPLAY_ITEM, 'display_item'],
 		];
 	}
 

From 85fceaa16e32aae943b98d236094f06f6006dd71 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 09:47:30 +0000
Subject: [PATCH 15/35] Remove not needed hook call

---
 src/Content/Conversation.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 4175398a64..ec275af06a 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -659,10 +659,6 @@ class Conversation
 					continue;
 				}
 
-				/// @todo Check if this call is needed or not
-				$arr = ['item' => $item];
-				Hook::callAll('display_item', $arr);
-
 				$item['pagedrop'] = $pagedrop;
 
 				if ($item['gravity'] == ItemModel::GRAVITY_PARENT) {

From b3ef18bed71947be84bfe58a5604291b60139b5b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 10:19:55 +0000
Subject: [PATCH 16/35] create event for render_location hook

---
 src/Content/Conversation.php                  |  7 +++++--
 src/Core/Hooks/HookEventBridge.php            |  2 ++
 src/Event/ArrayFilterEvent.php                |  2 ++
 src/Object/Post.php                           | 11 +++++++----
 tests/Unit/Core/Hooks/HookEventBridgeTest.php |  2 ++
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index ec275af06a..722aaf27b5 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -14,7 +14,6 @@ use Friendica\App\Page;
 use Friendica\BaseModule;
 use Friendica\Core\ACL;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Protocol;
@@ -1472,7 +1471,11 @@ class Conversation
 			}
 
 			$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
-			Hook::callAll('render_location', $locate);
+
+			$locate = $this->eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::RENDER_LOCATION, $locate),
+			)->getArray();
+
 			$location_html = $locate['html'] ?: Strings::escapeHtml($locate['location'] ?: $locate['coord'] ?: '');
 
 			$this->item->localize($item);
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 50f8945b47..99290480b7 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -50,6 +50,7 @@ final class HookEventBridge
 		ArrayFilterEvent::NETWORK_TO_NAME    => 'network_to_name',
 		ArrayFilterEvent::CONVERSATION_START => 'conversation_start',
 		ArrayFilterEvent::DISPLAY_ITEM       => 'display_item',
+		ArrayFilterEvent::RENDER_LOCATION    => 'render_location',
 		HtmlFilterEvent::HEAD                => 'head',
 		HtmlFilterEvent::FOOTER              => 'footer',
 		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
@@ -79,6 +80,7 @@ final class HookEventBridge
 			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
 			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
 			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
+			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 75f1eb8620..4b9ed3ce3e 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -38,6 +38,8 @@ final class ArrayFilterEvent extends Event
 
 	public const DISPLAY_ITEM = 'friendica.data.display_item';
 
+	public const RENDER_LOCATION = 'friendica.data.render_location';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 769d74576c..d4b381a115 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -10,7 +10,6 @@ namespace Friendica\Object;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Core\Addon;
-use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -315,8 +314,14 @@ class Post
 			$sparkle = ' sparkle';
 		}
 
+		$eventDispatcher = DI::eventDispatcher();
+
 		$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
-		Hook::callAll('render_location', $locate);
+
+		$locate = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::RENDER_LOCATION, $locate),
+		)->getArray();
+
 		$location_html = $locate['html'] ?: Strings::escapeHtml($locate['location'] ?: $locate['coord'] ?: '');
 
 		// process action responses - e.g. like/dislike/attend/agree/whatever
@@ -631,8 +636,6 @@ class Post
 			],
 		];
 
-		$eventDispatcher = DI::eventDispatcher();
-
 		$arr = ['item' => $item, 'output' => $tmp_item];
 
 		$arr = $eventDispatcher->dispatch(
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index eed89c343a..de2b43f15c 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -39,6 +39,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
 			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
 			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
+			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -169,6 +170,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::NETWORK_TO_NAME, 'network_to_name'],
 			[ArrayFilterEvent::CONVERSATION_START, 'conversation_start'],
 			[ArrayFilterEvent::DISPLAY_ITEM, 'display_item'],
+			[ArrayFilterEvent::RENDER_LOCATION, 'render_location'],
 		];
 	}
 

From aff117284b471b2240d559c27a6fd9cd1336ef2b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 10:33:17 +0000
Subject: [PATCH 17/35] create event for item_photo_menu hook

---
 src/Content/Item.php                          |  5 +++--
 src/Core/Hooks/HookEventBridge.php            |  2 ++
 src/Event/ArrayFilterEvent.php                |  2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php |  2 ++
 tests/Unit/Event/ArrayFilterEventTest.php     | 12 ++++++++++++
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Content/Item.php b/src/Content/Item.php
index ee20e3d168..9c9cd10bed 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -12,7 +12,6 @@ use Friendica\AppHelper;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\BBCode\Video;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Protocol;
@@ -449,7 +448,9 @@ class Item
 
 		$args = ['item' => $item, 'menu' => $menu];
 
-		Hook::callAll('item_photo_menu', $args);
+		$args = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ITEM_PHOTO_MENU, $args),
+		)->getArray();
 
 		$menu = $args['menu'];
 
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 99290480b7..1a517a712c 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -51,6 +51,7 @@ final class HookEventBridge
 		ArrayFilterEvent::CONVERSATION_START => 'conversation_start',
 		ArrayFilterEvent::DISPLAY_ITEM       => 'display_item',
 		ArrayFilterEvent::RENDER_LOCATION    => 'render_location',
+		ArrayFilterEvent::ITEM_PHOTO_MENU    => 'item_photo_menu',
 		HtmlFilterEvent::HEAD                => 'head',
 		HtmlFilterEvent::FOOTER              => 'footer',
 		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
@@ -81,6 +82,7 @@ final class HookEventBridge
 			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
 			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
 			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 4b9ed3ce3e..2c37cb8f27 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -40,6 +40,8 @@ final class ArrayFilterEvent extends Event
 
 	public const RENDER_LOCATION = 'friendica.data.render_location';
 
+	public const ITEM_PHOTO_MENU = 'friendica.data.item_photo_menu';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index de2b43f15c..e65ebaa6c8 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -40,6 +40,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
 			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
 			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -171,6 +172,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::CONVERSATION_START, 'conversation_start'],
 			[ArrayFilterEvent::DISPLAY_ITEM, 'display_item'],
 			[ArrayFilterEvent::RENDER_LOCATION, 'render_location'],
+			[ArrayFilterEvent::ITEM_PHOTO_MENU, 'item_photo_menu'],
 		];
 	}
 
diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php
index c709e0ff0a..4ed37337c7 100644
--- a/tests/Unit/Event/ArrayFilterEventTest.php
+++ b/tests/Unit/Event/ArrayFilterEventTest.php
@@ -26,6 +26,18 @@ class ArrayFilterEventTest extends TestCase
 	{
 		return [
 			[ArrayFilterEvent::APP_MENU, 'friendica.data.app_menu'],
+			[ArrayFilterEvent::NAV_INFO, 'friendica.data.nav_info'],
+			[ArrayFilterEvent::FEATURE_ENABLED, 'friendica.data.feature_enabled'],
+			[ArrayFilterEvent::FEATURE_GET, 'friendica.data.feature_get'],
+			[ArrayFilterEvent::POST_LOCAL_START, 'friendica.data.post_local_start'],
+			[ArrayFilterEvent::POST_LOCAL, 'friendica.data.post_local'],
+			[ArrayFilterEvent::POST_LOCAL_END, 'friendica.data.post_local_end'],
+			[ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'friendica.data.photo_upload_form'],
+			[ArrayFilterEvent::NETWORK_TO_NAME, 'friendica.data.network_to_name'],
+			[ArrayFilterEvent::CONVERSATION_START, 'friendica.data.conversation_start'],
+			[ArrayFilterEvent::DISPLAY_ITEM, 'friendica.data.display_item'],
+			[ArrayFilterEvent::RENDER_LOCATION, 'friendica.data.render_location'],
+			[ArrayFilterEvent::ITEM_PHOTO_MENU, 'friendica.data.item_photo_menu'],
 		];
 	}
 

From b9a401454d7bc816286b2e90cf1c60302efd6c20 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 12:11:17 +0000
Subject: [PATCH 18/35] Create event for oembed_fetch_url hook

---
 src/Content/OEmbed.php                        | 12 +++++++---
 src/Core/Hooks/HookEventBridge.php            | 16 +++++++++++++
 src/Event/ArrayFilterEvent.php                |  2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 23 +++++++++++++++++++
 tests/Unit/Event/ArrayFilterEventTest.php     |  1 +
 5 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 599d3dc8f7..217f42f0eb 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -13,11 +13,11 @@ use DOMXPath;
 use Exception;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Cache\Enum\Duration;
-use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Network\HTTPClient\Client\HttpClientRequest;
@@ -180,9 +180,15 @@ class OEmbed
 			$oembed->thumbnail_height = $data['images'][0]['height'];
 		}
 
-		Hook::callAll('oembed_fetch_url', $embedurl);
+		$eventDispatcher = DI::eventDispatcher();
 
-		return $oembed;
+		$oembed_data = ['url' => $embedurl];
+
+		$oembed_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::OEMBED_FETCH_END, $oembed_data),
+		)->getArray();
+
+		return $oembed_data['url'] ?? $embedurl;
 	}
 
 	/**
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 1a517a712c..031b92834b 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -52,6 +52,7 @@ final class HookEventBridge
 		ArrayFilterEvent::DISPLAY_ITEM       => 'display_item',
 		ArrayFilterEvent::RENDER_LOCATION    => 'render_location',
 		ArrayFilterEvent::ITEM_PHOTO_MENU    => 'item_photo_menu',
+		ArrayFilterEvent::OEMBED_FETCH_END   => 'oembed_fetch_url',
 		HtmlFilterEvent::HEAD                => 'head',
 		HtmlFilterEvent::FOOTER              => 'footer',
 		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
@@ -83,6 +84,7 @@ final class HookEventBridge
 			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
 			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
 			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
+			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -109,6 +111,20 @@ final class HookEventBridge
 		);
 	}
 
+	/**
+	 * Map the OEMBED_FETCH_END event to `oembed_fetch_url` hook
+	 */
+	public static function onOembedFetchEndEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$url = (string) $data['url'] ?? '';
+
+		$data['url'] = static::callHook($event->getName(), $url);
+
+		$event->setArray($data);
+	}
+
 	public static function onArrayFilterEvent(ArrayFilterEvent $event): void
 	{
 		$event->setArray(
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 2c37cb8f27..47beddc866 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -42,6 +42,8 @@ final class ArrayFilterEvent extends Event
 
 	public const ITEM_PHOTO_MENU = 'friendica.data.item_photo_menu';
 
+	public const OEMBED_FETCH_END = 'friendica.data.oembed_fetch_end';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index e65ebaa6c8..ea46230399 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -41,6 +41,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
 			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
 			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
+			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -156,6 +157,28 @@ class HookEventBridgeTest extends TestCase
 		HookEventBridge::onCollectRoutesEvent($event);
 	}
 
+	public function testOnOembedFetchEndEventCallsHookWithCorrectValue(): void
+	{
+		$event = new ArrayFilterEvent(ArrayFilterEvent::OEMBED_FETCH_END, ['url' => 'original_url']);
+
+		$reflectionProperty = new \ReflectionProperty(HookEventBridge::class, 'mockedCallHook');
+		$reflectionProperty->setAccessible(true);
+
+		$reflectionProperty->setValue(null, function (string $name, $data): string  {
+			$this->assertSame('oembed_fetch_url', $name);
+			$this->assertSame('original_url', $data);
+
+			return 'changed_url';
+		});
+
+		HookEventBridge::onOembedFetchEndEvent($event);
+
+		$this->assertSame(
+			['url' => 'changed_url'],
+			$event->getArray(),
+		);
+	}
+
 	public static function getArrayFilterEventData(): array
 	{
 		return [
diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php
index 4ed37337c7..26ff604170 100644
--- a/tests/Unit/Event/ArrayFilterEventTest.php
+++ b/tests/Unit/Event/ArrayFilterEventTest.php
@@ -38,6 +38,7 @@ class ArrayFilterEventTest extends TestCase
 			[ArrayFilterEvent::DISPLAY_ITEM, 'friendica.data.display_item'],
 			[ArrayFilterEvent::RENDER_LOCATION, 'friendica.data.render_location'],
 			[ArrayFilterEvent::ITEM_PHOTO_MENU, 'friendica.data.item_photo_menu'],
+			[ArrayFilterEvent::OEMBED_FETCH_END, 'friendica.data.oembed_fetch_end'],
 		];
 	}
 

From ce4e77fbb693a18782a285e44f361ee1f4ef272c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 12:15:17 +0000
Subject: [PATCH 19/35] Fix code style

---
 src/Content/OEmbed.php                        | 44 ++++++++++---------
 tests/Unit/Core/Hooks/HookEventBridgeTest.php |  2 +-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 217f42f0eb..9383363012 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -53,7 +53,7 @@ class OEmbed
 
 		$cache_key = 'oembed:' . $appHelper->getThemeInfoValue('videowidth') . ':' . $embedurl;
 
-		$condition = ['url' => Strings::normaliseLink($embedurl), 'maxwidth' => $appHelper->getThemeInfoValue('videowidth')];
+		$condition     = ['url' => Strings::normaliseLink($embedurl), 'maxwidth' => $appHelper->getThemeInfoValue('videowidth')];
 		$oembed_record = DBA::selectFirst('oembed', ['content'], $condition);
 		if (DBA::isResult($oembed_record)) {
 			$json_string = $oembed_record['content'];
@@ -64,7 +64,7 @@ class OEmbed
 		// These media files should now be caught in bbcode.php
 		// left here as a fallback in case this is called from another source
 		$noexts = ['mp3', 'mp4', 'ogg', 'ogv', 'oga', 'ogm', 'webm'];
-		$ext = pathinfo(strtolower($embedurl), PATHINFO_EXTENSION);
+		$ext    = pathinfo(strtolower($embedurl), PATHINFO_EXTENSION);
 
 		$oembed = new \Friendica\Object\OEmbed($embedurl);
 
@@ -81,15 +81,17 @@ class OEmbed
 					if (@$dom->loadHTML($html_text)) {
 						$xpath = new DOMXPath($dom);
 						foreach (
-							$xpath->query("//link[@type='application/json+oembed'] | //link[@type='text/json+oembed']")
-							as $link)
-						{
+							$xpath->query("//link[@type='application/json+oembed'] | //link[@type='text/json+oembed']") as $link
+						) {
 							/** @var DOMElement $link */
 							$href = $link->getAttributeNode('href')->nodeValue;
 							// Both Youtube and Vimeo output OEmbed endpoint URL with HTTP
 							// but their OEmbed endpoint is only accessible by HTTPS ¯\_(ツ)_/¯
-							$href = str_replace(['http://www.youtube.com/', 'http://player.vimeo.com/'],
-								['https://www.youtube.com/', 'https://player.vimeo.com/'], $href);
+							$href = str_replace(
+								['http://www.youtube.com/', 'http://player.vimeo.com/'],
+								['https://www.youtube.com/', 'https://player.vimeo.com/'],
+								$href
+							);
 							$result = DI::httpClient()->get($href . '&maxwidth=' . $appHelper->getThemeInfoValue('videowidth'), HttpClientAccept::DEFAULT, [HttpClientOptions::REQUEST => HttpClientRequest::SITEINFO]);
 							if ($result->isSuccess()) {
 								$json_string = $result->getBodyString();
@@ -110,10 +112,10 @@ class OEmbed
 
 			if (!empty($oembed->type) && $oembed->type != 'error') {
 				DBA::insert('oembed', [
-					'url' => Strings::normaliseLink($embedurl),
+					'url'      => Strings::normaliseLink($embedurl),
 					'maxwidth' => $appHelper->getThemeInfoValue('videowidth'),
-					'content' => $json_string,
-					'created' => DateTimeFormat::utcNow()
+					'content'  => $json_string,
+					'created'  => DateTimeFormat::utcNow()
 				], Database::INSERT_UPDATE);
 				$cache_ttl = Duration::DAY;
 			} else {
@@ -141,8 +143,8 @@ class OEmbed
 
 			if ($oembed->type == 'photo') {
 				if (!empty($data['images'])) {
-					$oembed->url = $data['images'][0]['src'];
-					$oembed->width = $data['images'][0]['width'];
+					$oembed->url    = $data['images'][0]['src'];
+					$oembed->width  = $data['images'][0]['width'];
 					$oembed->height = $data['images'][0]['height'];
 				} else {
 					$oembed->type = 'link';
@@ -175,8 +177,8 @@ class OEmbed
 		}
 
 		if (!empty($data['images']) && ($oembed->type != 'photo')) {
-			$oembed->thumbnail_url = $data['images'][0]['src'];
-			$oembed->thumbnail_width = $data['images'][0]['width'];
+			$oembed->thumbnail_url    = $data['images'][0]['src'];
+			$oembed->thumbnail_width  = $data['images'][0]['width'];
 			$oembed->thumbnail_height = $data['images'][0]['height'];
 		}
 
@@ -210,15 +212,15 @@ class OEmbed
 					// make sure we don't attempt divide by zero, fallback is a 1:1 ratio
 					$tr = (($th) ? $tw / $th : 1);
 
-					$th = 120;
-					$tw = $th * $tr;
+					$th  = 120;
+					$tw  = $th * $tr;
 					$tpl = Renderer::getMarkupTemplate('oembed_video.tpl');
 					$ret .= Renderer::replaceMacros($tpl, [
-						'$embedurl' => $oembed->embed_url,
+						'$embedurl'    => $oembed->embed_url,
 						'$escapedhtml' => base64_encode($oembed->html),
-						'$tw' => $tw,
-						'$th' => $th,
-						'$turl' => BBCode::proxyUrl($oembed->thumbnail_url, BBCode::INTERNAL, $uriid, Proxy::SIZE_SMALL),
+						'$tw'          => $tw,
+						'$th'          => $th,
+						'$turl'        => BBCode::proxyUrl($oembed->thumbnail_url, BBCode::INTERNAL, $uriid, Proxy::SIZE_SMALL),
 					]);
 				} else {
 					$ret .= Proxy::proxifyHtml($oembed->html, $uriid);
@@ -285,7 +287,7 @@ class OEmbed
 		}
 
 		$ret .= '</div>';
-$test = Proxy::proxifyHtml($ret, $uriid);
+		$test = Proxy::proxifyHtml($ret, $uriid);
 
 		return str_replace("\n", "", $ret);
 	}
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index ea46230399..44b727cf71 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -164,7 +164,7 @@ class HookEventBridgeTest extends TestCase
 		$reflectionProperty = new \ReflectionProperty(HookEventBridge::class, 'mockedCallHook');
 		$reflectionProperty->setAccessible(true);
 
-		$reflectionProperty->setValue(null, function (string $name, $data): string  {
+		$reflectionProperty->setValue(null, function (string $name, string $data): string {
 			$this->assertSame('oembed_fetch_url', $name);
 			$this->assertSame('original_url', $data);
 

From 0b3915322b9f5f84c9392616566c78753b42d091 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 12:26:50 +0000
Subject: [PATCH 20/35] Create event for page_info_data hook

---
 src/Content/PageInfo.php                      | 8 ++++++--
 src/Core/Hooks/HookEventBridge.php            | 2 ++
 src/Event/ArrayFilterEvent.php                | 2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 2 ++
 tests/Unit/Event/ArrayFilterEventTest.php     | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Content/PageInfo.php b/src/Content/PageInfo.php
index 93d2e46750..4d2a1180d3 100644
--- a/src/Content/PageInfo.php
+++ b/src/Content/PageInfo.php
@@ -7,8 +7,8 @@
 
 namespace Friendica\Content;
 
-use Friendica\Core\Hook;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Network\HTTPException;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Strings;
@@ -90,7 +90,11 @@ class PageInfo
 	 */
 	public static function getFooterFromData(array $data, bool $no_photos = false): string
 	{
-		Hook::callAll('page_info_data', $data);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PAGE_INFO, $data),
+		)->getArray();
 
 		if (empty($data['type'])) {
 			return '';
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 031b92834b..1479e41d54 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -53,6 +53,7 @@ final class HookEventBridge
 		ArrayFilterEvent::RENDER_LOCATION    => 'render_location',
 		ArrayFilterEvent::ITEM_PHOTO_MENU    => 'item_photo_menu',
 		ArrayFilterEvent::OEMBED_FETCH_END   => 'oembed_fetch_url',
+		ArrayFilterEvent::PAGE_INFO          => 'page_info_data',
 		HtmlFilterEvent::HEAD                => 'head',
 		HtmlFilterEvent::FOOTER              => 'footer',
 		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
@@ -85,6 +86,7 @@ final class HookEventBridge
 			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
 			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
 			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
+			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 47beddc866..41158c7eb3 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -44,6 +44,8 @@ final class ArrayFilterEvent extends Event
 
 	public const OEMBED_FETCH_END = 'friendica.data.oembed_fetch_end';
 
+	public const PAGE_INFO = 'friendica.data.page_info';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 44b727cf71..d6d7801f13 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -42,6 +42,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
 			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
 			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
+			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -196,6 +197,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::DISPLAY_ITEM, 'display_item'],
 			[ArrayFilterEvent::RENDER_LOCATION, 'render_location'],
 			[ArrayFilterEvent::ITEM_PHOTO_MENU, 'item_photo_menu'],
+			[ArrayFilterEvent::PAGE_INFO, 'page_info_data'],
 		];
 	}
 
diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php
index 26ff604170..00e47f4b61 100644
--- a/tests/Unit/Event/ArrayFilterEventTest.php
+++ b/tests/Unit/Event/ArrayFilterEventTest.php
@@ -39,6 +39,7 @@ class ArrayFilterEventTest extends TestCase
 			[ArrayFilterEvent::RENDER_LOCATION, 'friendica.data.render_location'],
 			[ArrayFilterEvent::ITEM_PHOTO_MENU, 'friendica.data.item_photo_menu'],
 			[ArrayFilterEvent::OEMBED_FETCH_END, 'friendica.data.oembed_fetch_end'],
+			[ArrayFilterEvent::PAGE_INFO, 'friendica.data.page_info'],
 		];
 	}
 

From a6ab7dd6f15c61927139a9740ccc77bc22c2e1d1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 13:00:21 +0000
Subject: [PATCH 21/35] create event for smilie hook

---
 src/Content/Smilies.php                       | 9 +++++++--
 src/Core/Hooks/HookEventBridge.php            | 2 ++
 src/Event/ArrayFilterEvent.php                | 2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 2 ++
 tests/Unit/Event/ArrayFilterEventTest.php     | 1 +
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index f6b69065d7..bce403a371 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -8,8 +8,8 @@
 namespace Friendica\Content;
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Hook;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Util\Strings;
 
 /**
@@ -133,8 +133,13 @@ class Smilies
 		'<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
 		];
 
+		$eventDispatcher = DI::eventDispatcher();
+
 		$params = ['texts' => $texts, 'icons' => $icons];
-		Hook::callAll('smilie', $params);
+
+		$params = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::SMILEY_LIST, $params),
+		)->getArray();
 
 		return $params;
 	}
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 1479e41d54..ec79484f28 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -54,6 +54,7 @@ final class HookEventBridge
 		ArrayFilterEvent::ITEM_PHOTO_MENU    => 'item_photo_menu',
 		ArrayFilterEvent::OEMBED_FETCH_END   => 'oembed_fetch_url',
 		ArrayFilterEvent::PAGE_INFO          => 'page_info_data',
+		ArrayFilterEvent::SMILEY_LIST        => 'smilie',
 		HtmlFilterEvent::HEAD                => 'head',
 		HtmlFilterEvent::FOOTER              => 'footer',
 		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
@@ -87,6 +88,7 @@ final class HookEventBridge
 			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
 			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
 			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
+			ArrayFilterEvent::SMILEY_LIST        => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 41158c7eb3..d5f9b4e96d 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -46,6 +46,8 @@ final class ArrayFilterEvent extends Event
 
 	public const PAGE_INFO = 'friendica.data.page_info';
 
+	public const SMILEY_LIST = 'friendica.data.smiley_list';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index d6d7801f13..58c9e29853 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -43,6 +43,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
 			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
 			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
+			ArrayFilterEvent::SMILEY_LIST        => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -198,6 +199,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::RENDER_LOCATION, 'render_location'],
 			[ArrayFilterEvent::ITEM_PHOTO_MENU, 'item_photo_menu'],
 			[ArrayFilterEvent::PAGE_INFO, 'page_info_data'],
+			[ArrayFilterEvent::SMILEY_LIST, 'smilie'],
 		];
 	}
 
diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php
index 00e47f4b61..2fa8f78663 100644
--- a/tests/Unit/Event/ArrayFilterEventTest.php
+++ b/tests/Unit/Event/ArrayFilterEventTest.php
@@ -40,6 +40,7 @@ class ArrayFilterEventTest extends TestCase
 			[ArrayFilterEvent::ITEM_PHOTO_MENU, 'friendica.data.item_photo_menu'],
 			[ArrayFilterEvent::OEMBED_FETCH_END, 'friendica.data.oembed_fetch_end'],
 			[ArrayFilterEvent::PAGE_INFO, 'friendica.data.page_info'],
+			[ArrayFilterEvent::SMILEY_LIST, 'friendica.data.smiley_list'],
 		];
 	}
 

From 81b6ed9fc2e7652a83725762dce24c524755b3fe Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 13:02:28 +0000
Subject: [PATCH 22/35] fix code style

---
 src/Content/Smilies.php | 89 +++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index bce403a371..1a058f6375 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -93,44 +93,44 @@ class Smilies
 
 		];
 
-		$baseUrl = (string)DI::baseUrl();
+		$baseUrl = (string) DI::baseUrl();
 
 		$icons = [
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-heart.gif" alt="&lt;3" title="&lt;3" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-brokenheart.gif" alt="&lt;/3" title="&lt;/3" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-brokenheart.gif" alt="&lt;\\3" title="&lt;\\3" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-smile.gif" alt=":-)" title=":-)" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-wink.gif" alt=";-)" title=";-)" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-frown.gif" alt=":-(" title=":-(" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-tongue-out.gif" alt=":-P" title=":-P" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-tongue-out.gif" alt=":-p" title=":-P" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-kiss.gif" alt=":-x" title=":-x" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-kiss.gif" alt=":-X" title=":-X" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-laughing.gif" alt=":-D" title=":-D"  />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-surprised.gif" alt="8-|" title="8-|" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-surprised.gif" alt="8-O" title="8-O" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-surprised.gif" alt=":-O" title="8-O" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-thumbsup.gif" alt="\\o/" title="\\o/" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-Oo.gif" alt="o.O" title="o.O" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-Oo.gif" alt="O.o" title="O.o" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-Oo.gif" alt="o_O" title="o_O" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-Oo.gif" alt="O_o" title="O_o" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-embarrassed.gif" alt=":-[" title=":-[" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/coffee.gif" alt=":coffee" title=":coffee" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/like.gif" alt=":like" title=":like" />',
-		'<img class="smiley" src="' . $baseUrl . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
-		'<a href="https://friendi.ca">~friendica <img class="smiley" width="16" height="16" src="' . $baseUrl . '/images/friendica.svg" alt="~friendica" title="~friendica" /></a>',
-		'<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
-		'<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-heart.gif" alt="&lt;3" title="&lt;3" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-brokenheart.gif" alt="&lt;/3" title="&lt;/3" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-brokenheart.gif" alt="&lt;\\3" title="&lt;\\3" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-smile.gif" alt=":-)" title=":-)" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-wink.gif" alt=";-)" title=";-)" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-frown.gif" alt=":-(" title=":-(" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-tongue-out.gif" alt=":-P" title=":-P" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-tongue-out.gif" alt=":-p" title=":-P" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-kiss.gif" alt=":-x" title=":-x" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-kiss.gif" alt=":-X" title=":-X" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-laughing.gif" alt=":-D" title=":-D"  />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-surprised.gif" alt="8-|" title="8-|" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-surprised.gif" alt="8-O" title="8-O" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-surprised.gif" alt=":-O" title="8-O" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-thumbsup.gif" alt="\\o/" title="\\o/" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-Oo.gif" alt="o.O" title="o.O" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-Oo.gif" alt="O.o" title="O.o" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-Oo.gif" alt="o_O" title="o_O" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-Oo.gif" alt="O_o" title="O_o" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-embarrassed.gif" alt=":-[" title=":-[" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/coffee.gif" alt=":coffee" title=":coffee" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/like.gif" alt=":like" title=":like" />',
+			'<img class="smiley" src="' . $baseUrl . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
+			'<a href="https://friendi.ca">~friendica <img class="smiley" width="16" height="16" src="' . $baseUrl . '/images/friendica.svg" alt="~friendica" title="~friendica" /></a>',
+			'<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
+			'<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
 		];
 
 		$eventDispatcher = DI::eventDispatcher();
@@ -160,12 +160,12 @@ class Smilies
 				if (strpos($text, '[nosmile]') !== false || self::noSmilies()) {
 					return $text;
 				}
-				$smilies = self::getList();
+				$smilies    = self::getList();
 				$normalized = [];
 				return self::performForEachWordMatch(
 					array_combine($smilies['texts'], $smilies['icons']),
 					$text,
-					function (string $name, string $image) use($normalized, &$emojis) {
+					function (string $name, string $image) use ($normalized, &$emojis) {
 						if (array_key_exists($name, $normalized)) {
 							return $normalized[$name];
 						}
@@ -181,9 +181,9 @@ class Smilies
 									$norm = 'smiley' . count($normalized);
 								}
 							}
-							$shortcode = ':' . $norm . ':';
+							$shortcode         = ':' . $norm . ':';
 							$normalized[$name] = $shortcode;
-							$emojis[$norm] = $url;
+							$emojis[$norm]     = $url;
 							return $shortcode;
 						} else {
 							$normalized[$name] = $image;
@@ -210,7 +210,7 @@ class Smilies
 	{
 		$ord1_bitset = 0;
 		$ord2_bitset = 0;
-		$prefixes = [];
+		$prefixes    = [];
 		foreach ($words as $word => $_) {
 			if (strlen($word) < 2) {
 				continue;
@@ -230,7 +230,7 @@ class Smilies
 		}
 
 		$slength = strlen($subject);
-		$result = '';
+		$result  = '';
 		// $processed is used to delay string concatenation since appending a char every loop is inefficient.
 		$processed = 0;
 		// Find possible starting points for smilies.
@@ -316,7 +316,8 @@ class Smilies
 		return $s;
 	}
 
-	private static function noSmilies(): bool {
+	private static function noSmilies(): bool
+	{
 		return (intval(DI::config()->get('system', 'no_smilies')) ||
 				(DI::userSession()->getLocalUserId() &&
 				 intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_smilies'))));
@@ -344,7 +345,7 @@ class Smilies
 
 		if ($no_images) {
 			$cleaned = ['texts' => [], 'icons' => []];
-			$icons = $smilies['icons'];
+			$icons   = $smilies['icons'];
 			foreach ($icons as $key => $icon) {
 				if (!strstr($icon, '<img ')) {
 					$cleaned['texts'][] = $smilies['texts'][$key];

From 62d27de3b0816d0cb16ab38d545a0e468f62aba7 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 15:03:29 +0000
Subject: [PATCH 23/35] Create events for bbcode hooks

---
 src/Content/Text/BBCode.php                   | 23 ++++++++--
 src/Core/Hooks/HookEventBridge.php            | 32 +++++++++++++
 src/Event/ArrayFilterEvent.php                |  4 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 46 +++++++++++++++++++
 tests/Unit/Event/ArrayFilterEventTest.php     |  2 +
 5 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 2102b43a32..d111437dff 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -15,10 +15,10 @@ use Friendica\Content\Item;
 use Friendica\Content\OEmbed;
 use Friendica\Content\PageInfo;
 use Friendica\Content\Smilies;
-use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Event;
 use Friendica\Model\Post;
@@ -1297,7 +1297,15 @@ class BBCode
 
 		DI::profiler()->startRecording('rendering');
 
-		Hook::callAll('bbcode', $text);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$text_data = ['bbcode2html' => $text];
+
+		$text_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::BBCODE_TO_HTML_START, $text_data),
+		)->getArray();
+
+		$text = $text_data['bbcode2html'] ?? $text;
 
 		$ev = Event::fromBBCode($text);
 
@@ -2375,9 +2383,18 @@ class BBCode
 			);
 		}
 
-		Hook::callAll('bb2diaspora', $text);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$text_data = ['bbcode2markdown' => $text];
+
+		$text_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::BBCODE_TO_MARKDOWN_END, $text_data),
+		)->getArray();
+
+		$text = $text_data['bbcode2markdown'] ?? $text;
 
 		DI::profiler()->stopRecording();
+
 		return $text;
 	}
 
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index ec79484f28..6daa53a54d 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -55,6 +55,8 @@ final class HookEventBridge
 		ArrayFilterEvent::OEMBED_FETCH_END   => 'oembed_fetch_url',
 		ArrayFilterEvent::PAGE_INFO          => 'page_info_data',
 		ArrayFilterEvent::SMILEY_LIST        => 'smilie',
+		ArrayFilterEvent::BBCODE_TO_HTML_START => 'bbcode',
+		ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'bb2diaspora',
 		HtmlFilterEvent::HEAD                => 'head',
 		HtmlFilterEvent::FOOTER              => 'footer',
 		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
@@ -89,6 +91,8 @@ final class HookEventBridge
 			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
 			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
 			ArrayFilterEvent::SMILEY_LIST        => 'onArrayFilterEvent',
+			ArrayFilterEvent::BBCODE_TO_HTML_START => 'onBbcodeToHtmlEvent',
+			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -129,6 +133,34 @@ final class HookEventBridge
 		$event->setArray($data);
 	}
 
+	/**
+	 * Map the BBCODE_TO_HTML_START event to `bbcode` hook
+	 */
+	public static function onBbcodeToHtmlEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$bbcode2html = (string) $data['bbcode2html'] ?? '';
+
+		$data['bbcode2html'] = static::callHook($event->getName(), $bbcode2html);
+
+		$event->setArray($data);
+	}
+
+	/**
+	 * Map the BBCODE_TO_MARKDOWN_END event to `bb2diaspora` hook
+	 */
+	public static function onBbcodeToMarkdownEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$bbcode2markdown = (string) $data['bbcode2markdown'] ?? '';
+
+		$data['bbcode2markdown'] = static::callHook($event->getName(), $bbcode2markdown);
+
+		$event->setArray($data);
+	}
+
 	public static function onArrayFilterEvent(ArrayFilterEvent $event): void
 	{
 		$event->setArray(
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index d5f9b4e96d..2541940802 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -48,6 +48,10 @@ final class ArrayFilterEvent extends Event
 
 	public const SMILEY_LIST = 'friendica.data.smiley_list';
 
+	public const BBCODE_TO_HTML_START = 'friendica.data.bbcode_to_html_start';
+
+	public const BBCODE_TO_MARKDOWN_END = 'friendica.data.bbcode_to_markdown_end';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 58c9e29853..11f178451b 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -44,6 +44,8 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
 			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
 			ArrayFilterEvent::SMILEY_LIST        => 'onArrayFilterEvent',
+			ArrayFilterEvent::BBCODE_TO_HTML_START => 'onBbcodeToHtmlEvent',
+			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
 			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
@@ -181,6 +183,50 @@ class HookEventBridgeTest extends TestCase
 		);
 	}
 
+	public function testOnBbcodeToHtmlEventCallsHookWithCorrectValue(): void
+	{
+		$event = new ArrayFilterEvent(ArrayFilterEvent::BBCODE_TO_HTML_START, ['bbcode2html' => '[b]original[/b]']);
+
+		$reflectionProperty = new \ReflectionProperty(HookEventBridge::class, 'mockedCallHook');
+		$reflectionProperty->setAccessible(true);
+
+		$reflectionProperty->setValue(null, function (string $name, string $data): string {
+			$this->assertSame('bbcode', $name);
+			$this->assertSame('[b]original[/b]', $data);
+
+			return '<b>changed</b>';
+		});
+
+		HookEventBridge::onBbcodeToHtmlEvent($event);
+
+		$this->assertSame(
+			['bbcode2html' => '<b>changed</b>'],
+			$event->getArray(),
+		);
+	}
+
+	public function testOnBbcodeToMarkdownEventCallsHookWithCorrectValue(): void
+	{
+		$event = new ArrayFilterEvent(ArrayFilterEvent::BBCODE_TO_MARKDOWN_END, ['bbcode2markdown' => '[b]original[/b]']);
+
+		$reflectionProperty = new \ReflectionProperty(HookEventBridge::class, 'mockedCallHook');
+		$reflectionProperty->setAccessible(true);
+
+		$reflectionProperty->setValue(null, function (string $name, string $data): string {
+			$this->assertSame('bb2diaspora', $name);
+			$this->assertSame('[b]original[/b]', $data);
+
+			return '**changed**';
+		});
+
+		HookEventBridge::onBbcodeToMarkdownEvent($event);
+
+		$this->assertSame(
+			['bbcode2markdown' => '**changed**'],
+			$event->getArray(),
+		);
+	}
+
 	public static function getArrayFilterEventData(): array
 	{
 		return [
diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php
index 2fa8f78663..643f309a8b 100644
--- a/tests/Unit/Event/ArrayFilterEventTest.php
+++ b/tests/Unit/Event/ArrayFilterEventTest.php
@@ -41,6 +41,8 @@ class ArrayFilterEventTest extends TestCase
 			[ArrayFilterEvent::OEMBED_FETCH_END, 'friendica.data.oembed_fetch_end'],
 			[ArrayFilterEvent::PAGE_INFO, 'friendica.data.page_info'],
 			[ArrayFilterEvent::SMILEY_LIST, 'friendica.data.smiley_list'],
+			[ArrayFilterEvent::BBCODE_TO_HTML_START, 'friendica.data.bbcode_to_html_start'],
+			[ArrayFilterEvent::BBCODE_TO_MARKDOWN_END, 'friendica.data.bbcode_to_markdown_end'],
 		];
 	}
 

From d5f5ebbd8a6d31ae6c5b82d2ed941e6dc59c7efb Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Feb 2025 15:05:12 +0000
Subject: [PATCH 24/35] fix code style

---
 src/Core/Hooks/HookEventBridge.php            | 108 +++++++++---------
 tests/Unit/Core/Hooks/HookEventBridgeTest.php |  54 ++++-----
 2 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 6daa53a54d..9b3265130e 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -35,34 +35,34 @@ final class HookEventBridge
 	 * This maps the new event names to the legacy Hook names.
 	 */
 	private static array $eventMapper = [
-		Event::INIT                          => 'init_1',
-		Event::HOME_INIT                     => 'home_init',
-		ConfigLoadedEvent::CONFIG_LOADED     => 'load_config',
-		CollectRoutesEvent::COLLECT_ROUTES   => 'route_collection',
-		ArrayFilterEvent::APP_MENU           => 'app_menu',
-		ArrayFilterEvent::NAV_INFO           => 'nav_info',
-		ArrayFilterEvent::FEATURE_ENABLED    => 'isEnabled',
-		ArrayFilterEvent::FEATURE_GET        => 'get',
-		ArrayFilterEvent::POST_LOCAL_START   => 'post_local_start',
-		ArrayFilterEvent::POST_LOCAL         => 'post_local',
-		ArrayFilterEvent::POST_LOCAL_END     => 'post_local_end',
-		ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'photo_upload_form',
-		ArrayFilterEvent::NETWORK_TO_NAME    => 'network_to_name',
-		ArrayFilterEvent::CONVERSATION_START => 'conversation_start',
-		ArrayFilterEvent::DISPLAY_ITEM       => 'display_item',
-		ArrayFilterEvent::RENDER_LOCATION    => 'render_location',
-		ArrayFilterEvent::ITEM_PHOTO_MENU    => 'item_photo_menu',
-		ArrayFilterEvent::OEMBED_FETCH_END   => 'oembed_fetch_url',
-		ArrayFilterEvent::PAGE_INFO          => 'page_info_data',
-		ArrayFilterEvent::SMILEY_LIST        => 'smilie',
-		ArrayFilterEvent::BBCODE_TO_HTML_START => 'bbcode',
+		Event::INIT                              => 'init_1',
+		Event::HOME_INIT                         => 'home_init',
+		ConfigLoadedEvent::CONFIG_LOADED         => 'load_config',
+		CollectRoutesEvent::COLLECT_ROUTES       => 'route_collection',
+		ArrayFilterEvent::APP_MENU               => 'app_menu',
+		ArrayFilterEvent::NAV_INFO               => 'nav_info',
+		ArrayFilterEvent::FEATURE_ENABLED        => 'isEnabled',
+		ArrayFilterEvent::FEATURE_GET            => 'get',
+		ArrayFilterEvent::POST_LOCAL_START       => 'post_local_start',
+		ArrayFilterEvent::POST_LOCAL             => 'post_local',
+		ArrayFilterEvent::POST_LOCAL_END         => 'post_local_end',
+		ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'photo_upload_form',
+		ArrayFilterEvent::NETWORK_TO_NAME        => 'network_to_name',
+		ArrayFilterEvent::CONVERSATION_START     => 'conversation_start',
+		ArrayFilterEvent::DISPLAY_ITEM           => 'display_item',
+		ArrayFilterEvent::RENDER_LOCATION        => 'render_location',
+		ArrayFilterEvent::ITEM_PHOTO_MENU        => 'item_photo_menu',
+		ArrayFilterEvent::OEMBED_FETCH_END       => 'oembed_fetch_url',
+		ArrayFilterEvent::PAGE_INFO              => 'page_info_data',
+		ArrayFilterEvent::SMILEY_LIST            => 'smilie',
+		ArrayFilterEvent::BBCODE_TO_HTML_START   => 'bbcode',
 		ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'bb2diaspora',
-		HtmlFilterEvent::HEAD                => 'head',
-		HtmlFilterEvent::FOOTER              => 'footer',
-		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
-		HtmlFilterEvent::PAGE_CONTENT_TOP    => 'page_content_top',
-		HtmlFilterEvent::PAGE_END            => 'page_end',
-		HtmlFilterEvent::JOT_TOOL            => 'jot_tool',
+		HtmlFilterEvent::HEAD                    => 'head',
+		HtmlFilterEvent::FOOTER                  => 'footer',
+		HtmlFilterEvent::PAGE_HEADER             => 'page_header',
+		HtmlFilterEvent::PAGE_CONTENT_TOP        => 'page_content_top',
+		HtmlFilterEvent::PAGE_END                => 'page_end',
+		HtmlFilterEvent::JOT_TOOL                => 'jot_tool',
 	];
 
 	/**
@@ -71,34 +71,34 @@ final class HookEventBridge
 	public static function getStaticSubscribedEvents(): array
 	{
 		return [
-			Event::INIT                          => 'onNamedEvent',
-			Event::HOME_INIT                     => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED     => 'onConfigLoadedEvent',
-			CollectRoutesEvent::COLLECT_ROUTES   => 'onCollectRoutesEvent',
-			ArrayFilterEvent::APP_MENU           => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO           => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED    => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET        => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START   => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL         => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END     => 'onArrayFilterEvent',
-			ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'onArrayFilterEvent',
-			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
-			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
-			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
-			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
-			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
-			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
-			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
-			ArrayFilterEvent::SMILEY_LIST        => 'onArrayFilterEvent',
-			ArrayFilterEvent::BBCODE_TO_HTML_START => 'onBbcodeToHtmlEvent',
+			Event::INIT                              => 'onNamedEvent',
+			Event::HOME_INIT                         => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED         => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES       => 'onCollectRoutesEvent',
+			ArrayFilterEvent::APP_MENU               => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO               => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED        => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET            => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START       => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL             => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END         => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME        => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONVERSATION_START     => 'onArrayFilterEvent',
+			ArrayFilterEvent::DISPLAY_ITEM           => 'onArrayFilterEvent',
+			ArrayFilterEvent::RENDER_LOCATION        => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_PHOTO_MENU        => 'onArrayFilterEvent',
+			ArrayFilterEvent::OEMBED_FETCH_END       => 'onOembedFetchEndEvent',
+			ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
+			ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
+			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
-			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP    => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END            => 'onHtmlFilterEvent',
-			HtmlFilterEvent::JOT_TOOL            => 'onHtmlFilterEvent',
+			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
 		];
 	}
 
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 11f178451b..9e76cebcf2 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -24,34 +24,34 @@ class HookEventBridgeTest extends TestCase
 	public function testGetStaticSubscribedEventsReturnsStaticMethods(): void
 	{
 		$expected = [
-			Event::INIT                          => 'onNamedEvent',
-			Event::HOME_INIT                     => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED     => 'onConfigLoadedEvent',
-			CollectRoutesEvent::COLLECT_ROUTES   => 'onCollectRoutesEvent',
-			ArrayFilterEvent::APP_MENU           => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO           => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED    => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET        => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START   => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL         => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END     => 'onArrayFilterEvent',
-			ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'onArrayFilterEvent',
-			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
-			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
-			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
-			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
-			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
-			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
-			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
-			ArrayFilterEvent::SMILEY_LIST        => 'onArrayFilterEvent',
-			ArrayFilterEvent::BBCODE_TO_HTML_START => 'onBbcodeToHtmlEvent',
+			Event::INIT                              => 'onNamedEvent',
+			Event::HOME_INIT                         => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED         => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES       => 'onCollectRoutesEvent',
+			ArrayFilterEvent::APP_MENU               => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO               => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED        => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET            => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START       => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL             => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END         => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME        => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONVERSATION_START     => 'onArrayFilterEvent',
+			ArrayFilterEvent::DISPLAY_ITEM           => 'onArrayFilterEvent',
+			ArrayFilterEvent::RENDER_LOCATION        => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_PHOTO_MENU        => 'onArrayFilterEvent',
+			ArrayFilterEvent::OEMBED_FETCH_END       => 'onOembedFetchEndEvent',
+			ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
+			ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
+			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
-			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP    => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END            => 'onHtmlFilterEvent',
-			HtmlFilterEvent::JOT_TOOL            => 'onHtmlFilterEvent',
+			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
 		];
 
 		$this->assertSame(

From 94b47ae4d1568eddd5c1d4b9aa72b9cef75d6965 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 17 Feb 2025 09:45:04 +0000
Subject: [PATCH 25/35] Fix smilies tests

---
 tests/src/Content/SmiliesTest.php | 33 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/tests/src/Content/SmiliesTest.php b/tests/src/Content/SmiliesTest.php
index 441176fd73..2882eeb8d5 100644
--- a/tests/src/Content/SmiliesTest.php
+++ b/tests/src/Content/SmiliesTest.php
@@ -9,6 +9,7 @@ namespace Friendica\Test\src\Content;
 
 use Friendica\Content\Smilies;
 use Friendica\Core\Hook;
+use Friendica\Core\Hooks\HookEventBridge;
 use Friendica\DI;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Test\FixtureTestCase;
@@ -21,11 +22,18 @@ class SmiliesTest extends FixtureTestCase
 
 		DI::config()->set('system', 'no_smilies', false);
 
+		/** @var \Friendica\Event\EventDispatcher */
+		$eventDispatcher = DI::eventDispatcher();
+
+		foreach (HookEventBridge::getStaticSubscribedEvents() as $eventName => $methodName) {
+			$eventDispatcher->addListener($eventName, [HookEventBridge::class, $methodName]);
+		}
+
 		Hook::register('smilie', 'tests/Util/SmileyWhitespaceAddon.php', 'add_test_unicode_smilies');
 		Hook::loadHooks();
 	}
 
-	public function dataLinks()
+	public function dataLinks(): array
 	{
 		return [
 			/** @see https://github.com/friendica/friendica/pull/6933 */
@@ -53,7 +61,7 @@ class SmiliesTest extends FixtureTestCase
 	 *
 	 * @throws InternalServerErrorException
 	 */
-	public function testReplaceFromArray(string $text, array $smilies, string $expected)
+	public function testReplaceFromArray(string $text, array $smilies, string $expected): void
 	{
 		$output = Smilies::replaceFromArray($text, $smilies);
 		self::assertEquals($expected, $output);
@@ -120,17 +128,12 @@ class SmiliesTest extends FixtureTestCase
 
 	/**
 	 * @dataProvider dataIsEmojiPost
-	 *
-	 * @param bool   $expected
-	 * @param string $body
-	 * @return void
 	 */
-	public function testIsEmojiPost(bool $expected, string $body)
+	public function testIsEmojiPost(bool $expected, string $body): void
 	{
 		$this->assertEquals($expected, Smilies::isEmojiPost($body));
 	}
 
-
 	public function dataReplace(): array
 	{
 		$data = [
@@ -138,7 +141,7 @@ class SmiliesTest extends FixtureTestCase
 				'expected' => 'alt=":-p"',
 				'body' => ':-p',
 			],
-			'simple-1' => [
+			'simple-2' => [
 				'expected' => 'alt=":-p"',
 				'body' => ' :-p ',
 			],
@@ -191,6 +194,7 @@ class SmiliesTest extends FixtureTestCase
 				'body' => '⽕ :face with hand over mouth: invalid:hugging face: :hugging face:',
 			],
 		];
+
 		foreach ([':-[', ':-D', 'o.O'] as $emoji) {
 			foreach (['A', '_', ':', '-'] as $prefix) {
 				foreach (['', ' ', 'A', ':', '-'] as $suffix) {
@@ -208,11 +212,8 @@ class SmiliesTest extends FixtureTestCase
 
 	/**
 	 * @dataProvider dataReplace
-	 *
-	 * @param string $expected
-	 * @param string $body
 	 */
-	public function testReplace(string $expected, string $body)
+	public function testReplace(string $expected, string $body): void
 	{
 		$result = Smilies::replace($body);
 		$this->assertStringContainsString($expected, $result);
@@ -281,12 +282,8 @@ class SmiliesTest extends FixtureTestCase
 
 	/**
 	 * @dataProvider dataExtractUsedSmilies
-	 *
-	 * @param array  $expected
-	 * @param string $body
-	 * @param stirng $normalized
 	 */
-	public function testExtractUsedSmilies(array $expected, string $body, string $normalized)
+	public function testExtractUsedSmilies(array $expected, string $body, string $normalized): void
 	{
 		$extracted = Smilies::extractUsedSmilies($body, $converted);
 		$expected = array_fill_keys($expected, true);

From efd3cb30d15a688935d2ba2deeb2ed3cd81db01b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 17 Feb 2025 09:49:16 +0000
Subject: [PATCH 26/35] Fix Mastodon Status tests

---
 tests/src/Factory/Api/Mastodon/StatusTest.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/src/Factory/Api/Mastodon/StatusTest.php b/tests/src/Factory/Api/Mastodon/StatusTest.php
index 314195bb5a..030c1605d4 100644
--- a/tests/src/Factory/Api/Mastodon/StatusTest.php
+++ b/tests/src/Factory/Api/Mastodon/StatusTest.php
@@ -8,6 +8,7 @@
 namespace Friendica\Test\src\Factory\Api\Mastodon;
 
 use Friendica\Core\Hook;
+use Friendica\Core\Hooks\HookEventBridge;
 use Friendica\DI;
 use Friendica\Model\Post;
 use Friendica\Test\FixtureTestCase;
@@ -21,13 +22,21 @@ class StatusTest extends FixtureTestCase
 		parent::setUp();
 
 		DI::config()->set('system', 'no_smilies', false);
+
 		$this->status = DI::mstdnStatus();
 
+		/** @var \Friendica\Event\EventDispatcher */
+		$eventDispatcher = DI::eventDispatcher();
+
+		foreach (HookEventBridge::getStaticSubscribedEvents() as $eventName => $methodName) {
+			$eventDispatcher->addListener($eventName, [HookEventBridge::class, $methodName]);
+		}
+
 		Hook::register('smilie', 'tests/Util/SmileyWhitespaceAddon.php', 'add_test_unicode_smilies');
 		Hook::loadHooks();
 	}
 
-	public function testSimpleStatus()
+	public function testSimpleStatus(): void
 	{
 		$post = Post::selectFirst([], ['id' => 13]);
 		$this->assertNotNull($post);
@@ -35,7 +44,7 @@ class StatusTest extends FixtureTestCase
 		$this->assertNotNull($result);
 	}
 
-	public function testSimpleEmojiStatus()
+	public function testSimpleEmojiStatus(): void
 	{
 		$post = Post::selectFirst([], ['id' => 14]);
 		$this->assertNotNull($post);

From 4f3349f6db169af379dd10afb9e6e6d564cb5c46 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 17 Feb 2025 09:54:33 +0000
Subject: [PATCH 27/35] Fix Transmitter test

---
 tests/src/Protocol/ActivityPub/TransmitterTest.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/src/Protocol/ActivityPub/TransmitterTest.php b/tests/src/Protocol/ActivityPub/TransmitterTest.php
index 8b71aa130b..f9ef18a1a5 100644
--- a/tests/src/Protocol/ActivityPub/TransmitterTest.php
+++ b/tests/src/Protocol/ActivityPub/TransmitterTest.php
@@ -8,6 +8,7 @@
 namespace Friendica\Test\src\Protocol\ActivityPub;
 
 use Friendica\Core\Hook;
+use Friendica\Core\Hooks\HookEventBridge;
 use Friendica\DI;
 use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub\Transmitter;
@@ -21,11 +22,18 @@ class TransmitterTest extends FixtureTestCase
 
 		DI::config()->set('system', 'no_smilies', false);
 
+		/** @var \Friendica\Event\EventDispatcher */
+		$eventDispatcher = DI::eventDispatcher();
+
+		foreach (HookEventBridge::getStaticSubscribedEvents() as $eventName => $methodName) {
+			$eventDispatcher->addListener($eventName, [HookEventBridge::class, $methodName]);
+		}
+
 		Hook::register('smilie', 'tests/Util/SmileyWhitespaceAddon.php', 'add_test_unicode_smilies');
 		Hook::loadHooks();
 	}
 
-	public function testEmojiPost()
+	public function testEmojiPost(): void
 	{
 		$post = Post::selectFirst([], ['id' => 14]);
 		$this->assertNotNull($post);

From a94bead5f6c17faae9b94dfca947e846253275db Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 17 Feb 2025 10:01:25 +0000
Subject: [PATCH 28/35] Fix code style

---
 tests/src/Content/SmiliesTest.php | 114 +++++++++++++++---------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/tests/src/Content/SmiliesTest.php b/tests/src/Content/SmiliesTest.php
index 2882eeb8d5..69236efe2d 100644
--- a/tests/src/Content/SmiliesTest.php
+++ b/tests/src/Content/SmiliesTest.php
@@ -38,13 +38,13 @@ class SmiliesTest extends FixtureTestCase
 		return [
 			/** @see https://github.com/friendica/friendica/pull/6933 */
 			'bug-6933-1' => [
-				'data' => '<code>/</code>',
-				'smilies' => ['texts' => [], 'icons' => []],
+				'data'     => '<code>/</code>',
+				'smilies'  => ['texts' => [], 'icons' => []],
 				'expected' => '<code>/</code>',
 			],
 			'bug-6933-2' => [
-				'data' => '<code>code</code>',
-				'smilies' => ['texts' => [], 'icons' => []],
+				'data'     => '<code>code</code>',
+				'smilies'  => ['texts' => [], 'icons' => []],
 				'expected' => '<code>code</code>',
 			],
 		];
@@ -72,56 +72,56 @@ class SmiliesTest extends FixtureTestCase
 		return [
 			'emoji' => [
 				'expected' => true,
-				'body' => '👀',
+				'body'     => '👀',
 			],
 			'emojis' => [
 				'expected' => true,
-				'body' => '👀🤷',
+				'body'     => '👀🤷',
 			],
 			'emoji+whitespace' => [
 				'expected' => true,
-				'body' => ' 👀 ',
+				'body'     => ' 👀 ',
 			],
 			'empty' => [
 				'expected' => false,
-				'body' => '',
+				'body'     => '',
 			],
 			'whitespace' => [
 				'expected' => false,
-				'body' => '
+				'body'     => '
 				',
 			],
 			'emoji+ASCII' => [
 				'expected' => false,
-				'body' => '🤷a',
+				'body'     => '🤷a',
 			],
 			'HTML entity whitespace' => [
 				'expected' => false,
-				'body' => '&nbsp;',
+				'body'     => '&nbsp;',
 			],
 			'HTML entity else' => [
 				'expected' => false,
-				'body' => '&deg;',
+				'body'     => '&deg;',
 			],
 			'emojis+HTML whitespace' => [
 				'expected' => true,
-				'body' => '👀&nbsp;🤷',
+				'body'     => '👀&nbsp;🤷',
 			],
 			'emojis+HTML else' => [
 				'expected' => false,
-				'body' => '👀&lt;🤷',
+				'body'     => '👀&lt;🤷',
 			],
 			'zwj' => [
 				'expected' => true,
-				'body' => '👨‍👨‍👧‍',
+				'body'     => '👨‍👨‍👧‍',
 			],
 			'zwj+whitespace' => [
 				'expected' => true,
-				'body' => ' 👨‍👨‍👧‍ ',
+				'body'     => ' 👨‍👨‍👧‍ ',
 			],
 			'zwj+HTML whitespace' => [
 				'expected' => true,
-				'body' => '&nbsp;👨‍👨‍👧‍&nbsp;',
+				'body'     => '&nbsp;👨‍👨‍👧‍&nbsp;',
 			],
 		];
 	}
@@ -139,59 +139,59 @@ class SmiliesTest extends FixtureTestCase
 		$data = [
 			'simple-1' => [
 				'expected' => 'alt=":-p"',
-				'body' => ':-p',
+				'body'     => ':-p',
 			],
 			'simple-2' => [
 				'expected' => 'alt=":-p"',
-				'body' => ' :-p ',
+				'body'     => ' :-p ',
 			],
 			'word-boundary-1' => [
 				'expected' => ':-pppp',
-				'body' => ':-pppp',
+				'body'     => ':-pppp',
 			],
 			'word-boundary-2' => [
 				'expected' => '~friendicaca',
-				'body' => '~friendicaca',
+				'body'     => '~friendicaca',
 			],
 			'symbol-boundary-1' => [
 				'expected' => 'alt=":-p"',
-				'body' => '(:-p)',
+				'body'     => '(:-p)',
 			],
 			'hearts-1' => [
 				'expected' => '❤ (❤) ❤',
-				'body' => '&lt;3 (&lt;3) &lt;3',
+				'body'     => '&lt;3 (&lt;3) &lt;3',
 			],
 			'hearts-8' => [
 				'expected' => '(❤❤❤❤❤❤❤❤)',
-				'body' => '(&lt;33333333)',
+				'body'     => '(&lt;33333333)',
 			],
 			'no-hearts-1' => [
 				'expected' => '(&lt;30)',
-				'body' => '(&lt;30)',
+				'body'     => '(&lt;30)',
 			],
 			'no-hearts-2' => [
 				'expected' => '(3&lt;33)',
-				'body' => '(3&lt;33)',
+				'body'     => '(3&lt;33)',
 			],
 			'space' => [
 				'expected' => 'alt="smiley-heart"',
-				'body' => ':smiley heart 333:',
+				'body'     => ':smiley heart 333:',
 			],
 			'substitution-1' => [
 				'expected' => '&#x1F525;',
-				'body' => '⽕',
+				'body'     => '⽕',
 			],
 			'substitution-2' => [
 				'expected' => '&#x1F917;',
-				'body' => ':hugging face:',
+				'body'     => ':hugging face:',
 			],
 			'substitution-3' => [
 				'expected' => '&#x1F92D;',
-				'body' => ':face with hand over mouth:',
+				'body'     => ':face with hand over mouth:',
 			],
 			'mixed' => [
 				'expected' => '&#x1F525; &#x1F92D; invalid:hugging face: &#x1F917;',
-				'body' => '⽕ :face with hand over mouth: invalid:hugging face: :hugging face:',
+				'body'     => '⽕ :face with hand over mouth: invalid:hugging face: :hugging face:',
 			],
 		];
 
@@ -199,10 +199,10 @@ class SmiliesTest extends FixtureTestCase
 			foreach (['A', '_', ':', '-'] as $prefix) {
 				foreach (['', ' ', 'A', ':', '-'] as $suffix) {
 					$no_smile = ($prefix !== '' && ctype_alnum($prefix)) || ($suffix !== '' && ctype_alnum($suffix));
-					$s = $prefix . $emoji . $suffix;
-					$data[] = [
+					$s        = $prefix . $emoji . $suffix;
+					$data[]   = [
 						'expected' => $no_smile ? $s : 'alt="' . $emoji . '"',
-						'body' => $s,
+						'body'     => $s,
 					];
 				}
 			}
@@ -223,58 +223,58 @@ class SmiliesTest extends FixtureTestCase
 	{
 		return [
 			'symbols' => [
-				'expected' => ['p', 'heart', 'embarrassed', 'kiss'],
-				'body' => ':-p &lt;3 ":-[:-"',
+				'expected'   => ['p', 'heart', 'embarrassed', 'kiss'],
+				'body'       => ':-p &lt;3 ":-[:-"',
 				'normalized' => ':p: :heart: ":embarrassed::kiss:',
 			],
 			'single-smiley' => [
-				'expected' => ['like'],
-				'body' => ':like',
+				'expected'   => ['like'],
+				'body'       => ':like',
 				'normalized' => ':like:',
 			],
 			'multiple-smilies' => [
-				'expected' => ['like', 'dislike'],
-				'body' => ':like :dislike',
+				'expected'   => ['like', 'dislike'],
+				'body'       => ':like :dislike',
 				'normalized' => ':like: :dislike:',
 			],
 			'nosmile' => [
-				'expected' => [],
-				'body' => '[nosmile] :like :like',
+				'expected'   => [],
+				'body'       => '[nosmile] :like :like',
 				'normalized' => '[nosmile] :like :like'
 			],
 			'in-code' => [
-				'expected' => [],
-				'body' => '[code]:like :like :like[/code]',
+				'expected'   => [],
+				'body'       => '[code]:like :like :like[/code]',
 				'normalized' => '[code]:like :like :like[/code]'
 			],
 			'~friendica' => [
-				'expected' => ['friendica'],
-				'body' => '~friendica',
+				'expected'   => ['friendica'],
+				'body'       => '~friendica',
 				'normalized' => ':friendica:'
 			],
 			'space' => [
-				'expected' => ['smileyheart333'],
-				'body' => ':smiley heart 333:',
+				'expected'   => ['smileyheart333'],
+				'body'       => ':smiley heart 333:',
 				'normalized' => ':smileyheart333:'
 			],
 			'substitution-1' => [
-				'expected' => [],
-				'body' => '⽕',
+				'expected'   => [],
+				'body'       => '⽕',
 				'normalized' => '&#x1F525;',
 			],
 			'substitution-2' => [
-				'expected' => [],
-				'body' => ':hugging face:',
+				'expected'   => [],
+				'body'       => ':hugging face:',
 				'normalized' => '&#x1F917;',
 			],
 			'substitution-3' => [
-				'expected' => [],
-				'body' => ':face with hand over mouth:',
+				'expected'   => [],
+				'body'       => ':face with hand over mouth:',
 				'normalized' => '&#x1F92D;',
 			],
 			'mixed' => [
-				'expected' => [],
-				'body' => '⽕ :face with hand over mouth: invalid:hugging face: :hugging face:',
+				'expected'   => [],
+				'body'       => '⽕ :face with hand over mouth: invalid:hugging face: :hugging face:',
 				'normalized' => '&#x1F525; &#x1F92D; invalid:hugging face: &#x1F917;',
 			],
 		];
@@ -286,7 +286,7 @@ class SmiliesTest extends FixtureTestCase
 	public function testExtractUsedSmilies(array $expected, string $body, string $normalized): void
 	{
 		$extracted = Smilies::extractUsedSmilies($body, $converted);
-		$expected = array_fill_keys($expected, true);
+		$expected  = array_fill_keys($expected, true);
 		$this->assertEquals($normalized, $converted);
 		foreach (array_keys($extracted) as $shortcode) {
 			$this->assertArrayHasKey($shortcode, $expected);

From 3d3e34865bbc911a76b46683600326ae951a2de9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 17 Feb 2025 10:55:05 +0000
Subject: [PATCH 29/35] Create event for html2bbcode hook

---
 src/Content/OEmbed.php                        |  4 +++-
 src/Content/Text/HTML.php                     | 14 ++++++++---
 src/Core/Hooks/HookEventBridge.php            | 16 +++++++++++++
 src/Event/ArrayFilterEvent.php                |  2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 23 +++++++++++++++++++
 5 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 9383363012..a42b837882 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -282,11 +282,13 @@ class OEmbed
 				}
 			}
 		} elseif (!strpos($oembed->html, $oembed->embed_url)) {
-			// add <a> for html2bbcode conversion
+			// add <a> for html to bbcode conversion
 			$ret .= '<a href="' . $oembed->embed_url . '" rel="oembed">' . $oembed->title . '</a>';
 		}
 
 		$ret .= '</div>';
+
+		// FIXME: Why is $test unused?
 		$test = Proxy::proxifyHtml($ret, $uriid);
 
 		return str_replace("\n", "", $ret);
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index ba992e4a8f..dcec024cf0 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -10,10 +10,10 @@ namespace Friendica\Content\Text;
 use DOMDocument;
 use DOMXPath;
 use Friendica\Protocol\HTTP\MediaType;
-use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -141,7 +141,9 @@ class HTML
 		DI::profiler()->startRecording('rendering');
 		$message = str_replace("\r", "", $message);
 
-		$message = Strings::performWithEscapedBlocks($message, '#<pre><code.*</code></pre>#iUs', function ($message) {
+		$eventDispatcher = DI::eventDispatcher();
+
+		$message = Strings::performWithEscapedBlocks($message, '#<pre><code.*</code></pre>#iUs', function ($message) use($eventDispatcher) {
 			$message = str_replace(
 				[
 					"<li><p>",
@@ -314,7 +316,13 @@ class HTML
 			$message = preg_replace('=\r *\r=i', "\n", $message);
 			$message = str_replace("\r", "\n", $message);
 
-			Hook::callAll('html2bbcode', $message);
+			$message_data = ['html2bbcode' => $message];
+
+			$message_data = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::HTML_TO_BBCODE_END, $message_data),
+			)->getArray();
+
+			$message = $message_data['html2bbcode'] ?? $message;
 
 			$message = strip_tags($message);
 
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 9b3265130e..bc0615f368 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -56,6 +56,7 @@ final class HookEventBridge
 		ArrayFilterEvent::PAGE_INFO              => 'page_info_data',
 		ArrayFilterEvent::SMILEY_LIST            => 'smilie',
 		ArrayFilterEvent::BBCODE_TO_HTML_START   => 'bbcode',
+		ArrayFilterEvent::HTML_TO_BBCODE_END     => 'html2bbcode',
 		ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'bb2diaspora',
 		HtmlFilterEvent::HEAD                    => 'head',
 		HtmlFilterEvent::FOOTER                  => 'footer',
@@ -92,6 +93,7 @@ final class HookEventBridge
 			ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
 			ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
 			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
+			ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
 			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
@@ -147,6 +149,20 @@ final class HookEventBridge
 		$event->setArray($data);
 	}
 
+	/**
+	 * Map the HTML_TO_BBCODE_END event to `html2bbcode` hook
+	 */
+	public static function onHtmlToBbcodeEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$html2bbcode = (string) $data['html2bbcode'] ?? '';
+
+		$data['html2bbcode'] = static::callHook($event->getName(), $html2bbcode);
+
+		$event->setArray($data);
+	}
+
 	/**
 	 * Map the BBCODE_TO_MARKDOWN_END event to `bb2diaspora` hook
 	 */
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 2541940802..94cc07e874 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -50,6 +50,8 @@ final class ArrayFilterEvent extends Event
 
 	public const BBCODE_TO_HTML_START = 'friendica.data.bbcode_to_html_start';
 
+	public const HTML_TO_BBCODE_END = 'friendica.data.html_to_bbcode_end';
+
 	public const BBCODE_TO_MARKDOWN_END = 'friendica.data.bbcode_to_markdown_end';
 
 	private array $array;
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 9e76cebcf2..e7d7aba55e 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -45,6 +45,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
 			ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
 			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
+			ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
 			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
@@ -205,6 +206,28 @@ class HookEventBridgeTest extends TestCase
 		);
 	}
 
+	public function testOnHtmlToBbcodeEventCallsHookWithCorrectValue(): void
+	{
+		$event = new ArrayFilterEvent(ArrayFilterEvent::HTML_TO_BBCODE_END, ['html2bbcode' => '<b>original</b>']);
+
+		$reflectionProperty = new \ReflectionProperty(HookEventBridge::class, 'mockedCallHook');
+		$reflectionProperty->setAccessible(true);
+
+		$reflectionProperty->setValue(null, function (string $name, string $data): string {
+			$this->assertSame('html2bbcode', $name);
+			$this->assertSame('<b>original</b>', $data);
+
+			return '[b]changed[/b]';
+		});
+
+		HookEventBridge::onHtmlToBbcodeEvent($event);
+
+		$this->assertSame(
+			['html2bbcode' => '[b]changed[/b]'],
+			$event->getArray(),
+		);
+	}
+
 	public function testOnBbcodeToMarkdownEventCallsHookWithCorrectValue(): void
 	{
 		$event = new ArrayFilterEvent(ArrayFilterEvent::BBCODE_TO_MARKDOWN_END, ['bbcode2markdown' => '[b]original[/b]']);

From 27a7735c651ae33b58d19f76088266fd210ba989 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 17 Feb 2025 10:56:04 +0000
Subject: [PATCH 30/35] Fix code style

---
 src/Content/Text/HTML.php | 74 +++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index dcec024cf0..f5cf2c6eca 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -51,7 +51,7 @@ class HTML
 	private static function tagToBBCodeSub(DOMDocument $doc, string $tag, array $attributes, string $startbb, string $endbb, bool $ignoreChildren = false): bool
 	{
 		$savestart = str_replace('$', '\x01', $startbb);
-		$replace = false;
+		$replace   = false;
 
 		$xpath = new DOMXPath($doc);
 
@@ -93,7 +93,7 @@ class HTML
 
 			if ($replace) {
 				$StartCode = $doc->createTextNode($startbb);
-				$EndCode = $doc->createTextNode($endbb);
+				$EndCode   = $doc->createTextNode($endbb);
 
 				$node->parentNode->insertBefore($StartCode, $node);
 
@@ -143,7 +143,7 @@ class HTML
 
 		$eventDispatcher = DI::eventDispatcher();
 
-		$message = Strings::performWithEscapedBlocks($message, '#<pre><code.*</code></pre>#iUs', function ($message) use($eventDispatcher) {
+		$message = Strings::performWithEscapedBlocks($message, '#<pre><code.*</code></pre>#iUs', function ($message) use ($eventDispatcher) {
 			$message = str_replace(
 				[
 					"<li><p>",
@@ -160,7 +160,7 @@ class HTML
 			$message = preg_replace('=<(\w+):(.+?)>=', '<removeme>', $message);
 			$message = preg_replace('=</(\w+):(.+?)>=', '</removeme>', $message);
 
-			$doc = new DOMDocument();
+			$doc                     = new DOMDocument();
 			$doc->preserveWhiteSpace = false;
 
 			$message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8");
@@ -179,10 +179,10 @@ class HTML
 			XML::deleteNode($doc, 'removeme');
 
 			$xpath = new DomXPath($doc);
-			$list = $xpath->query("//pre");
+			$list  = $xpath->query("//pre");
 			foreach ($list as $node) {
 				// Ensure to escape unescaped & - they will otherwise raise a warning
-				$safe_value = preg_replace('/&(?!\w+;)/', '&amp;', $node->nodeValue);
+				$safe_value      = preg_replace('/&(?!\w+;)/', '&amp;', $node->nodeValue);
 				$node->nodeValue = str_replace("\n", "\r", $safe_value);
 			}
 
@@ -336,12 +336,12 @@ class HTML
 
 			do {
 				$oldmessage = $message;
-				$message = str_replace("\n \n", "\n\n", $message);
+				$message    = str_replace("\n \n", "\n\n", $message);
 			} while ($oldmessage != $message);
 
 			do {
 				$oldmessage = $message;
-				$message = str_replace("\n\n\n", "\n\n", $message);
+				$message    = str_replace("\n\n\n", "\n\n", $message);
 			} while ($oldmessage != $message);
 
 			$message = str_replace(
@@ -394,14 +394,14 @@ class HTML
 		unset($base['fragment']);
 
 		$link = $matches[0];
-		$url = $matches[1];
+		$url  = $matches[1];
 
 		if (empty($url) || empty(parse_url($url))) {
 			return $matches[0];
 		}
 
 		$parts = array_merge($base, parse_url($url));
-		$url2 = (string)Uri::fromParts((array)$parts);
+		$url2  = (string)Uri::fromParts((array)$parts);
 
 		return str_replace($url, $url2, $link);
 	}
@@ -469,7 +469,7 @@ class HTML
 				}
 
 				$newlines[] = $newline . " ";
-				$line = substr($line, $pos + 1);
+				$line       = substr($line, $pos + 1);
 			}
 		} while ((strlen($line) > $wraplen) && !($oldline == $line));
 
@@ -487,14 +487,14 @@ class HTML
 		$lines = explode("\n", $message);
 
 		$newlines = [];
-		$level = 0;
+		$level    = 0;
 		foreach ($lines as $line) {
-			$line = trim($line);
+			$line       = trim($line);
 			$startquote = false;
 			while (strpos("*" . $line, '[quote]') > 0) {
 				$level++;
-				$pos = strpos($line, '[quote]');
-				$line = substr($line, 0, $pos) . substr($line, $pos + 7);
+				$pos        = strpos($line, '[quote]');
+				$line       = substr($line, 0, $pos) . substr($line, $pos + 7);
 				$startquote = true;
 			}
 
@@ -506,7 +506,7 @@ class HTML
 					$level = 0;
 				}
 
-				$pos = strpos($line, '[/quote]');
+				$pos  = strpos($line, '[/quote]');
 				$line = substr($line, 0, $pos) . substr($line, $pos + 8);
 			}
 
@@ -571,7 +571,7 @@ class HTML
 		DI::profiler()->startRecording('rendering');
 		$message = str_replace("\r", "", $html);
 
-		$doc = new DOMDocument();
+		$doc                     = new DOMDocument();
 		$doc->preserveWhiteSpace = false;
 
 		$message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8");
@@ -670,7 +670,7 @@ class HTML
 
 		do {
 			$oldmessage = $message;
-			$message = str_replace("\n\n\n", "\n\n", $message);
+			$message    = str_replace("\n\n\n", "\n\n", $message);
 		} while ($oldmessage != $message);
 
 		$message = self::quoteLevel(trim($message), $wraplength);
@@ -690,7 +690,7 @@ class HTML
 	{
 		DI::profiler()->startRecording('rendering');
 		$converter = new HtmlConverter(['hard_break' => true]);
-		$markdown = $converter->convert($html);
+		$markdown  = $converter->convert($html);
 
 		DI::profiler()->stopRecording();
 		return $markdown;
@@ -745,20 +745,20 @@ class HTML
 		// Replace links
 		$pattern = "/<a([^>]*) href=\"(?!http|https|\/)([^\"]*)\"/";
 		$replace = "<a\${1} href=\"" . $base2 . "\${2}\"";
-		$text = preg_replace($pattern, $replace, $text);
+		$text    = preg_replace($pattern, $replace, $text);
 
 		$pattern = "/<a([^>]*) href=\"(?!http|https)([^\"]*)\"/";
 		$replace = "<a\${1} href=\"" . $base . "\${2}\"";
-		$text = preg_replace($pattern, $replace, $text);
+		$text    = preg_replace($pattern, $replace, $text);
 
 		// Replace images
 		$pattern = "/<img([^>]*) src=\"(?!http|https|\/)([^\"]*)\"/";
 		$replace = "<img\${1} src=\"" . $base2 . "\${2}\"";
-		$text = preg_replace($pattern, $replace, $text);
+		$text    = preg_replace($pattern, $replace, $text);
 
 		$pattern = "/<img([^>]*) src=\"(?!http|https)([^\"]*)\"/";
 		$replace = "<img\${1} src=\"" . $base . "\${2}\"";
-		$text = preg_replace($pattern, $replace, $text);
+		$text    = preg_replace($pattern, $replace, $text);
 
 
 		// Done
@@ -776,7 +776,7 @@ class HTML
 		$tpl = Renderer::getMarkupTemplate("scroll_loader.tpl");
 		return Renderer::replaceMacros($tpl, [
 			'wait' => DI::l10n()->t('Loading more entries...'),
-			'end' => DI::l10n()->t('The end')
+			'end'  => DI::l10n()->t('The end')
 		]);
 	}
 
@@ -807,9 +807,9 @@ class HTML
 			$contact["addr"] = $contact["url"];
 		}
 
-		$url = $contact['url'];
+		$url     = $contact['url'];
 		$sparkle = '';
-		$redir = false;
+		$redir   = false;
 
 		if ($redirect) {
 			$url = Contact::magicLinkByContact($contact);
@@ -824,14 +824,14 @@ class HTML
 		}
 
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate($textmode ? 'micropro_txt.tpl' : 'micropro_img.tpl'), [
-			'$click' => $contact['click'] ?? '',
-			'$class' => $class,
-			'$url' => $url,
-			'$photo' => Contact::getThumb($contact),
-			'$name' => $contact['name'],
-			'title' => $contact['name'] . ' [' . $contact['addr'] . ']',
+			'$click'  => $contact['click'] ?? '',
+			'$class'  => $class,
+			'$url'    => $url,
+			'$photo'  => Contact::getThumb($contact),
+			'$name'   => $contact['name'],
+			'title'   => $contact['name'] . ' [' . $contact['addr'] . ']',
 			'$parkle' => $sparkle,
-			'$redir' => $redir
+			'$redir'  => $redir
 		]);
 	}
 
@@ -893,7 +893,7 @@ class HTML
 	public static function applyContentFilter(string $html, array $reasons): string
 	{
 		if (count($reasons)) {
-			$tpl = Renderer::getMarkupTemplate('wall/content_filter.tpl');
+			$tpl  = Renderer::getMarkupTemplate('wall/content_filter.tpl');
 			$html = Renderer::replaceMacros($tpl, [
 				'$reasons'   => $reasons,
 				'$rnd'       => Strings::getRandomHex(8),
@@ -951,8 +951,8 @@ class HTML
 
 		$config->set('Attr.AllowedRel', [
 			'noreferrer' => true,
-			'noopener' => true,
-			'tag' => true,
+			'noopener'   => true,
+			'tag'        => true,
 		]);
 		$config->set('Attr.AllowedFrameTargets', [
 			'_blank' => true,
@@ -1046,7 +1046,7 @@ class HTML
 			// This expression looks for a meta tag with the http-equiv attribute set to "content-type" ignoring case
 			// whose content attribute contains a "charset" string and returns its value
 			$expression = "string(//meta[@http-equiv][translate(@http-equiv, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = 'content-type'][contains(translate(@content, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), 'charset')]/@content)";
-			$mediaType = MediaType::fromContentType($xpath->evaluate($expression));
+			$mediaType  = MediaType::fromContentType($xpath->evaluate($expression));
 			if (isset($mediaType->parameters['charset'])) {
 				return strtolower($mediaType->parameters['charset']);
 			}

From c66588cc2a8504a0bbea73cc129c2a11df983e93 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 20 Feb 2025 08:24:52 +0000
Subject: [PATCH 31/35] Create Event for contact_block_end hook

---
 doc/Addons.md                                 | 4 ++--
 doc/de/Addons.md                              | 4 ++--
 src/Content/Widget/ContactBlock.php           | 9 +++++----
 src/Core/Hooks/HookEventBridge.php            | 2 ++
 src/Event/HtmlFilterEvent.php                 | 2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 2 ++
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/doc/Addons.md b/doc/Addons.md
index 70b51c3066..7b7e97e701 100644
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -661,7 +661,7 @@ Called when a custom storage is used (e.g. webdav_storage)
 
 Hook data:
 - **name** (input): the name of the used storage backend
-- **data['storage']** (output): the storage instance to use (**must** implement `\Friendica\Core\Storage\IWritableStorage`) 
+- **data['storage']** (output): the storage instance to use (**must** implement `\Friendica\Core\Storage\IWritableStorage`)
 
 ### storage_config
 
@@ -876,7 +876,7 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
 
 ### src/Content/ContactBlock.php
 
-    Hook::callAll('contact_block_end', $arr);
+    Hook::callAll('contact_block_end', $text);
 
 ### src/Content/Text/BBCode.php
 
diff --git a/doc/de/Addons.md b/doc/de/Addons.md
index 607f2d50dc..bfc0107528 100644
--- a/doc/de/Addons.md
+++ b/doc/de/Addons.md
@@ -359,10 +359,10 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
 
     Hook::callAll('register_account', $uid);
     Hook::callAll('remove_user', $user);
-    
+
 ### src/Content/ContactBlock.php
 
-    Hook::callAll('contact_block_end', $arr);
+    Hook::callAll('contact_block_end', $text);
 
 ### src/Content/Text/BBCode.php
 
diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php
index b1d80653d4..2a9d14db3e 100644
--- a/src/Content/Widget/ContactBlock.php
+++ b/src/Content/Widget/ContactBlock.php
@@ -8,11 +8,11 @@
 namespace Friendica\Content\Widget;
 
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
 
@@ -26,7 +26,6 @@ class ContactBlock
 	/**
 	 * Get HTML for contact block
 	 *
-	 * @hook contact_block_end (contacts=>array, output=>string)
 	 * @return string Formatted HTML code or empty string
 	 */
 	public static function getHTML(array $profile, int $visitor_uid = null): string
@@ -113,9 +112,11 @@ class ContactBlock
 			'$micropro' => $micropro,
 		]);
 
-		$arr = ['contacts' => $contacts, 'output' => $o];
+		$eventDispatcher = DI::eventDispatcher();
 
-		Hook::callAll('contact_block_end', $arr);
+		$o = $eventDispatcher->dispatch(
+			new HtmlFilterEvent(HtmlFilterEvent::CONTACT_BLOCK_END, $o),
+		)->getHtml();
 
 		return $o;
 	}
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index bc0615f368..943ba7eaa6 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -64,6 +64,7 @@ final class HookEventBridge
 		HtmlFilterEvent::PAGE_CONTENT_TOP        => 'page_content_top',
 		HtmlFilterEvent::PAGE_END                => 'page_end',
 		HtmlFilterEvent::JOT_TOOL                => 'jot_tool',
+		HtmlFilterEvent::CONTACT_BLOCK_END       => 'contact_block_end',
 	];
 
 	/**
@@ -101,6 +102,7 @@ final class HookEventBridge
 			HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::CONTACT_BLOCK_END       => 'onHtmlFilterEvent',
 		];
 	}
 
diff --git a/src/Event/HtmlFilterEvent.php b/src/Event/HtmlFilterEvent.php
index 83a852e08b..cb8a3992df 100644
--- a/src/Event/HtmlFilterEvent.php
+++ b/src/Event/HtmlFilterEvent.php
@@ -28,6 +28,8 @@ final class HtmlFilterEvent extends Event
 
 	public const JOT_TOOL = 'friendica.html.jot_tool';
 
+	public const CONTACT_BLOCK_END = 'friendica.html.contact_block_end';
+
 	private string $html;
 
 	public function __construct(string $name, string $html)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index e7d7aba55e..b8fb3c4814 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -53,6 +53,7 @@ class HookEventBridgeTest extends TestCase
 			HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
 			HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::CONTACT_BLOCK_END       => 'onHtmlFilterEvent',
 		];
 
 		$this->assertSame(
@@ -302,6 +303,7 @@ class HookEventBridgeTest extends TestCase
 			[HtmlFilterEvent::PAGE_CONTENT_TOP, 'page_content_top'],
 			[HtmlFilterEvent::PAGE_END, 'page_end'],
 			[HtmlFilterEvent::JOT_TOOL, 'jot_tool'],
+			[HtmlFilterEvent::CONTACT_BLOCK_END, 'contact_block_end'],
 		];
 	}
 

From f98aee686ffe802b2d9609a4c1b987524dc844dc Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 22 Feb 2025 19:22:23 +0000
Subject: [PATCH 32/35] Create Event for jot_networks hook

---
 src/Core/ACL.php                              | 8 +++++++-
 src/Core/Hooks/HookEventBridge.php            | 2 ++
 src/Event/ArrayFilterEvent.php                | 2 ++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php | 2 ++
 tests/Unit/Event/ArrayFilterEventTest.php     | 1 +
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index e0ff7e9e6a..46d66b9a20 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -11,6 +11,7 @@ use Exception;
 use Friendica\App\Page;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Circle;
 use Friendica\Model\User;
@@ -285,7 +286,12 @@ class ACL
 
 				}
 			}
-			Hook::callAll('jot_networks', $jotnets_fields);
+
+			$eventDispatcher = DI::eventDispatcher();
+
+			$jotnets_fields = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::JOT_NETWORKS, $jotnets_fields),
+			)->getArray();
 		}
 
 		$acl_contacts = self::getContactListByUserId($user['uid'], $condition);
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 943ba7eaa6..39198cf86c 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -58,6 +58,7 @@ final class HookEventBridge
 		ArrayFilterEvent::BBCODE_TO_HTML_START   => 'bbcode',
 		ArrayFilterEvent::HTML_TO_BBCODE_END     => 'html2bbcode',
 		ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'bb2diaspora',
+		ArrayFilterEvent::JOT_NETWORKS           => 'jot_networks',
 		HtmlFilterEvent::HEAD                    => 'head',
 		HtmlFilterEvent::FOOTER                  => 'footer',
 		HtmlFilterEvent::PAGE_HEADER             => 'page_header',
@@ -96,6 +97,7 @@ final class HookEventBridge
 			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
 			ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
+			ArrayFilterEvent::JOT_NETWORKS           => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 94cc07e874..43734efc95 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -54,6 +54,8 @@ final class ArrayFilterEvent extends Event
 
 	public const BBCODE_TO_MARKDOWN_END = 'friendica.data.bbcode_to_markdown_end';
 
+	public const JOT_NETWORKS = 'friendica.data.jot_networks';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index b8fb3c4814..9da695a74c 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -47,6 +47,7 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
 			ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
+			ArrayFilterEvent::JOT_NETWORKS           => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
@@ -270,6 +271,7 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::ITEM_PHOTO_MENU, 'item_photo_menu'],
 			[ArrayFilterEvent::PAGE_INFO, 'page_info_data'],
 			[ArrayFilterEvent::SMILEY_LIST, 'smilie'],
+			[ArrayFilterEvent::JOT_NETWORKS, 'jot_networks'],
 		];
 	}
 
diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php
index 643f309a8b..ddb7cb4758 100644
--- a/tests/Unit/Event/ArrayFilterEventTest.php
+++ b/tests/Unit/Event/ArrayFilterEventTest.php
@@ -43,6 +43,7 @@ class ArrayFilterEventTest extends TestCase
 			[ArrayFilterEvent::SMILEY_LIST, 'friendica.data.smiley_list'],
 			[ArrayFilterEvent::BBCODE_TO_HTML_START, 'friendica.data.bbcode_to_html_start'],
 			[ArrayFilterEvent::BBCODE_TO_MARKDOWN_END, 'friendica.data.bbcode_to_markdown_end'],
+			[ArrayFilterEvent::JOT_NETWORKS, 'friendica.data.jot_networks'],
 		];
 	}
 

From f3a8bcff11a06fbd65b38b28c3c8628908446511 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 24 Feb 2025 08:40:07 +0000
Subject: [PATCH 33/35] Create Events for protocol support hooks

---
 src/Core/Hooks/HookEventBridge.php            |  6 +++++
 src/Core/Protocol.php                         | 22 ++++++++++++++++---
 src/Event/ArrayFilterEvent.php                |  6 +++++
 tests/Unit/Core/Hooks/HookEventBridgeTest.php |  6 +++++
 tests/Unit/Event/ArrayFilterEventTest.php     |  3 +++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 39198cf86c..bf2289e071 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -59,6 +59,9 @@ final class HookEventBridge
 		ArrayFilterEvent::HTML_TO_BBCODE_END     => 'html2bbcode',
 		ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'bb2diaspora',
 		ArrayFilterEvent::JOT_NETWORKS           => 'jot_networks',
+		ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'support_follow',
+		ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'support_revoke_follow',
+		ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'support_probe',
 		HtmlFilterEvent::HEAD                    => 'head',
 		HtmlFilterEvent::FOOTER                  => 'footer',
 		HtmlFilterEvent::PAGE_HEADER             => 'page_header',
@@ -98,6 +101,9 @@ final class HookEventBridge
 			ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
 			ArrayFilterEvent::JOT_NETWORKS           => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 53f69bc509..1e5b7e7f21 100644
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -9,6 +9,7 @@ namespace Friendica\Core;
 
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
@@ -76,7 +77,12 @@ class Protocol
 			'protocol' => $protocol,
 			'result'   => null
 		];
-		Hook::callAll('support_follow', $hook_data);
+
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW, $hook_data),
+		)->getArray();
 
 		return $hook_data['result'] === true;
 	}
@@ -98,7 +104,12 @@ class Protocol
 			'protocol' => $protocol,
 			'result'   => null
 		];
-		Hook::callAll('support_revoke_follow', $hook_data);
+
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW, $hook_data),
+		)->getArray();
 
 		return $hook_data['result'] === true;
 	}
@@ -311,7 +322,12 @@ class Protocol
 			'protocol' => $protocol,
 			'result'   => null
 		];
-		Hook::callAll('support_probe', $hook_data);
+
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE, $hook_data),
+		)->getArray();
 
 		return $hook_data['result'] === true;
 	}
diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php
index 43734efc95..d21c6f8d78 100644
--- a/src/Event/ArrayFilterEvent.php
+++ b/src/Event/ArrayFilterEvent.php
@@ -56,6 +56,12 @@ final class ArrayFilterEvent extends Event
 
 	public const JOT_NETWORKS = 'friendica.data.jot_networks';
 
+	public const PROTOCOL_SUPPORTS_FOLLOW = 'friendica.data.protocol_supports_follow';
+
+	public const PROTOCOL_SUPPORTS_REVOKE_FOLLOW = 'friendica.data.protocol_supports_revoke_follow';
+
+	public const PROTOCOL_SUPPORTS_PROBE = 'friendica.data.protocol_supports_probe';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 9da695a74c..0752041604 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -48,6 +48,9 @@ class HookEventBridgeTest extends TestCase
 			ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
 			ArrayFilterEvent::JOT_NETWORKS           => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
@@ -272,6 +275,9 @@ class HookEventBridgeTest extends TestCase
 			[ArrayFilterEvent::PAGE_INFO, 'page_info_data'],
 			[ArrayFilterEvent::SMILEY_LIST, 'smilie'],
 			[ArrayFilterEvent::JOT_NETWORKS, 'jot_networks'],
+			[ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW, 'support_follow'],
+			[ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW, 'support_revoke_follow'],
+			[ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE, 'support_probe'],
 		];
 	}
 
diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php
index ddb7cb4758..2d396e6760 100644
--- a/tests/Unit/Event/ArrayFilterEventTest.php
+++ b/tests/Unit/Event/ArrayFilterEventTest.php
@@ -44,6 +44,9 @@ class ArrayFilterEventTest extends TestCase
 			[ArrayFilterEvent::BBCODE_TO_HTML_START, 'friendica.data.bbcode_to_html_start'],
 			[ArrayFilterEvent::BBCODE_TO_MARKDOWN_END, 'friendica.data.bbcode_to_markdown_end'],
 			[ArrayFilterEvent::JOT_NETWORKS, 'friendica.data.jot_networks'],
+			[ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW, 'friendica.data.protocol_supports_follow'],
+			[ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW, 'friendica.data.protocol_supports_revoke_follow'],
+			[ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE, 'friendica.data.protocol_supports_probe'],
 		];
 	}
 

From 82ea62ba7cba358174a54de6f7ef341e4137263a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 24 Feb 2025 08:42:54 +0000
Subject: [PATCH 34/35] Fix code style

---
 src/Content/Widget/ContactBlock.php           |  10 +-
 src/Core/ACL.php                              |  98 ++++++-------
 src/Core/Hooks/HookEventBridge.php            | 132 +++++++++---------
 tests/Unit/Core/Hooks/HookEventBridgeTest.php |  66 ++++-----
 4 files changed, 154 insertions(+), 152 deletions(-)

diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php
index 2a9d14db3e..aa11a258b2 100644
--- a/src/Content/Widget/ContactBlock.php
+++ b/src/Content/Widget/ContactBlock.php
@@ -92,7 +92,7 @@ class ContactBlock
 
 				if (DBA::isResult($contacts_stmt)) {
 					$contacts_title = DI::l10n()->tt('%d Contact', '%d Contacts', $total);
-					$micropro = [];
+					$micropro       = [];
 
 					while ($contact = DBA::fetch($contacts_stmt)) {
 						$contacts[] = $contact;
@@ -105,11 +105,11 @@ class ContactBlock
 		}
 
 		$tpl = Renderer::getMarkupTemplate('widget/contacts.tpl');
-		$o = Renderer::replaceMacros($tpl, [
-			'$contacts' => $contacts_title,
-			'$nickname' => $profile['nickname'],
+		$o   = Renderer::replaceMacros($tpl, [
+			'$contacts'     => $contacts_title,
+			'$nickname'     => $profile['nickname'],
 			'$viewcontacts' => DI::l10n()->t('View Contacts'),
-			'$micropro' => $micropro,
+			'$micropro'     => $micropro,
 		]);
 
 		$eventDispatcher = DI::eventDispatcher();
diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 46d66b9a20..b383591d30 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -53,7 +53,7 @@ class ACL
 		$contacts = self::getValidMessageRecipientsForUser(DI::userSession()->getLocalUserId());
 
 		$tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl');
-		$o = Renderer::replaceMacros($tpl, [
+		$o   = Renderer::replaceMacros($tpl, [
 			'$contacts'      => $contacts,
 			'$contacts_json' => json_encode($contacts),
 			'$selected'      => $selected,
@@ -96,9 +96,9 @@ class ACL
 		$selfPublicContactId = Contact::getPublicIdByUserId($localUserId);
 
 		$tpl = Renderer::getMarkupTemplate('acl/self_only.tpl');
-		$o = Renderer::replaceMacros($tpl, [
+		$o   = Renderer::replaceMacros($tpl, [
 			'$selfPublicContactId' => $selfPublicContactId,
-			'$explanation' => $explanation,
+			'$explanation'         => $explanation,
 		]);
 
 		return $o;
@@ -118,8 +118,8 @@ class ACL
 		return [
 			'allow_cid' => Contact::pruneUnavailable($aclFormatter->expand($user['allow_cid'] ?? '')),
 			'allow_gid' => $aclFormatter->expand($user['allow_gid'] ?? ''),
-			'deny_cid'  => $aclFormatter->expand($user['deny_cid']  ?? ''),
-			'deny_gid'  => $aclFormatter->expand($user['deny_gid']  ?? ''),
+			'deny_cid'  => $aclFormatter->expand($user['deny_cid'] ?? ''),
+			'deny_gid'  => $aclFormatter->expand($user['deny_gid'] ?? ''),
 		];
 	}
 
@@ -133,31 +133,33 @@ class ACL
 	 */
 	public static function getContactListByUserId(int $user_id, array $condition = [])
 	{
-		$fields = ['id', 'name', 'addr', 'micro'];
-		$params = ['order' => ['name']];
+		$fields       = ['id', 'name', 'addr', 'micro'];
+		$params       = ['order' => ['name']];
 		$acl_contacts = Contact::selectToArray(
 			$fields,
 			array_merge([
-				'uid' => $user_id,
-				'self' => false,
+				'uid'     => $user_id,
+				'self'    => false,
 				'blocked' => false,
 				'archive' => false,
 				'deleted' => false,
 				'pending' => false,
 				'network' => Protocol::FEDERATED,
-				'rel' => [Contact::FOLLOWER, Contact::FRIEND]
+				'rel'     => [Contact::FOLLOWER, Contact::FRIEND]
 			], $condition),
 			$params
 		);
 
-		$acl_yourself = Contact::selectFirst($fields, ['uid' => $user_id, 'self' => true]);
+		$acl_yourself         = Contact::selectFirst($fields, ['uid' => $user_id, 'self' => true]);
 		$acl_yourself['name'] = DI::l10n()->t('Yourself');
 
 		$acl_contacts[] = $acl_yourself;
 
-		$acl_groups = Contact::selectToArray($fields,
-			['uid' => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false,
-			'network' => Protocol::FEDERATED, 'pending' => false, 'contact-type' => Contact::TYPE_COMMUNITY], $params
+		$acl_groups = Contact::selectToArray(
+			$fields,
+			['uid'     => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false,
+				'network' => Protocol::FEDERATED, 'pending' => false, 'contact-type' => Contact::TYPE_COMMUNITY],
+			$params
 		);
 
 		$acl_contacts = array_merge($acl_groups, $acl_contacts);
@@ -179,27 +181,27 @@ class ACL
 	{
 		$acl_circles = [
 			[
-				'id' => Circle::FOLLOWERS,
-				'name' => DI::l10n()->t('Followers'),
-				'addr' => '',
+				'id'    => Circle::FOLLOWERS,
+				'name'  => DI::l10n()->t('Followers'),
+				'addr'  => '',
 				'micro' => 'images/twopeople.png',
-				'type' => 'circle',
+				'type'  => 'circle',
 			],
 			[
-				'id' => Circle::MUTUALS,
-				'name' => DI::l10n()->t('Mutuals'),
-				'addr' => '',
+				'id'    => Circle::MUTUALS,
+				'name'  => DI::l10n()->t('Mutuals'),
+				'addr'  => '',
 				'micro' => 'images/twopeople.png',
-				'type' => 'circle',
+				'type'  => 'circle',
 			]
 		];
 		foreach (Circle::getByUserId($user_id) as $circle) {
 			$acl_circles[] = [
-				'id' => $circle['id'],
-				'name' => $circle['name'],
-				'addr' => '',
+				'id'    => $circle['id'],
+				'name'  => $circle['name'],
+				'addr'  => '',
 				'micro' => 'images/twopeople.png',
-				'type' => 'circle',
+				'type'  => 'circle',
 			];
 		}
 
@@ -276,7 +278,7 @@ class ACL
 				$mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', $user['uid']]);
 				if (DBA::isResult($mailacct)) {
 					$jotnets_fields[] = [
-						'type' => 'checkbox',
+						'type'  => 'checkbox',
 						'field' => [
 							'pubmail_enable',
 							DI::l10n()->t('Post to Email'),
@@ -310,28 +312,28 @@ class ACL
 		];
 
 		$tpl = Renderer::getMarkupTemplate('acl/full_selector.tpl');
-		$o = Renderer::replaceMacros($tpl, [
-			'$public_title'   => DI::l10n()->t('Public'),
-			'$public_desc'    => DI::l10n()->t('This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'),
-			'$custom_title'   => DI::l10n()->t('Limited/Private'),
-			'$custom_desc'    => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.') . DI::l10n()->t('Start typing the name of a contact or a circle to show a filtered list. You can also mention the special circles "Followers" and "Mutuals".'),
-			'$allow_label'    => DI::l10n()->t('Show to:'),
-			'$deny_label'     => DI::l10n()->t('Except to:'),
-			'$emailcc'        => DI::l10n()->t('CC: email addresses'),
-			'$emtitle'        => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
+		$o   = Renderer::replaceMacros($tpl, [
+			'$public_title'    => DI::l10n()->t('Public'),
+			'$public_desc'     => DI::l10n()->t('This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'),
+			'$custom_title'    => DI::l10n()->t('Limited/Private'),
+			'$custom_desc'     => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.') . DI::l10n()->t('Start typing the name of a contact or a circle to show a filtered list. You can also mention the special circles "Followers" and "Mutuals".'),
+			'$allow_label'     => DI::l10n()->t('Show to:'),
+			'$deny_label'      => DI::l10n()->t('Except to:'),
+			'$emailcc'         => DI::l10n()->t('CC: email addresses'),
+			'$emtitle'         => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
 			'$jotnets_summary' => DI::l10n()->t('Connectors'),
-			'$visibility'     => $visibility,
-			'$acl_contacts'   => json_encode($acl_contacts),
-			'$acl_circles'    => json_encode($acl_circles),
-			'$acl_list'       => json_encode($acl_list),
-			'$contact_allow'  => implode(',', $default_permissions['allow_cid']),
-			'$circle_allow'   => implode(',', $default_permissions['allow_gid']),
-			'$contact_deny'   => implode(',', $default_permissions['deny_cid']),
-			'$circle_deny'    => implode(',', $default_permissions['deny_gid']),
-			'$for_federation' => $for_federation,
-			'$jotnets_fields' => $jotnets_fields,
-			'$input_names'    => $input_names,
-			'$input_group_id' => $input_group_id,
+			'$visibility'      => $visibility,
+			'$acl_contacts'    => json_encode($acl_contacts),
+			'$acl_circles'     => json_encode($acl_circles),
+			'$acl_list'        => json_encode($acl_list),
+			'$contact_allow'   => implode(',', $default_permissions['allow_cid']),
+			'$circle_allow'    => implode(',', $default_permissions['allow_gid']),
+			'$contact_deny'    => implode(',', $default_permissions['deny_cid']),
+			'$circle_deny'     => implode(',', $default_permissions['deny_gid']),
+			'$for_federation'  => $for_federation,
+			'$jotnets_fields'  => $jotnets_fields,
+			'$input_names'     => $input_names,
+			'$input_group_id'  => $input_group_id,
 		]);
 
 		return $o;
diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index bf2289e071..2f1e51a297 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -35,40 +35,40 @@ final class HookEventBridge
 	 * This maps the new event names to the legacy Hook names.
 	 */
 	private static array $eventMapper = [
-		Event::INIT                              => 'init_1',
-		Event::HOME_INIT                         => 'home_init',
-		ConfigLoadedEvent::CONFIG_LOADED         => 'load_config',
-		CollectRoutesEvent::COLLECT_ROUTES       => 'route_collection',
-		ArrayFilterEvent::APP_MENU               => 'app_menu',
-		ArrayFilterEvent::NAV_INFO               => 'nav_info',
-		ArrayFilterEvent::FEATURE_ENABLED        => 'isEnabled',
-		ArrayFilterEvent::FEATURE_GET            => 'get',
-		ArrayFilterEvent::POST_LOCAL_START       => 'post_local_start',
-		ArrayFilterEvent::POST_LOCAL             => 'post_local',
-		ArrayFilterEvent::POST_LOCAL_END         => 'post_local_end',
-		ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'photo_upload_form',
-		ArrayFilterEvent::NETWORK_TO_NAME        => 'network_to_name',
-		ArrayFilterEvent::CONVERSATION_START     => 'conversation_start',
-		ArrayFilterEvent::DISPLAY_ITEM           => 'display_item',
-		ArrayFilterEvent::RENDER_LOCATION        => 'render_location',
-		ArrayFilterEvent::ITEM_PHOTO_MENU        => 'item_photo_menu',
-		ArrayFilterEvent::OEMBED_FETCH_END       => 'oembed_fetch_url',
-		ArrayFilterEvent::PAGE_INFO              => 'page_info_data',
-		ArrayFilterEvent::SMILEY_LIST            => 'smilie',
-		ArrayFilterEvent::BBCODE_TO_HTML_START   => 'bbcode',
-		ArrayFilterEvent::HTML_TO_BBCODE_END     => 'html2bbcode',
-		ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'bb2diaspora',
-		ArrayFilterEvent::JOT_NETWORKS           => 'jot_networks',
-		ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'support_follow',
+		Event::INIT                                       => 'init_1',
+		Event::HOME_INIT                                  => 'home_init',
+		ConfigLoadedEvent::CONFIG_LOADED                  => 'load_config',
+		CollectRoutesEvent::COLLECT_ROUTES                => 'route_collection',
+		ArrayFilterEvent::APP_MENU                        => 'app_menu',
+		ArrayFilterEvent::NAV_INFO                        => 'nav_info',
+		ArrayFilterEvent::FEATURE_ENABLED                 => 'isEnabled',
+		ArrayFilterEvent::FEATURE_GET                     => 'get',
+		ArrayFilterEvent::POST_LOCAL_START                => 'post_local_start',
+		ArrayFilterEvent::POST_LOCAL                      => 'post_local',
+		ArrayFilterEvent::POST_LOCAL_END                  => 'post_local_end',
+		ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'photo_upload_form',
+		ArrayFilterEvent::NETWORK_TO_NAME                 => 'network_to_name',
+		ArrayFilterEvent::CONVERSATION_START              => 'conversation_start',
+		ArrayFilterEvent::DISPLAY_ITEM                    => 'display_item',
+		ArrayFilterEvent::RENDER_LOCATION                 => 'render_location',
+		ArrayFilterEvent::ITEM_PHOTO_MENU                 => 'item_photo_menu',
+		ArrayFilterEvent::OEMBED_FETCH_END                => 'oembed_fetch_url',
+		ArrayFilterEvent::PAGE_INFO                       => 'page_info_data',
+		ArrayFilterEvent::SMILEY_LIST                     => 'smilie',
+		ArrayFilterEvent::BBCODE_TO_HTML_START            => 'bbcode',
+		ArrayFilterEvent::HTML_TO_BBCODE_END              => 'html2bbcode',
+		ArrayFilterEvent::BBCODE_TO_MARKDOWN_END          => 'bb2diaspora',
+		ArrayFilterEvent::JOT_NETWORKS                    => 'jot_networks',
+		ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW        => 'support_follow',
 		ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'support_revoke_follow',
-		ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'support_probe',
-		HtmlFilterEvent::HEAD                    => 'head',
-		HtmlFilterEvent::FOOTER                  => 'footer',
-		HtmlFilterEvent::PAGE_HEADER             => 'page_header',
-		HtmlFilterEvent::PAGE_CONTENT_TOP        => 'page_content_top',
-		HtmlFilterEvent::PAGE_END                => 'page_end',
-		HtmlFilterEvent::JOT_TOOL                => 'jot_tool',
-		HtmlFilterEvent::CONTACT_BLOCK_END       => 'contact_block_end',
+		ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE         => 'support_probe',
+		HtmlFilterEvent::HEAD                             => 'head',
+		HtmlFilterEvent::FOOTER                           => 'footer',
+		HtmlFilterEvent::PAGE_HEADER                      => 'page_header',
+		HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'page_content_top',
+		HtmlFilterEvent::PAGE_END                         => 'page_end',
+		HtmlFilterEvent::JOT_TOOL                         => 'jot_tool',
+		HtmlFilterEvent::CONTACT_BLOCK_END                => 'contact_block_end',
 	];
 
 	/**
@@ -77,40 +77,40 @@ final class HookEventBridge
 	public static function getStaticSubscribedEvents(): array
 	{
 		return [
-			Event::INIT                              => 'onNamedEvent',
-			Event::HOME_INIT                         => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED         => 'onConfigLoadedEvent',
-			CollectRoutesEvent::COLLECT_ROUTES       => 'onCollectRoutesEvent',
-			ArrayFilterEvent::APP_MENU               => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO               => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED        => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET            => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START       => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL             => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END         => 'onArrayFilterEvent',
-			ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'onArrayFilterEvent',
-			ArrayFilterEvent::NETWORK_TO_NAME        => 'onArrayFilterEvent',
-			ArrayFilterEvent::CONVERSATION_START     => 'onArrayFilterEvent',
-			ArrayFilterEvent::DISPLAY_ITEM           => 'onArrayFilterEvent',
-			ArrayFilterEvent::RENDER_LOCATION        => 'onArrayFilterEvent',
-			ArrayFilterEvent::ITEM_PHOTO_MENU        => 'onArrayFilterEvent',
-			ArrayFilterEvent::OEMBED_FETCH_END       => 'onOembedFetchEndEvent',
-			ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
-			ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
-			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
-			ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
-			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
-			ArrayFilterEvent::JOT_NETWORKS           => 'onArrayFilterEvent',
-			ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'onArrayFilterEvent',
+			Event::INIT                                       => 'onNamedEvent',
+			Event::HOME_INIT                                  => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED                  => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES                => 'onCollectRoutesEvent',
+			ArrayFilterEvent::APP_MENU                        => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO                        => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET                     => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START                => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL                      => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END                  => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONVERSATION_START              => 'onArrayFilterEvent',
+			ArrayFilterEvent::DISPLAY_ITEM                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::RENDER_LOCATION                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_PHOTO_MENU                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::OEMBED_FETCH_END                => 'onOembedFetchEndEvent',
+			ArrayFilterEvent::PAGE_INFO                       => 'onArrayFilterEvent',
+			ArrayFilterEvent::SMILEY_LIST                     => 'onArrayFilterEvent',
+			ArrayFilterEvent::BBCODE_TO_HTML_START            => 'onBbcodeToHtmlEvent',
+			ArrayFilterEvent::HTML_TO_BBCODE_END              => 'onHtmlToBbcodeEvent',
+			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END          => 'onBbcodeToMarkdownEvent',
+			ArrayFilterEvent::JOT_NETWORKS                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW        => 'onArrayFilterEvent',
 			ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'onArrayFilterEvent',
-			ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'onArrayFilterEvent',
-			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
-			HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
-			HtmlFilterEvent::CONTACT_BLOCK_END       => 'onHtmlFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE         => 'onArrayFilterEvent',
+			HtmlFilterEvent::HEAD                             => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER                           => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER                      => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END                         => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL                         => 'onHtmlFilterEvent',
+			HtmlFilterEvent::CONTACT_BLOCK_END                => 'onHtmlFilterEvent',
 		];
 	}
 
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 0752041604..cdd3e0d61b 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -24,40 +24,40 @@ class HookEventBridgeTest extends TestCase
 	public function testGetStaticSubscribedEventsReturnsStaticMethods(): void
 	{
 		$expected = [
-			Event::INIT                              => 'onNamedEvent',
-			Event::HOME_INIT                         => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED         => 'onConfigLoadedEvent',
-			CollectRoutesEvent::COLLECT_ROUTES       => 'onCollectRoutesEvent',
-			ArrayFilterEvent::APP_MENU               => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO               => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED        => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET            => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START       => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL             => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END         => 'onArrayFilterEvent',
-			ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'onArrayFilterEvent',
-			ArrayFilterEvent::NETWORK_TO_NAME        => 'onArrayFilterEvent',
-			ArrayFilterEvent::CONVERSATION_START     => 'onArrayFilterEvent',
-			ArrayFilterEvent::DISPLAY_ITEM           => 'onArrayFilterEvent',
-			ArrayFilterEvent::RENDER_LOCATION        => 'onArrayFilterEvent',
-			ArrayFilterEvent::ITEM_PHOTO_MENU        => 'onArrayFilterEvent',
-			ArrayFilterEvent::OEMBED_FETCH_END       => 'onOembedFetchEndEvent',
-			ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
-			ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
-			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
-			ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
-			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
-			ArrayFilterEvent::JOT_NETWORKS           => 'onArrayFilterEvent',
-			ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'onArrayFilterEvent',
+			Event::INIT                                       => 'onNamedEvent',
+			Event::HOME_INIT                                  => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED                  => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES                => 'onCollectRoutesEvent',
+			ArrayFilterEvent::APP_MENU                        => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO                        => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET                     => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START                => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL                      => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END                  => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONVERSATION_START              => 'onArrayFilterEvent',
+			ArrayFilterEvent::DISPLAY_ITEM                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::RENDER_LOCATION                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_PHOTO_MENU                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::OEMBED_FETCH_END                => 'onOembedFetchEndEvent',
+			ArrayFilterEvent::PAGE_INFO                       => 'onArrayFilterEvent',
+			ArrayFilterEvent::SMILEY_LIST                     => 'onArrayFilterEvent',
+			ArrayFilterEvent::BBCODE_TO_HTML_START            => 'onBbcodeToHtmlEvent',
+			ArrayFilterEvent::HTML_TO_BBCODE_END              => 'onHtmlToBbcodeEvent',
+			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END          => 'onBbcodeToMarkdownEvent',
+			ArrayFilterEvent::JOT_NETWORKS                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW        => 'onArrayFilterEvent',
 			ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'onArrayFilterEvent',
-			ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'onArrayFilterEvent',
-			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
-			HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
-			HtmlFilterEvent::CONTACT_BLOCK_END       => 'onHtmlFilterEvent',
+			ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE         => 'onArrayFilterEvent',
+			HtmlFilterEvent::HEAD                             => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER                           => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER                      => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END                         => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL                         => 'onHtmlFilterEvent',
+			HtmlFilterEvent::CONTACT_BLOCK_END                => 'onHtmlFilterEvent',
 		];
 
 		$this->assertSame(

From 21c2c1559b4d45d8a085b0e0e9ab6691785c2ca5 Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Wed, 26 Feb 2025 08:06:35 +0100
Subject: [PATCH 35/35] Update src/Content/OEmbed.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 src/Content/OEmbed.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index a42b837882..69a08526e1 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -288,9 +288,6 @@ class OEmbed
 
 		$ret .= '</div>';
 
-		// FIXME: Why is $test unused?
-		$test = Proxy::proxifyHtml($ret, $uriid);
-
 		return str_replace("\n", "", $ret);
 	}