Improved defaults check

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 47ea6a1bde5db78b8626a3852012010de092ec3b..5941a408b7824dc779128b08e254a325bb7442f8 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,6 +26,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
@@ -96,7 +97,7 @@ class Processor
                        array_combine(
                                array_column($emojis, 'name'),
                                array_map(function ($emoji) {
-                                       return '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
+                                       return '[emoji=' . $emoji['href'] . ']' . $emoji['name'] . '[/emoji]';
                                }, $emojis)
                        )
                );
@@ -287,8 +288,12 @@ class Processor
 
                $item['uri'] = $activity['id'];
 
-               $item['created'] = DateTimeFormat::utc($activity['published']);
-               $item['edited'] = DateTimeFormat::utc($activity['updated']);
+               if (empty($activity['published']) || empty($activity['updated'])) {
+                       DI::logger()->notice('published or updated keys are empty for activity', ['activity' => $activity, 'callstack' => System::callstack(10)]);
+               }
+
+               $item['created'] = DateTimeFormat::utc($activity['published'] ?? 'now');
+               $item['edited'] = DateTimeFormat::utc($activity['updated'] ?? 'now');
                $guid = $activity['sc:identifier'] ?: self::getGUIDByURL($item['uri']);
                $item['guid'] = $activity['diaspora:guid'] ?: $guid;
 
@@ -408,7 +413,6 @@ class Processor
                $event['finish']    = $activity['end-time'];
                $event['nofinish']  = empty($event['finish']);
                $event['location']  = $activity['location'];
-               $event['adjust']    = $activity['adjust'] ?? true;
                $event['cid']       = $item['contact-id'];
                $event['uid']       = $item['uid'];
                $event['uri']       = $item['uri'];