Merge pull request #9440 from annando/one-click-follow

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

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 991106def987089ebeeff25dfd4484ce3f3f49b1..bb68adeb3bb8cf7b35563e05ca03f840f835fc78 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -91,13 +91,14 @@ class Objects extends BaseModule
 
                        $data = ['@context' => ActivityPub::CONTEXT];
                        $data = array_merge($data, $activity['object']);
-               } elseif (in_array($parameters['activity'], ['Create', 'Announce', 'Update', 
-                       'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add', ''])) {
+               } elseif (empty($parameters['activity']) || in_array($parameters['activity'],
+                       ['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject',
+                       'TentativeAccept', 'Follow', 'Add'])) {
                        $data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
                        if (empty($data)) {
                                throw new HTTPException\NotFoundException();
                        }
-                       if (!in_array($parameters['activity'], ['Create', ''])) {
+                       if (!empty($parameters['activity']) && ($parameters['activity'] != 'Create')) {
                                $data['type'] = $parameters['activity'];
                                $data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
                        }