Merge pull request #7465 from nupplaphil/task/dice_cache_lock

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

diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index df4b4e1cd0f817f0abed5d6d54a6a886395f96b7..422f37d3e54bbb40df037546c347a954120d60a5 100644 (file)
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -3,6 +3,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Content;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 
@@ -11,24 +12,12 @@ use Friendica\Core\System;
  */
 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()
        {
                $app = self::getApp();
-               $smilies = \Friendica\Content\Smilies::getList();
 
                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 +25,16 @@ class Smilies extends BaseModule
                        System::jsonExit($results);
                }
        }
+
+       public static function content()
+       {
+               $smilies = Content\Smilies::getList();
+               $count = count(defaults($smilies, 'texts', []));
+
+               $tpl = Renderer::getMarkupTemplate('smilies.tpl');
+               return Renderer::replaceMacros($tpl, [
+                       '$count'   => $count,
+                       '$smilies' => $smilies,
+               ]);
+       }
 }