3.6.5

README.md

@@ -1,6 +1,9 @@
 <p align="center"><a href="https://modworkshop.net" target="_blank"><img src="https://modworkshop.net/assets/mws_logo_white.svg" width="200"></a></p>
 
 # ModWorkshop Monorepo
+
+[![Crowdin](https://badges.crowdin.net/modworkshop/localized.svg)](https://crowdin.com/project/modworkshop)
+
 This repository holds all of the code for modworkshop + docker compose + env files.
 
 ## Installing
@@ -22,4 +25,4 @@ On Windows you'll need WSL2.
 
 ## Security
 If you discover a security vulnerability, please submit a [private vulnerability report](https://github.com/ModWorkshop/site/security/advisories/new).
-Alternatively, you can email me directly at luffy@modworkshop.net.
+Alternatively, you can email me directly at luffy@modworkshop.net.

backend/app/Http/Controllers/GameController.php

@@ -10,6 +10,7 @@
 use App\Models\Game;
 use App\Models\AuditLog;
 use App\Models\ModManager;
+use App\Models\Tag;
 use App\Models\User;
 use App\Services\APIService;
 use App\Services\ModService;
@@ -49,6 +50,8 @@ public function update(Request $request, Game $game=null)
             'webhook_url' => 'string|nullable|max:1000',
             'mod_manager_ids' => 'array|nullable',
             'mod_manager_ids.*' => 'integer|min:1|exists:mod_managers,id|nullable',
+            'hidden_tag_ids' => 'array|nullable',
+            'hidden_tag_ids.*' => 'integer|min:1|exists:tags,id|nullable',
             'default_mod_manager_id' => 'exists:mod_managers,id|nullable'
         ];
 
@@ -58,11 +61,13 @@ public function update(Request $request, Game $game=null)
 
         $val = $request->validate($validateArr);
 
+        APIService::nullToEmptyArr($val, 'mod_manager_ids', 'hidden_tag_ids');
         APIService::nullToEmptyStr($val, 'webhook_url', 'buttons');
 
         $thumbnailFile = Arr::pull($val, 'thumbnail_file');
         $bannerFile = Arr::pull($val, 'banner_file');
         $modManagerIds = Arr::pull($val, 'mod_manager_ids');
+        $hiddenTagIds = Arr::pull($val, 'hidden_tag_ids');
 
         $wasCreated = false;
         if (!isset($game)) {
@@ -83,14 +88,27 @@ public function update(Request $request, Game $game=null)
             $modManagerIds = [];
             foreach ($modManagers as $manager) {
                 if (!empty($manager->game_id)) {
-                    abort(406, 'You cannot add mod managers that a game owns.');
+                    abort(406, 'You cannot add mod managers that any game owns.');
                 }
 
                 $modManagerIds[] = $manager->id;
             }
             $game->modManagers()->sync($modManagerIds);
         }
 
+        if (isset($hiddenTagIds)) {
+            $tags = Tag::whereIn('id', $hiddenTagIds)->get();
+            $hiddenTagIds = [];
+            foreach ($tags as $tag) {
+                if (!empty($tag->game_id)) {
+                    abort(406, 'You cannot hide tags that any game owns.');
+                }
+
+                $hiddenTagIds[] = $tag->id;
+            }
+            $game->hiddenTags()->sync($hiddenTagIds);
+        }
+
         APIService::storeImage($thumbnailFile, 'games/images', $game->thumbnail, [
             'thumbnailSize' => 200,
             'onSuccess' => fn($path) => $game->thumbnail = $path,
@@ -109,7 +127,10 @@ public function update(Request $request, Game $game=null)
             $game->update($val);
         }
 
-        return $game;
+        $game->loadMissing('modManagers');
+        $game->loadMissing('hiddenTags');
+
+        return new GameResource($game);
     }
 
     /**
@@ -179,6 +200,7 @@ public function show(Game $game)
 
         $game->loadCount('viewableMods');
         $game->loadMissing('modManagers');
+        $game->loadMissing('hiddenTags');
 
         if (Auth::hasUser()) {
             $game->loadMissing('followed');

backend/app/Http/Controllers/LoginController.php

@@ -94,7 +94,7 @@ public function register(Request $request)
     {
         $val = $request->validate([
             'name' => ['required'],
-            'unique_name' => 'alpha_dash:ascii|nullable|min:3|max:50',
+            'unique_name' => ['alpha_dash:ascii', 'not_regex:/^\d+$/', 'nullable', 'min:3', 'max:50'],
             'email' => ['required', 'email', new \nickurt\StopForumSpam\Rules\IsSpamEmail(2)],
             'password' => ['required', APIService::getPasswordRule(), 'max:128'],
             'avatar_file' => 'nullable|max:512000|mimes:png,webp,avif,gif,jpg',
@@ -290,8 +290,9 @@ public function validateProvider(string $provider)
      */
     public function forgotPassword(Request $request)
     {
-        $request->validate(['email' => 'required|email|max:255']);
-        Password::sendResetLink($request->only('email'));
+        $val = $request->validate(['email' => 'required|email|max:255']);
+        $email = [Str::lower($val['email'])];
+        Password::sendResetLink($email);
         # Is there a need to handle errors?
     }
 

backend/app/Http/Controllers/ModController.php

@@ -288,8 +288,17 @@ public function update(ModUpsertRequest $request, Game $game=null, Mod $mod=null
             $mod = Mod::create($val);
         }
 
+        $tagsHiddenByGame = $mod->game->hiddenTags;
+        $filteredTags = [];
+        foreach ($tags as $tag) {
+            \Log::info('exists?', ['tag' => $tag, 'check' => $tagsHiddenByGame->where('id', $tag)->first()]);
+            if (!$tagsHiddenByGame->where('id', $tag)->first()) {
+                $filteredTags[] = $tag;
+            }
+        }
+
         if(isset($tags)) {
-            $mod->tags()->sync($tags);
+            $mod->tags()->sync($filteredTags);
         }
 
         $currentTags = $mod->tags;

backend/app/Http/Controllers/TagController.php

@@ -28,6 +28,7 @@ public function index(FilteredRequest $request, Game $game=null)
         $val = $request->val([
             'game_id' => 'integer|min:1|nullable|exists:games,id',
             'type' => 'string|in:mod,forum',
+            'show_hidden' => 'boolean|nullable',
             'global' => 'boolean|nullable'
         ]);
 
@@ -39,6 +40,11 @@ public function index(FilteredRequest $request, Game $game=null)
                 }
                 if (isset($val['global']) && $val['global']) {
                     $q->orWhereNull('game_id');
+                    if (isset($gameId) && !($val['show_hidden'] ?? false)) {
+                        $q->whereDoesntHaveIn('gamesHiding', function($q) use($gameId) { // Filters out tags that are hidden by the game
+                            $q->where('game_hidden_tags.game_id', $gameId);
+                        });
+                    }
                 }
                 if (isset($val['type'])) {
                     $q->where(fn($q) => $q->where('type', $val['type'])->orWhere('type', '')->orWhereNull('type'));

backend/app/Http/Controllers/UserController.php

@@ -175,7 +175,7 @@ public function update(Request $request, User $user)
 
         $valRules =[
             'name' => 'string|nullable|min:3|max:30',
-            'unique_name' => 'alpha_dash:ascii|nullable|min:3|max:50',
+            'unique_name' => ['alpha_dash:ascii', 'not_regex:/^\d+$/', 'nullable', 'min:3', 'max:50'],
             'avatar_file' => ['nullable', 'is_image'],
             'custom_color' => 'string|max:7|nullable',
             'bio' => 'string|spam_check|nullable|max:3000',
@@ -344,7 +344,7 @@ public function setUserRoles(Request $request, User $user) {
     public function destroy(Request $request, User $user)
     {
         $val = $request->validate([
-            'unique_name' => 'alpha_dash:ascii|required|min:3|max:50',
+            'unique_name' => ['alpha_dash:ascii', 'not_regex:/^\d+$/', 'nullable', 'min:3', 'max:50'],
             'are_you_sure' => 'required|boolean',
         ]);
 

backend/app/Http/Resources/GameResource.php

@@ -67,6 +67,7 @@ public function toArray($request)
             'announcements' => $this->when($isCurrent, fn() => $this->announcements),
             'mods_count' => $this->whenCounted('viewableMods'),
             'mod_manager_ids' => $this->whenLoaded('modManagers', fn () => Arr::pluck($this->modManagers, 'id')),
+            'hidden_tag_ids' => $this->whenLoaded('hiddenTags', fn () => Arr::pluck($this->hiddenTags, 'id')),
         ];
     }
 }

backend/app/Models/Game.php

@@ -168,6 +168,10 @@ public function modManagers() {
         return $this->belongsToMany(ModManager::class)->without('game');
     }
 
+    public function hiddenTags() {
+        return $this->belongsToMany(Tag::class, 'game_hidden_tags')->without('game');
+    }
+
     /**
      * Returns whether the game is followed by the authenticated user
      */

backend/app/Models/GameHiddenTag.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class GameHiddenTag extends Model
+{
+    public function game(): BelongsTo
+    {
+        return $this->belongsTo(Game::class);
+    }
+
+    public function games() {
+        return $this->belongsToMany(Game::class);
+    }
+
+    public function getMorphClass(): string {
+        return 'game_hidden_tag';
+    }
+}

backend/app/Models/Tag.php

@@ -88,6 +88,10 @@ public function mods() {
         return $this->morphedByMany(Mod::class, 'taggable');
     }
 
+    public function gamesHiding() {
+        return $this->belongsToMany(Tag::class, 'game_hidden_tags')->without('game');
+    }
+
     public function threads() {
         return $this->morphedByMany(Thread::class, 'taggable');
     }

backend/app/Policies/ImagePolicy.php

@@ -46,7 +46,7 @@ public function view(?User $user, Image $image)
      */
     public function create(User $user, Mod $mod)
     {
-        if ($mod->files()->count() >= 25) {
+        if ($mod->images()->count() >= 20) {
             return false;
         }
 

backend/composer.json

@@ -27,6 +27,7 @@
         "lcobucci/jwt": "4.3.0",
         "league/flysystem-aws-s3-v3": "^3.10",
         "mailersend/laravel-driver": "^2.7",
+        "marceloeatworld/plunk-laravel": "^0.1.1",
         "nickurt/laravel-stopforumspam": "^2.0",
         "sentry/sentry-laravel": "^4.1",
         "socialiteproviders/discord": "^4.1",