X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FSmilies.php;h=c496283a8e4372162f79641951bd21dfb9befc42;hb=cdd57275eb7c0b6d41d5fb1f09b3f2816b3972f1;hp=df4b4e1cd0f817f0abed5d6d54a6a886395f96b7;hpb=e90876cd86895a64c8a0d8fec2e2caddc3ac5613;p=friendica.git

diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index df4b4e1cd0..c496283a8e 100644
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -1,34 +1,42 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, 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\Content;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\DI;
 
 /**
  * Prints the possible Smilies of this node
  */
 class Smilies extends BaseModule
 {
-	public static function content()
-	{
-		$smilies = \Friendica\Content\Smilies::getList();
-		$count = count(defaults($smilies, 'texts', []));
-
-		$tpl = Renderer::getMarkupTemplate('smilies.tpl');
-		return Renderer::replaceMacros($tpl, [
-			'$count'   => $count,
-			'$smilies' => $smilies,
-		]);
-	}
-
-	public static function rawContent()
+	protected function rawContent(array $request = [])
 	{
-		$app = self::getApp();
-		$smilies = \Friendica\Content\Smilies::getList();
-
-		if (!empty($app->argv[1]) && ($app->argv[1] === "json")) {
+		if (!empty(DI::args()->getArgv()[1]) && (DI::args()->getArgv()[1] === "json")) {
+			$smilies = Content\Smilies::getList();
 			$results = [];
 			for ($i = 0; $i < count($smilies['texts']); $i++) {
 				$results[] = ['text' => $smilies['texts'][$i], 'icon' => $smilies['icons'][$i]];
@@ -36,4 +44,16 @@ class Smilies extends BaseModule
 			System::jsonExit($results);
 		}
 	}
+
+	protected function content(array $request = []): string
+	{
+		$smilies = Content\Smilies::getList();
+		$count = count($smilies['texts'] ?? []);
+
+		$tpl = Renderer::getMarkupTemplate('smilies.tpl');
+		return Renderer::replaceMacros($tpl, [
+			'$count'   => $count,
+			'$smilies' => $smilies,
+		]);
+	}
 }