]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' into eventdispatcher-part3
authorArt4 <art4@wlabs.de>
Mon, 12 May 2025 14:32:53 +0000 (14:32 +0000)
committerArt4 <art4@wlabs.de>
Mon, 12 May 2025 14:32:53 +0000 (14:32 +0000)
1  2 
src/Core/Hook.php
src/Core/Worker.php
src/Model/Event.php
src/Model/Item.php
src/Module/Conversation/Network.php
src/Navigation/Notifications/Repository/Notify.php

Simple merge
Simple merge
index a254a8cf8bc311f0b68927b52a0c76d11f3540c5,01d1d9df1fe7e336ebdc3331677d27200f15c274..11fe8a9b4b6597b25d77d210f1585c6d393db8a0
@@@ -305,12 -302,10 +305,12 @@@ class Even
  
                        $event['id'] = DBA::lastInsertId();
  
 -                      Hook::callAll("event_created", $event['id']);
 +                      $eventDispatcher->dispatch(
 +                              new ArrayFilterEvent(ArrayFilterEvent::EVENT_CREATED, ['event' => $event]),
 +                      );
                }
  
-               return $event['id'];
+               return (int) $event['id'];
        }
  
        public static function getItemArrayForId(int $event_id, array $item = []): array
index df8e8eecccedfca0bc806504ab87feb0143bea2c,018f4dc799a203ade9fa82e1e5ef3d7ff76fc4a6..62e6aff96b19bad06c5ee47dfab5bf916cd3c316
@@@ -845,16 -849,11 +848,17 @@@ class Ite
                                $dummy_session = false;
                        }
  
 -                      /** @var array<string,mixed> */
 -                      $item = $eventDispatcher->dispatch(
 -                              new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL, $item)
 +                      $hook_data = [
 +                              'item' => $item,
 +                      ];
 +
 +                      $hook_data = $eventDispatcher->dispatch(
 +                              new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL, $hook_data)
                        )->getArray();
  
++                      /** @var array<string,mixed> */
 +                      $item = $hook_data['item'] ?? $item;
 +
                        if ($dummy_session) {
                                unset($_SESSION['authenticated']);
                                unset($_SESSION['uid']);
Simple merge