diff --git a/mod/item.php b/mod/item.php index 46f2a219e3..e6b2cb93f4 100644 --- a/mod/item.php +++ b/mod/item.php @@ -46,7 +46,7 @@ function item_post() $eventDispatcher = DI::eventDispatcher(); $_REQUEST = $eventDispatcher->dispatch( - new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_START, $_REQUEST) + new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL_START, $_REQUEST) )->getArray(); $return_path = $_REQUEST['return'] ?? ''; @@ -282,7 +282,7 @@ function item_process(array $post, array $request, bool $preview, string $return $eventDispatcher = DI::eventDispatcher(); $post = $eventDispatcher->dispatch( - new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL, $post) + new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL, $post) )->getArray(); unset($post['edit']); diff --git a/src/Content/Item.php b/src/Content/Item.php index 9c9cd10bed..af26ebd8ed 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -1012,7 +1012,7 @@ class Item } $post = $this->eventDispatcher->dispatch( - new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_END, $post) + new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL_END, $post) )->getArray(); $author = DBA::selectFirst('contact', ['thumb'], ['uid' => $post['uid'], 'self' => true]); diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php index 18a2754e33..251c462929 100644 --- a/src/Core/Hooks/HookEventBridge.php +++ b/src/Core/Hooks/HookEventBridge.php @@ -43,9 +43,9 @@ final class HookEventBridge 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::INSERT_POST_LOCAL_START => 'post_local_start', + ArrayFilterEvent::INSERT_POST_LOCAL => 'post_local', + ArrayFilterEvent::INSERT_POST_LOCAL_END => 'post_local_end', ArrayFilterEvent::INSERT_POST_REMOTE => 'post_remote', ArrayFilterEvent::INSERT_POST_REMOTE_END => 'post_remote_end', ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'photo_upload_form', @@ -101,9 +101,9 @@ final class HookEventBridge 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::INSERT_POST_LOCAL_START => 'onArrayFilterEvent', + ArrayFilterEvent::INSERT_POST_LOCAL => 'onArrayFilterEvent', + ArrayFilterEvent::INSERT_POST_LOCAL_END => 'onArrayFilterEvent', ArrayFilterEvent::INSERT_POST_REMOTE => 'onArrayFilterEvent', ArrayFilterEvent::INSERT_POST_REMOTE_END => 'onArrayFilterEvent', ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent', diff --git a/src/Event/ArrayFilterEvent.php b/src/Event/ArrayFilterEvent.php index 0ab06525bd..51719e7de9 100644 --- a/src/Event/ArrayFilterEvent.php +++ b/src/Event/ArrayFilterEvent.php @@ -24,11 +24,11 @@ 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 INSERT_POST_LOCAL_START = 'friendica.data.insert_post_local_start'; - public const POST_LOCAL = 'friendica.data.post_local'; + public const INSERT_POST_LOCAL = 'friendica.data.insert_post_local'; - public const POST_LOCAL_END = 'friendica.data.post_local_end'; + public const INSERT_POST_LOCAL_END = 'friendica.data.insert_post_local_end'; public const INSERT_POST_REMOTE = 'friendica.data.insert_post_remote'; diff --git a/src/Model/Item.php b/src/Model/Item.php index 99ebba8cae..d2169d3156 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -847,7 +847,7 @@ class Item } $item = $eventDispatcher->dispatch( - new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL, $item) + new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL, $item) )->getArray(); if ($dummy_session) { diff --git a/src/Module/Post/Tag/Add.php b/src/Module/Post/Tag/Add.php index bf704a50c0..e03bf215a3 100644 --- a/src/Module/Post/Tag/Add.php +++ b/src/Module/Post/Tag/Add.php @@ -154,7 +154,7 @@ EOT; $post['id'] = $post_id; $post = $this->eventDispatcher->dispatch( - new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_END, $post) + new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL_END, $post) )->getArray(); $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]); diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php index 69c49f3513..325aefb742 100644 --- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php +++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php @@ -32,9 +32,9 @@ class HookEventBridgeTest extends TestCase 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::INSERT_POST_LOCAL_START => 'onArrayFilterEvent', + ArrayFilterEvent::INSERT_POST_LOCAL => 'onArrayFilterEvent', + ArrayFilterEvent::INSERT_POST_LOCAL_END => 'onArrayFilterEvent', ArrayFilterEvent::INSERT_POST_REMOTE => 'onArrayFilterEvent', ArrayFilterEvent::INSERT_POST_REMOTE_END => 'onArrayFilterEvent', ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent', @@ -313,9 +313,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'], + [ArrayFilterEvent::INSERT_POST_LOCAL_START, 'post_local_start'], + [ArrayFilterEvent::INSERT_POST_LOCAL, 'post_local'], + [ArrayFilterEvent::INSERT_POST_LOCAL_END, 'post_local_end'], [ArrayFilterEvent::INSERT_POST_REMOTE, 'post_remote'], [ArrayFilterEvent::INSERT_POST_REMOTE_END, 'post_remote_end'], [ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'photo_upload_form'], diff --git a/tests/Unit/Event/ArrayFilterEventTest.php b/tests/Unit/Event/ArrayFilterEventTest.php index 193ccc77d8..7c124f0b33 100644 --- a/tests/Unit/Event/ArrayFilterEventTest.php +++ b/tests/Unit/Event/ArrayFilterEventTest.php @@ -29,9 +29,9 @@ class ArrayFilterEventTest extends TestCase [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::INSERT_POST_LOCAL_START, 'friendica.data.insert_post_local_start'], + [ArrayFilterEvent::INSERT_POST_LOCAL, 'friendica.data.insert_post_local'], + [ArrayFilterEvent::INSERT_POST_LOCAL_END, 'friendica.data.insert_post_local_end'], [ArrayFilterEvent::INSERT_POST_REMOTE, 'friendica.data.insert_post_remote'], [ArrayFilterEvent::INSERT_POST_REMOTE_END, 'friendica.data.insert_post_remote_end'], [ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'friendica.data.photo_upload_form'],