Merge remote-tracking branch 'origin/version-v1.8.1'

# Conflicts:
#	resources/js/components/FilesView/FileItemGrid.vue
#	resources/js/components/FilesView/FileItemList.vue
#	resources/js/components/Others/ThumbnailItem.vue

app/Http/Controllers/AppFunctionsController.php

@@ -246,4 +246,16 @@ class AppFunctionsController extends Controller
         Artisan::call('config:clear');
         Artisan::call('config:cache');
     }
+    
+    /**
+     * Get Emojis List from the server
+     *
+     * @return $emojisList
+     */
+    public function get_emojis_list()
+    {
+        $emojisList = json_decode(file_get_contents(public_path('assets/emojis.json'), true));
+
+        return collect([$emojisList]);
+    }
 }

app/Http/Tools/Editor.php

@@ -33,23 +33,29 @@ class Editor
      * @param $unique_id
      * @param $shared
      */
-    public static function set_folder_icon ($folder_icon, $unique_id, $shared = null)
+    public static function set_folder_icon($folder_icon, $unique_id, $shared = null)
     {
         $user_id = is_null($shared) ? Auth::id() : $shared->user_id;
 
         // Get folder
         $folder = FileManagerFolder::where('user_id', $user_id)
-        ->where('unique_id', $unique_id)
-        ->first();
-        
+            ->where('unique_id', $unique_id)
+            ->first();
+
+        // Set default folder icon
+        if ($folder_icon === 'default') {
+            $folder->icon_emoji = null;
+            $folder->icon_color = null;
+        }
+
         // If request have emoji set folder icon emoji
-        if(isset($folder_icon['emoji'])) {
+        if (isset($folder_icon['emoji'])) {
             $folder->icon_emoji = $folder_icon['emoji'];
             $folder->icon_color = null;
         }
 
         // If request have color set folder icon color
-        if(isset($folder_icon['color'])) {
+        if (isset($folder_icon['color'])) {
             $folder->icon_emoji = null;
             $folder->icon_color = $folder_icon['color'];
         }
@@ -133,7 +139,7 @@ class Editor
         return Zip::create([
             'user_id'      => $shared->user_id ?? Auth::id(),
             'shared_token' => $shared->token ?? null,
-            'basename' => $zip_name,
+            'basename'     => $zip_name,
         ]);
     }
 
@@ -451,8 +457,8 @@ class Editor
         $limit = get_setting('upload_limit');
 
         // File size handling
-        if( $limit && $file_size > format_bytes($limit)) abort(413);
-    
+        if ($limit && $file_size > format_bytes($limit)) abort(413);
+
         // If last then process file
         if ($request->boolean('is_last')) {