Merge remote-tracking branch 'upstream/develop' into loop-prevention

[friendica.git] / src / Protocol / ActivityPub / Processor.php

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index f5d8e48dedace989d7bf41da35d33066ec1be3c3..d84453f7367765936d02563f42dbaadf5ca515fc 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -396,6 +396,8 @@ class Processor
         *
         * @param array $activity Activity array
         * @param array $item
+        * 
+        * @return int event id
         * @throws \Exception
         */
        public static function createEvent($activity, $item)
@@ -419,14 +421,16 @@ class Processor
                $event['direction'] = $item['direction'];
                $event['source']    = $item['source'];
 
-               $condition = ['uri' => $item['uri'], 'uid' => $item['uid']];
-               $ev = DBA::selectFirst('event', ['id'], $condition);
+               $ev = DBA::selectFirst('event', ['id'], ['uri' => $item['uri'], 'uid' => $item['uid']]);
                if (DBA::isResult($ev)) {
                        $event['id'] = $ev['id'];
                }
 
                $event_id = Event::store($event);
+
                Logger::info('Event was stored', ['id' => $event_id]);
+
+               return $event_id;
        }
 
        /**
@@ -625,7 +629,9 @@ class Processor
                        }
 
                        if (($item['gravity'] != GRAVITY_ACTIVITY) && ($activity['object_type'] == 'as:Event')) {
-                               self::createEvent($activity, $item);
+                               $event_id = self::createEvent($activity, $item);
+
+                               $item = Event::getItemArrayForId($event_id, $item);
                        }
 
                        $item_id = Item::insert($item);
@@ -744,7 +750,7 @@ class Processor
                                        $title = $matches[3];
                                }
 
-                               $title = trim(HTML::toPlaintext(BBCode::convert($title, false, BBCode::API, true), 0));
+                               $title = trim(BBCode::toPlaintext($title));
 
                                if (strlen($title) > 20) {
                                        $title = substr($title, 0, 20) . '...';