spelling: parameter

[friendica.git] / src / Module / Item / Activity.php

diff --git a/src/Module/Item/Activity.php b/src/Module/Item/Activity.php
index ed09e8c5dddab02c7b02182f7ff79af2c5b07eee..c9d192d249f07458ca66cfe613c0c5126231d0f4 100644 (file)
--- a/src/Module/Item/Activity.php
+++ b/src/Module/Item/Activity.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,7 +26,6 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Core\Session;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Diaspora;
@@ -39,7 +38,7 @@ class Activity extends BaseModule
 {
        protected function rawContent(array $request = [])
        {
-               if (!Session::isAuthenticated()) {
+               if (!DI::userSession()->isAuthenticated()) {
                        throw new HTTPException\ForbiddenException();
                }
 
@@ -47,17 +46,26 @@ class Activity extends BaseModule
                        throw new HTTPException\BadRequestException();
                }
 
-               $verb = $this->parameters['verb'];
-               $itemId =  $this->parameters['id'];
+               $verb    = $this->parameters['verb'];
+               $itemId  = $this->parameters['id'];
+               $handled = false;
 
                if (in_array($verb, ['announce', 'unannounce'])) {
-                       $item = Post::selectFirst(['network', 'uri-id'], ['id' => $itemId, 'uid' => [Session::getLocalUser(), 0]]);
+                       $item = Post::selectFirst(['network', 'uri-id'], ['id' => $itemId, 'uid' => [DI::userSession()->getLocalUserId(), 0]]);
                        if ($item['network'] == Protocol::DIASPORA) {
-                               Diaspora::performReshare($item['uri-id'], Session::getLocalUser());
+                               $quote = Post::selectFirst(['id'], ['quote-uri-id' => $item['uri-id'], 'body' => '', 'origin' => true, 'uid' => DI::userSession()->getLocalUserId()]);
+                               if (!empty($quote['id'])) {
+                                       if (!Item::markForDeletionById($quote['id'])) {
+                                               throw new HTTPException\BadRequestException();
+                                       }
+                               } else {
+                                       Diaspora::performReshare($item['uri-id'], DI::userSession()->getLocalUserId());
+                               }
+                               $handled = true;
                        }
                }
 
-               if (!Item::performActivity($itemId, $verb, Session::getLocalUser())) {
+               if (!$handled && !Item::performActivity($itemId, $verb, DI::userSession()->getLocalUserId())) {
                        throw new HTTPException\BadRequestException();
                }