Merge branch 'main' into main

Author: JulianPrieber

.github/workflows/release.yml

@@ -123,6 +123,9 @@ jobs:
 
             # Upload 'linkstack.zip'
             gh release upload "${GITHUB_REF##*/}" "linkstack.zip" --clobber -R "$REPO_NAME"
+
+            # Mark the release as the latest
+            gh release edit "${GITHUB_REF##*/}" --title="${GITHUB_REF##*/}" -R "$REPO_NAME"
           fi
 
       - name: Update version.json

app/Http/Controllers/LinkTypeViewController.php

@@ -38,11 +38,12 @@ public function getParamForm($typeid, $linkId = 0)
 
         if (!empty($linkType) && $linkType->typename === 'predefined') {
             // get buttons list if showing predefined form
-            $buttons = Button::select('name')->orderBy('name', 'asc')->get();
+            $buttons = Button::select()->orderBy('name', 'asc')->get();
             foreach ($buttons as $btn) {
                 $data['buttons'][] = [
                     'name' => $btn->name,
-                    'title' => ucwords($btn->name),
+                    'title' => $btn->alt,
+                    'exclude' => $btn->exclude,
                     'selected' => (is_object($data['params']) && $data['params']->button === $btn->name)
                 ];
             }

app/Http/Controllers/UserController.php

@@ -219,7 +219,7 @@ public function saveLink(request $request)
         $button = Button::where('name', $request->button)->first();
 
         if ($button && empty($LinkTitle))
-            $LinkTitle = ucwords($button->name);
+            $LinkTitle = $button->alt;
 
         if ($linkType->typename == 'video' && empty($LinkTitle)) {
             $embed = OEmbed::get($LinkURL);

app/Models/UserData.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
 
 class UserData extends Model
 {
@@ -11,7 +12,7 @@ class UserData extends Model
 
     public static function saveData($userId, $key, $value)
     {
-        $userData = self::where('id', $userId)->first();
+        $userData = self::getCachedUserData($userId);
 
         if (!$userData) {
             return "null";
@@ -22,35 +23,51 @@ public static function saveData($userId, $key, $value)
 
         $userData->image = json_encode($data);
         $userData->save();
+
+        self::cacheUserData($userId, $userData);
     }
 
     public static function getData($userId, $key)
     {
-        $userData = self::where('id', $userId)->first();
-    
+        $userData = self::getCachedUserData($userId);
+
         if (!$userData || !$userData->image) {
             return "null";
         }
-    
+
         $data = json_decode($userData->image, true) ?? [];
-    
+
         return isset($data[$key]) ? $data[$key] : null;
     }
 
     public static function removeData($userId, $key)
     {
-        $userData = self::where('id', $userId)->first();
-    
+        $userData = self::getCachedUserData($userId);
+
         if (!$userData || !$userData->image) {
             return "null";
         }
-    
+
         $data = json_decode($userData->image, true) ?? [];
-    
+
         if (isset($data[$key])) {
             unset($data[$key]);
             $userData->image = json_encode($data);
             $userData->save();
+
+            self::cacheUserData($userId, $userData);
         }
     }
+
+    private static function getCachedUserData($userId)
+    {
+        return Cache::remember('user_data_' . $userId, now()->addMinutes(10), function () use ($userId) {
+            return self::where('id', $userId)->first();
+        });
+    }
+
+    private static function cacheUserData($userId, $userData)
+    {
+        Cache::put('user_data_' . $userId, $userData, now()->addMinutes(10));
+    }
 }

config/config-legends.json

@@ -16,6 +16,10 @@ public function up()
         Schema::create('buttons', function (Blueprint $table) {
             $table->id();
             $table->string('name');
+            $table->string('alt')->nullable();
+            $table->boolean('exclude')->default(false);
+            $table->string('group')->nullable();
+            $table->boolean('mb')->default(false);
             $table->timestamps();
         });
     }