Merge pull request #5906 from annando/ap-switch

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index bfc5e6d084d16ef827f134160e1fa49fa864484b..825a2412a28003dda261c594c596ab0972a198ae 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -212,8 +212,13 @@ class Processor
                $item['content-warning'] = HTML::toBBCode($activity['summary']);
                $item['body'] = self::convertMentions(HTML::toBBCode($activity['content']));
                $item['location'] = $activity['location'];
+
+               if (!empty($item['latitude']) && !empty($item['longitude'])) {
+                       $item['coord'] = $item['latitude'] . ' ' . $item['longitude'];
+               }
+
                $item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']);
-               $item['app'] = $activity['service'];
+               $item['app'] = $activity['generator'];
                $item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
                $item['diaspora_signed_text'] = defaults($activity, 'diaspora:comment', '');