From 23158bc3c87c118b3260e1b9cd42ff0bc48c80ae Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Mon, 6 May 2019 08:27:57 +0200 Subject: [PATCH] add feedback --- src/Module/Smilies.php | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php index df4b4e1cd0..346ae09144 100644 --- 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,22 +12,10 @@ 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(); + $smilies = Content\Smilies::getList(); if (!empty($app->argv[1]) && ($app->argv[1] === "json")) { $results = []; @@ -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, + ]); + } }