Move HTML purification to own method in Content\Text\HTML

[friendica.git] / src / Module / Objects.php

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 1658507d5075dde5b925111a1fc5922a23b63529..18830339fbb481bf26a76fd1dde24d99efcd0bae 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -28,6 +28,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
@@ -68,7 +69,7 @@ class Objects extends BaseModule
                        }
                }
 
-               $item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity'],
+               $item = Post::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity'],
                        ['uri-id' => $itemuri['id']], ['order' => ['origin' => true]]);
 
                if (!DBA::isResult($item)) {
@@ -103,6 +104,10 @@ class Objects extends BaseModule
 
                if (empty($parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
                        $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
+                       if (empty($activity['type'])) {
+                               throw new HTTPException\NotFoundException();
+                       }
+
                        $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
 
                        // Only display "Create" activity objects here, no reshares or anything else