Smilies cache

adaur · adaur · commit 5ec962b0a2fd · 2017-02-17T00:51:03.000+01:00
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
@@ -13,6 +13,7 @@
 use FeatherBB\Core\Error;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
+use FeatherBB\Model\Cache;
 
 class Parser
 {
@@ -23,6 +24,10 @@ public function __construct()
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
+
+        if (!Container::get('cache')->isCached('smilies')) {
+            Container::get('cache')->store('smilies', Cache::getSmilies());
+        }
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Core/Parser.php b/featherbb/Core/Parser.php
@@ -21,6 +21,11 @@ class Parser
     public function __construct()
     {
         $this->cacheDir = ForumEnv::get('FORUM_CACHE_DIR').'/parser';
+
+        // Load smilies
+        if (!Container::get('cache')->isCached('smilies')) {
+            Container::get('smilies')->store('smilies', Cache::getSmilies());
+        }
         $this->smilies = Container::get('cache')->retrieve('smilies');
 
         if (Container::get('cache')->isCached('s9eparser') && Container::get('cache')->isCached('s9erenderer')) {
diff --git a/featherbb/Model/Cache.php b/featherbb/Model/Cache.php
@@ -192,4 +192,19 @@ public static function getGroupPreferences()
 
         return (array) $groupsPreferences;
     }
+
+    public static function getSmilies()
+    {
+        $result = [];
+
+        $smilies = DB::table('smilies')
+                    ->selectMany('text', 'image')
+                    ->findArray();
+
+        foreach ($smilies as $smiley) {
+            $result[$smiley['text']] = $smiley['image'];
+        }
+
+        return $result;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`use FeatherBB\Core\Error;`
`14`	`14`	`use FeatherBB\Core\Url;`
`15`	`15`	`use FeatherBB\Core\Utils;`
	`16`	`+use FeatherBB\Model\Cache;`
`16`	`17`
`17`	`18`	`class Parser`
`18`	`19`	`{`
`@@ -23,6 +24,10 @@ public function __construct()`
`23`	`24`	`if (!User::isAdmin()) {`
`24`	`25`	`throw new Error(__('No permission'), '403');`
`25`	`26`	`}`
	`27`	`+`
	`28`	`+ if (!Container::get('cache')->isCached('smilies')) {`
	`29`	`+ Container::get('cache')->store('smilies', Cache::getSmilies());`
	`30`	`+ }`
`26`	`31`	`}`
`27`	`32`
`28`	`33`	`public function display($req, $res, $args)`