Typo at addon-directory-name ...

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

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 39de3c20e04a6d74bcdbab0bc53c08c20fa96218..902395997835cd3becc5decb37d10ee6162d5271 100644 (file)
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -14,11 +14,11 @@
  */
 namespace Friendica\Content;
 
-use Friendica\App;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Util\Strings;
 
 /**
  * This class contains functions to handle smiles
@@ -55,10 +55,11 @@ class Smilies
         * Get an array of all smilies, both internal and from addons.
         *
         * @return array
-        *      'texts' => smilie shortcut
-        *      'icons' => icon in html
+        *    'texts' => smilie shortcut
+        *    'icons' => icon in html
         *
-        * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @hook  smilie ('texts' => smilies texts array, 'icons' => smilies html array)
         */
        public static function getList()
        {
@@ -140,7 +141,7 @@ class Smilies
                ];
 
                $params = ['texts' => $texts, 'icons' => $icons];
-               Addon::callHooks('smilie', $params);
+               Hook::callAll('smilie', $params);
 
                return $params;
        }
@@ -182,6 +183,7 @@ class Smilies
         * @param boolean $no_images Only replace emoticons without images
         *
         * @return string HTML Output of the Smilie
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function replace($s, $no_images = false)
        {
@@ -201,6 +203,7 @@ class Smilies
         * @param array  $smilies   An string replacement array with the following structure: ['texts' => [], 'icons' => []]
         * @param bool   $no_images Only replace shortcodes without image replacement (e.g. Unicode characters)
         * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function replaceFromArray($text, array $smilies, $no_images = false)
        {
@@ -241,17 +244,18 @@ class Smilies
         */
        private static function encode($m)
        {
-               return(str_replace($m[1], base64url_encode($m[1]), $m[0]));
+               return(str_replace($m[1], Strings::base64UrlEncode($m[1]), $m[0]));
        }
 
        /**
         * @param string $m string
         *
         * @return string base64 decoded string
+        * @throws \Exception
         */
        private static function decode($m)
        {
-               return(str_replace($m[1], base64url_decode($m[1]), $m[0]));
+               return(str_replace($m[1], Strings::base64UrlDecode($m[1]), $m[0]));
        }
 
 
@@ -262,7 +266,8 @@ class Smilies
         *
         * @return string HTML Output
         *
-        * @todo: Rework because it doesn't work correctly
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @todo  : Rework because it doesn't work correctly
         */
        private static function pregHeart($x)
        {