Merge pull request #9873 from annando/post-user

[friendica.git] / src / Module / Smilies.php

diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index df4b4e1cd0f817f0abed5d6d54a6a886395f96b7..87d3d361da5f42d634c7c37bc612a27c9d44d1fb 100644 (file)
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -1,34 +1,43 @@
 <?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\Module;
 
 use Friendica\BaseModule;
+use Friendica\Content;
 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()
+       public static function rawContent(array $parameters = [])
        {
-               $app = self::getApp();
-               $smilies = \Friendica\Content\Smilies::getList();
+               $app = DI::app();
 
                if (!empty($app->argv[1]) && ($app->argv[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 +45,16 @@ class Smilies extends BaseModule
                        System::jsonExit($results);
                }
        }
+
+       public static function content(array $parameters = [])
+       {
+               $smilies = Content\Smilies::getList();
+               $count = count($smilies['texts'] ?? []);
+
+               $tpl = Renderer::getMarkupTemplate('smilies.tpl');
+               return Renderer::replaceMacros($tpl, [
+                       '$count'   => $count,
+                       '$smilies' => $smilies,
+               ]);
+       }
 }