X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHashtag.php;h=471515e6296ea4cccdc63a0833454b035a720eb6;hb=036b565a7846916f763ce1dcbcaade0844ff1589;hp=879b27ea7a73dcc219d991e739eb91f0286a59b3;hpb=96c086ea139047fc893ffb51843d3e24c5422c44;p=friendica.git

diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php
index 879b27ea7a..471515e629 100644
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -1,36 +1,53 @@
 <?php
 /**
- * @file src/Module/Hashtag.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @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\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\System;
-use dba;
+use Friendica\Database\DBA;
+use Friendica\Util\Strings;
 
 /**
  * Hashtag module.
  */
-class Hashtag extends BaseModule {
-
-	public static function init()
+class Hashtag extends BaseModule
 {
+	protected function content(array $request = []): string
+	{
 		$result = [];
 
-		$t = escape_tags($_REQUEST['t']);
+		$t = Strings::escapeHtml($_REQUEST['t']);
 		if (empty($t)) {
 			System::jsonExit($result);
 		}
 
-		$taglist = dba::p("SELECT DISTINCT(`term`) FROM `term` WHERE `term` LIKE ? AND `type` = ? ORDER BY `term`",
-			$t . '%',
-			intval(TERM_HASHTAG)
-		);
-		while ($tag = dba::fetch($taglist)) {
-			$result[] = ['text' => strtolower($tag['term'])];
+		$taglist = DBA::select('tag', ['name'], ["`name` LIKE ?", $t . "%"], ['order' => ['name'], 'limit' => 100]);
+		while ($tag = DBA::fetch($taglist)) {
+			$result[] = ['text' => $tag['name']];
 		}
-		dba::close($taglist);
+		DBA::close($taglist);
 
 		System::jsonExit($result);
+
+		return '';
 	}
 }