Fill "last-item" with an empty date when bo date had been provided

[friendica.git] / src / Model / FileTag.php

diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index 9908c8a33328309136b487f0068651d12f2c457e..a2c8bb43972a426e9647d7a5866915a2acd5d247 100644 (file)
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -1,12 +1,29 @@
 <?php
 /**
- * @file src/Model/FileTag.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Model;
 
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Post\Category;
 
 /**
  * This class handles FileTag related functions
@@ -179,11 +196,11 @@ class FileTag
                        if ($type == 'file') {
                                $lbracket = '[';
                                $rbracket = ']';
-                               $termtype = TERM_FILE;
+                               $termtype = Category::FILE;
                        } else {
                                $lbracket = '<';
                                $rbracket = '>';
-                               $termtype = TERM_CATEGORY;
+                               $termtype = Category::CATEGORY;
                        }
 
                        $filetags_updated = $saved;
@@ -207,13 +224,7 @@ class FileTag
                        }
 
                        foreach ($deleted_tags as $key => $tag) {
-                               $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
-                                       DBA::escape($tag),
-                                       intval(Term::OBJECT_TYPE_POST),
-                                       intval($termtype),
-                                       intval($uid));
-
-                               if (DBA::isResult($r)) {
+                               if (DBA::exists('category-view', ['name' => $tag, 'type' => $termtype, 'uid' => $uid])) {
                                        unset($deleted_tags[$key]);
                                } else {
                                        $filetags_updated = str_replace($lbracket . self::encode($tag) . $rbracket, '', $filetags_updated);
@@ -260,8 +271,6 @@ class FileTag
                        if (!strlen($saved) || !stristr($saved, '[' . self::encode($file) . ']')) {
                                DI::pConfig()->set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
                        }
-
-                       info(DI::l10n()->t('Item filed'));
                }
 
                return true;
@@ -286,10 +295,10 @@ class FileTag
 
                if ($cat == true) {
                        $pattern = '<' . self::encode($file) . '>';
-                       $termtype = Term::CATEGORY;
+                       $termtype = Category::CATEGORY;
                } else {
                        $pattern = '[' . self::encode($file) . ']';
-                       $termtype = Term::FILE;
+                       $termtype = Category::FILE;
                }
 
                $item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
@@ -302,14 +311,7 @@ class FileTag
 
                Item::update($fields, ['id' => $item_id]);
 
-               $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
-                       DBA::escape($file),
-                       intval(Term::OBJECT_TYPE_POST),
-                       intval($termtype),
-                       intval($uid)
-               );
-
-               if (!DBA::isResult($r)) {
+               if (!DBA::exists('category-view', ['name' => $file, 'type' => $termtype, 'uid' => $uid])) {
                        $saved = DI::pConfig()->get($uid, 'system', 'filetags');
                        DI::pConfig()->set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
                }