Create event for home_content hook

diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 24d15606ea4880849861550bce02ed5b67405868..84835dc7806b59d5479c90af0ac5fe7e6197086d 100644 (file)
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -99,7 +99,8 @@ final class HookEventBridge
                HtmlFilterEvent::PAGE_HEADER                      => 'page_header',
                HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'page_content_top',
                HtmlFilterEvent::PAGE_END                         => 'page_end',
-               HtmlFilterEvent::ABOUT_CONTENT                    => 'about_hook',
+               HtmlFilterEvent::MOD_HOME_CONTENT                 => 'home_content',
+               HtmlFilterEvent::MOD_ABOUT_CONTENT                => 'about_hook',
                HtmlFilterEvent::JOT_TOOL                         => 'jot_tool',
                HtmlFilterEvent::CONTACT_BLOCK_END                => 'contact_block_end',
        ];
@@ -174,7 +175,8 @@ final class HookEventBridge
                        HtmlFilterEvent::PAGE_HEADER                      => 'onHtmlFilterEvent',
                        HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'onHtmlFilterEvent',
                        HtmlFilterEvent::PAGE_END                         => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::ABOUT_CONTENT                    => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::MOD_HOME_CONTENT                 => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::MOD_ABOUT_CONTENT                => 'onHtmlFilterEvent',
                        HtmlFilterEvent::JOT_TOOL                         => 'onHtmlFilterEvent',
                        HtmlFilterEvent::CONTACT_BLOCK_END                => 'onHtmlFilterEvent',
                ];

diff --git a/src/Event/HtmlFilterEvent.php b/src/Event/HtmlFilterEvent.php
index 2f68d864bfb9d80d9427f8830f9b175f5871e170..9e30d6d656304eee9d6d4348087d2b834fe10091 100644 (file)
--- a/src/Event/HtmlFilterEvent.php
+++ b/src/Event/HtmlFilterEvent.php
@@ -26,7 +26,9 @@ final class HtmlFilterEvent extends Event
 
        public const PAGE_END = 'friendica.html.page_end';
 
-       public const ABOUT_CONTENT = 'friendica.html.about_content';
+       public const MOD_HOME_CONTENT = 'friendica.html.mod_home_content';
+
+       public const MOD_ABOUT_CONTENT = 'friendica.html.mod_about_content';
 
        public const JOT_TOOL = 'friendica.html.jot_tool';
 

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 0ace0707dd106e2aa09c882c1fa89a5aca541351..314152abca8a429c740b049ef190b0fd20fad7bb 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -116,7 +116,7 @@ class Friendica extends BaseModule
                $hooked = '';
 
                $hooked = $this->eventDispatcher->dispatch(
-                       new HtmlFilterEvent(HtmlFilterEvent::ABOUT_CONTENT, $hooked),
+                       new HtmlFilterEvent(HtmlFilterEvent::MOD_ABOUT_CONTENT, $hooked),
                )->getHtml();
 
                $tpl = Renderer::getMarkupTemplate('friendica.tpl');

diff --git a/src/Module/Home.php b/src/Module/Home.php
index 7e7d59d76057468865e09a38ee4148c496ac425c..9a6a4a473076a11438f3c9aa4a7c356c60e68ec7 100644 (file)
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -8,10 +8,10 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Event\Event;
+use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Protocol\ActivityPub;
@@ -66,7 +66,10 @@ class Home extends BaseModule
                $login = Login::form(DI::args()->getQueryString(), Register::getPolicy() !== Register::CLOSED);
 
                $content = '';
-               Hook::callAll('home_content', $content);
+
+               $content = $eventDispatcher->dispatch(
+                       new HtmlFilterEvent(HtmlFilterEvent::MOD_HOME_CONTENT, $content),
+               )->getHtml();
 
                $tpl = Renderer::getMarkupTemplate('home.tpl');
                return Renderer::replaceMacros($tpl, [

diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index ab6f5e2cf0ac48c72ed88136b8062e71def6bc98..075630da1c88e7c4aad750a91809ec60e744d07e 100644 (file)
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -88,7 +88,8 @@ class HookEventBridgeTest extends TestCase
                        HtmlFilterEvent::PAGE_HEADER                      => 'onHtmlFilterEvent',
                        HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'onHtmlFilterEvent',
                        HtmlFilterEvent::PAGE_END                         => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::ABOUT_CONTENT                    => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::MOD_HOME_CONTENT                 => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::MOD_ABOUT_CONTENT                => 'onHtmlFilterEvent',
                        HtmlFilterEvent::JOT_TOOL                         => 'onHtmlFilterEvent',
                        HtmlFilterEvent::CONTACT_BLOCK_END                => 'onHtmlFilterEvent',
                ];
@@ -526,7 +527,8 @@ class HookEventBridgeTest extends TestCase
                        [HtmlFilterEvent::PAGE_HEADER, 'page_header'],
                        [HtmlFilterEvent::PAGE_CONTENT_TOP, 'page_content_top'],
                        [HtmlFilterEvent::PAGE_END, 'page_end'],
-                       [HtmlFilterEvent::ABOUT_CONTENT, 'about_hook'],
+                       [HtmlFilterEvent::MOD_HOME_CONTENT, 'home_content'],
+                       [HtmlFilterEvent::MOD_ABOUT_CONTENT, 'about_hook'],
                        [HtmlFilterEvent::JOT_TOOL, 'jot_tool'],
                        [HtmlFilterEvent::CONTACT_BLOCK_END, 'contact_block_end'],
                ];

diff --git a/tests/Unit/Event/HtmlFilterEventTest.php b/tests/Unit/Event/HtmlFilterEventTest.php
index 9d38cf097aa74ea29b0c9326ab47bfa57aaf31c3..47a2d2596d09b1f7b4d24e3f4f42ff2764666dd7 100644 (file)
--- a/tests/Unit/Event/HtmlFilterEventTest.php
+++ b/tests/Unit/Event/HtmlFilterEventTest.php
@@ -30,7 +30,8 @@ class HtmlFilterEventTest extends TestCase
                        [HtmlFilterEvent::PAGE_HEADER, 'friendica.html.page_header'],
                        [HtmlFilterEvent::PAGE_CONTENT_TOP, 'friendica.html.page_content_top'],
                        [HtmlFilterEvent::PAGE_END, 'friendica.html.page_end'],
-                       [HtmlFilterEvent::ABOUT_CONTENT, 'friendica.html.about_content'],
+                       [HtmlFilterEvent::MOD_HOME_CONTENT, 'friendica.html.mod_home_content'],
+                       [HtmlFilterEvent::MOD_ABOUT_CONTENT, 'friendica.html.mod_about_content'],
                        [HtmlFilterEvent::JOT_TOOL, 'friendica.html.jot_tool'],
                        [HtmlFilterEvent::CONTACT_BLOCK_END, 'friendica.html.contact_block_end'],
                ];