Fix: The "extid" field wasn't updated

[friendica.git] / src / Module / Filer / RemoveTag.php

diff --git a/src/Module/Filer/RemoveTag.php b/src/Module/Filer/RemoveTag.php
index 7866656e33895967ad94c0fcff18df1256912e05..667bc390c3b5225bcab2049a2ef4103912523ce2 100644 (file)
--- a/src/Module/Filer/RemoveTag.php
+++ b/src/Module/Filer/RemoveTag.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,8 +22,9 @@
 namespace Friendica\Module\Filer;
 
 use Friendica\BaseModule;
+use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\FileTag;
+use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Friendica\Util\XML;
 
@@ -46,26 +47,33 @@ class RemoveTag extends BaseModule
                $term = XML::unescape(trim($_GET['term'] ?? ''));
                $cat = XML::unescape(trim($_GET['cat'] ?? ''));
 
-               $category = (($cat) ? true : false);
-
-               if ($category) {
+               if (!empty($cat)) {
+                       $type = Post\Category::CATEGORY;
                        $term = $cat;
+               } else {
+                       $type = Post\Category::FILE;
                }
 
                $logger->info('Filer - Remove Tag', [
-                       'term'     => $term,
-                       'item'     => $item_id,
-                       'category' => ($category ? 'true' : 'false')
+                       'term' => $term,
+                       'item' => $item_id,
+                       'type' => $type
                ]);
 
                if ($item_id && strlen($term)) {
-                       if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)) {
-                               info('Item removed');
+                       $item = Post::selectFirst(['uri-id'], ['id' => $item_id]);
+                       if (!DBA::isResult($item)) {
+                               return;                         
+                       }
+                       if (!Post\Category::deleteFileByURIId($item['uri-id'], local_user(), $type, $term)) {
+                               notice(DI::l10n()->t('Item was not removed'));
                        }
                } else {
-                       info('Item was not deleted');
+                       notice(DI::l10n()->t('Item was not deleted'));
                }
 
-               DI::baseUrl()->redirect('network?file=' . rawurlencode($term));
+               if ($type == Post\Category::FILE) {
+                       DI::baseUrl()->redirect('filed?file=' . rawurlencode($term));
+               }
        }
 }