DEV: Оптимизируем Services\Parser

LibArea · Jan 14, 2023 · 4e2b0b8 · 4e2b0b8
1 parent abefbb4
commit 4e2b0b8
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 39 deletions.
diff --git a/app/Services/Parser/Content.php b/app/Services/Parser/Content.php
@@ -4,7 +4,7 @@
 
 namespace App\Services\Parser;
 
-use App\Services\Parser\Convert;
+use App\Services\Parser\{Convert, Filter};
 use App\Models\AuditModel;
 use UserData;
 
@@ -122,7 +122,7 @@ public static function cut($text, $length = 800)
         }
 
         if (!$afterCut) {
-            $beforeCut = self::fragment($text, $length);
+            $beforeCut = Filter::fragment($text, $length);
         }
 
         $button = false;
@@ -133,26 +133,6 @@ public static function cut($text, $length = 800)
         return ['content' => $beforeCut, 'button' => $button];
     }
 
-    // Getting a piece of text
-    public static function fragment($text, $lenght = 100, $strip = false)
-    {
-        $charset = 'UTF-8';
-        $token = '~';
-        $end = '...';
-
-        if ($strip) {
-            $text = str_replace('&gt;', '', strip_tags($text));
-        }
-
-        if (mb_strlen($text, $charset) >= $lenght) {
-            $wrap = wordwrap($text, $lenght, $token);
-            $str_cut = mb_substr($wrap, 0, mb_strpos($wrap, $token, 0, $charset), $charset);
-            return $str_cut .= $end;
-        }
-
-        return $text;
-    }
-
     public static function parseUser($content, $with_user = false, $to_uid = false)
     {
         preg_match_all('/@([^@,:\s,]+)/i', strip_tags($content), $matchs);

diff --git a/app/Services/Parser/Filter.php b/app/Services/Parser/Filter.php
@@ -33,14 +33,6 @@ public static function noHTML(string $content, int $lenght = 150)
         return self::fragment($str, $lenght);
     }
 
-    public static function pre($tag, $params, $content)
-    {
-        $content = htmlspecialchars_decode($content);
-
-
-        return '<pre class="lb">' . $content . '</pre>';
-    }
-
     public static function fragment(string $text, int $lenght = 150, string $charset = 'UTF-8')
     {
         if (mb_strlen($text, $charset) >= $lenght) {

diff --git a/public/assets/css/style.css b/public/assets/css/style.css
diff --git a/resources/views/default/content/comment/comment.php b/resources/views/default/content/comment/comment.php
@@ -5,7 +5,7 @@
 
   <?php if (!empty($comment['answer_id'])) : ?>
     <?php if ($comment['answer_published'] == 0 && $comment['answer_user_id'] != UserData::getUserId() && !UserData::checkAdmin()) continue; ?>
-    <div class="gray-600 max-w780">
+    <div class="content-body">
       <div class="flex justify-between gap">
         <div class="flex gap">
           <a class="gray-600 flex gap-min" href="<?= url('profile', ['login' => $comment['login']]); ?>">
@@ -24,7 +24,7 @@
     </div>
   <?php else : ?>
     <?php if ($comment['comment_published'] == 0 && $comment['comment_user_id'] != UserData::getUserId() && !UserData::checkAdmin()) continue; ?>
-    <div class="gray-600 max-w780">
+    <div class="content-body">
       <div class="flex justify-between gap">
         <div class="flex gap">
           <a class="gray-600 flex gap-min" href="<?= url('profile', ['login' => $comment['login']]); ?>">

diff --git a/resources/views/default/content/comment/comments.php b/resources/views/default/content/comment/comments.php
@@ -15,5 +15,4 @@
   <div class="box bg-beige sticky top-sm">
     <?= __('meta.comments_desc'); ?>
   </div>
-</aside>
-<?= insert('/_block/js-msg-flag'); ?>
+</aside>
diff --git a/resources/views/default/content/user/profile/comment.php b/resources/views/default/content/user/profile/comment.php
@@ -14,5 +14,4 @@
       <?= insert('/content/user/profile/sidebar', ['data' => $data]); ?>
     </aside>
   </div>
-</div>
-<?= insert('/_block/js-msg-flag'); ?>
+</div>
diff --git a/resources/views/default/css/components/components.css b/resources/views/default/css/components/components.css
@@ -302,10 +302,12 @@ a:hover > img,
 .trigger img { opacity: 0.8; }
 
 .focus-id:hover { cursor: pointer } 
-
 .underline-hover:hover { text-decoration: underline; }
 
-.content-body { max-width: 780px; }
+.content-body {
+  max-width: 780px;
+  margin-top: 15px;
+}
 
 .content_tree:target,
 .content_tree.edit {