FIX: Лента (показ всех постов)

+ добавим обработку (image/webp)
LibArea · Apr 5, 2023 · da58cf3 · da58cf3
1 parent 9cd4faf
commit da58cf3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/Core/UploadImage.php b/app/Core/UploadImage.php
@@ -291,7 +291,7 @@ static function createDir($path)
     public static function fileTypeCheck($type, $redirect)
     {
         // permitted
-        $types = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif']; 
+        $types = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp']; 
         if (!in_array($type, $types)) {
             is_return(__('msg.five_format'), 'error', $redirect);
         }

diff --git a/app/Models/HomeModel.php b/app/Models/HomeModel.php
@@ -149,13 +149,15 @@ public static function display($type)
             case 'deleted':
                 $display =  "AND post_is_deleted = 1";
                 break;
-            case 'feed':
             case 'top':
-                $display =  "AND post_is_deleted = 0 AND post_votes >= $countLike AND post_tl <= " . $trust_level;
-                break;
-            default:
+            case 'all':
                 $display =  "AND post_is_deleted = 0 AND post_tl <= " . $trust_level;
                 break;
+            default:
+                $display =  "AND post_is_deleted = 0 AND post_votes >= $countLike AND post_tl <= " . $trust_level;
+                if (UserData::checkActiveUser()) {
+                    $display =  "AND post_is_deleted = 0 AND post_tl <= " . $trust_level;
+                }    
         }
 
         return $display;