Cache the profile as well

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 8bd08b95b48c93e6e47eecef7f15b9ddd2794ad8..cde70c0d7cf504576ba91a23ddc71746ad7d393b 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -152,6 +152,37 @@ class Processor
                }
        }
 
+       /**
+        * Store attachment data
+        *
+        * @param array   $activity
+        * @param array   $item
+        */
+       private static function storeQuestion($activity, $item)
+       {
+               if (empty($activity['question'])) {
+                       return;
+               }
+               $question = ['multiple' => $activity['question']['multiple']];
+
+               if (!empty($activity['question']['voters'])) {
+                       $question['voters'] = $activity['question']['voters'];
+               }
+
+               if (!empty($activity['question']['end-time'])) {
+                       $question['end-time'] = DateTimeFormat::utc($activity['question']['end-time']);
+               }
+
+               Post\Question::update($item['uri-id'], $question);
+
+               foreach ($activity['question']['options'] as $key => $option) {
+                       $option = ['name' => $option['name'], 'replies' => $option['replies']];
+                       Post\QuestionOption::update($item['uri-id'], $key, $option);
+               }
+
+               Logger::debug('Storing incoming question', ['type' => $activity['type'], 'uri-id' => $item['uri-id'], 'question' => $activity['question']]);
+       }
+
        /**
         * Updates a message
         *
@@ -178,11 +209,13 @@ class Processor
                $item = self::processContent($activity, $item);
 
                self::storeAttachments($activity, $item);
+               self::storeQuestion($activity, $item);
 
                if (empty($item)) {
                        return;
                }
 
+               Post\History::add($item['uri-id'], $item);
                Item::update($item, ['uri' => $activity['id']]);
 
                if ($activity['object_type'] == 'as:Event') {
@@ -206,8 +239,12 @@ class Processor
                $event['edited']   = DateTimeFormat::utc($activity['updated']);
                $event['summary']  = HTML::toBBCode($activity['name']);
                $event['desc']     = HTML::toBBCode($activity['content']);
-               $event['start']    = $activity['start-time'];
-               $event['finish']   = $activity['end-time'];
+               if (!empty($activity['start-time'])) {
+                       $event['start']  = DateTimeFormat::utc($activity['start-time']);
+               }
+               if (!empty($activity['end-time'])) {
+                       $event['finish'] = DateTimeFormat::utc($activity['end-time']);
+               }
                $event['nofinish'] = empty($event['finish']);
                $event['location'] = $activity['location'];
 
@@ -347,6 +384,7 @@ class Processor
                $item['plink'] = $activity['alternate-url'] ?? $item['uri'];
 
                self::storeAttachments($activity, $item);
+               self::storeQuestion($activity, $item);
 
                // We received the post via AP, so we set the protocol of the server to AP
                $contact = Contact::getById($item['author-id'], ['gsid']);
@@ -525,8 +563,12 @@ class Processor
        {
                $event['summary']   = HTML::toBBCode($activity['name'] ?: $activity['summary']);
                $event['desc']      = HTML::toBBCode($activity['content']);
-               $event['start']     = $activity['start-time'];
-               $event['finish']    = $activity['end-time'];
+               if (!empty($activity['start-time'])) {
+                       $event['start']  = DateTimeFormat::utc($activity['start-time']);
+               }
+               if (!empty($activity['end-time'])) {
+                       $event['finish'] = DateTimeFormat::utc($activity['end-time']);
+               }
                $event['nofinish']  = empty($event['finish']);
                $event['location']  = $activity['location'];
                $event['cid']       = $item['contact-id'];
@@ -908,7 +950,10 @@ class Processor
                                        } else {
                                                $name = trim(parse_url($receiver, PHP_URL_PATH), '/');
                                        }
-                                       Tag::store($uriid, $type, $name, $receiver);
+
+                                       $target = Tag::getTargetType($receiver);
+                                       Logger::debug('Got target type', ['type' => $target, 'url' => $receiver]);
+                                       Tag::store($uriid, $type, $name, $receiver, $target);
                                }
                        }
                }