Merge pull request #4417 from HDInnovations/8.x.x

(Release) v8.3.6

README.md

@@ -1,4 +1,8 @@
-<h1 align="center">UNIT3D Community Edition</h1>
+<h1 align="center">
+    <img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/public/img/hdinnovations.png?raw=true" alt="UNIT3D Logo" width="50px" />
+    <br />
+    UNIT3D Community Edition
+</h1>
 
 <p align="center">
     <a href="http://laravel.com"><img src="https://img.shields.io/badge/Laravel-11-f4645f.svg" /></a>
@@ -22,9 +26,9 @@
 4. [Contributing](#contributing)
 5. [License](#license)
 6. [Services](#services)
-7. [Donations](#donations)
-8. [Discord Support](#discord)
-9. [Special Thanks](#thanks)
+7. [Discord](#discord)
+8. [Donations](#donations)
+9. [Shoutouts](#shoutouts)
 
 
 ## <a name="introduction"></a> 🧐 Introduction
@@ -51,23 +55,42 @@ This project is licensed under the AGPL v3.0 License - see the [LICENSE](https:/
 
 ## <a name="services"></a> 🛠️ Services
 
-HDInnovations offers a variety of services to help you with your UNIT3D instance. We offer services such as installation, updating, server tuning, dependency tuning, themes and custom plugin development. For more information, please visit our email us at [[email protected]](mailto:[email protected]?subject=[Services]%20UNIT3D%20)
+HDInnovations offers a variety of services to help you with your UNIT3D instance. We offer services such as installation, updating, server tuning, dependency tuning, themes, porting from different codebase and more. For more information, please visit our email us at [[email protected]](mailto:[email protected]?subject=[Services]%20UNIT3D%20)
+
+## <a name="discord"></a> 💬 Discord
+
+We have a Discord server for support and general discussion. This is a private server, and you will need to be invited to join. There is a small fee to join the server to help support the development of UNIT3D. For more information, please email us at [[email protected]](mailto:[email protected]?subject=[Discord]%20UNIT3D%20)
 
 ## <a name="donations"></a> 💰 Donations
 
-If you would like to support the development of UNIT3D, please consider donating to keep the project alive. For more information, please email us at [[email protected]](mailto:[email protected]?subject=[Funding]%20UNIT3D%20)
+If you would like to support the development of UNIT3D, please consider donating to keep the project alive. Donors will receive a README [shoutout](#shoutouts) unless chosen to be anonymous. For more information, please email us at [[email protected]](mailto:[email protected]?subject=[Funding]%20UNIT3D%20)
+
+### **Credit / Debit (Square)**
 
 <a href="https://square.link/u/VjB1CNfm" target="_blank"><img alt="unit3d-donate.png" src="public/img/unit3d-donate.png" width="200px"/></a>&nbsp;&nbsp;&nbsp;
 <img alt="unit3d-qr-code.png" src="public/img/unit3d-qr-code.png" width="169px"/>
 
-## <a name="discord"></a> 📞 Discord Community
+### **Crypto**
 
-We have a Discord server for support and general discussion. This is a private server, and you will need to be invited to join. There is a small fee to join the server to help support the development of UNIT3D. For more information, please email us at [[email protected]](mailto:[email protected]?subject=[Discord]%20UNIT3D%20)
+- **Bitcoin (BTC):** `bc1qzgrgfrw2y4x20ywzu49q50ptxg8jeuqv3tmx9v`
+- **Bitcoin via Email (Proton Wallet Only):** `[email protected]`
+
+## <a name="shoutouts"></a> 🎉 Shoutouts
+
+We would like to extend our heartfelt thanks to the following companies, sites and individuals for their generous donations and support in keeping UNIT3D alive:
+
+### 👤 Individuals
+**Poppers,** **x64**
+
+### 🌐 Sites
+<img src="https://i.postimg.cc/BQJmGYMt/blu.png" height="30px;">&nbsp;
+<img src="https://i.postimg.cc/PrK2fWRy/tik.png" height="30px;">&nbsp;
+<img src="https://i.postimg.cc/zDCx6Zw9/fnp.png" height="27px;">&nbsp;
 
-## <a name="thanks"></a> 🎉 Shoutouts
+### 🏢 Companies
+<a href="https://scoutapm.com/?utm_source=github&utm_medium=referral&utm_campaign=opensource_referral"><img src="https://i.postimg.cc/g29XCJDh/Logo-rounded-square-495x495-1.png" height="30px;"></a>&nbsp;
+<a href="https://www.jetbrains.com/?from=UNIT3D"><img src="https://i.imgur.com/KgDXZV8.png" height="30px;"></a>&nbsp;
 
-<a href="https://scoutapm.com/?utm_source=github&utm_medium=referral&utm_campaign=opensource_referral"><img src="https://i.postimg.cc/g29XCJDh/Logo-rounded-square-495x495-1.png" height="50px;"></a>
-<a href="https://www.jetbrains.com/?from=UNIT3D"><img src="https://i.imgur.com/KgDXZV8.png" height="50px;"></a>
 
 
 

app/Console/Commands/AutoSyncPeopleToMeilisearch.php

@@ -47,7 +47,7 @@ public function handle(): void
         $start = now();
 
         $client = new Client(config('scout.meilisearch.host'), config('scout.meilisearch.key'));
-        $index = $client->index('people');
+        $index = $client->index(config('scout.prefix').'people');
 
         $people = Person::all(['id', 'name', 'birthday', 'still']);
 

app/Console/Commands/AutoSyncTorrentsToMeilisearch.php

@@ -48,7 +48,7 @@ public function handle(): void
 
         $client = new Client(config('scout.meilisearch.host'), config('scout.meilisearch.key'));
 
-        $index = $client->getIndex('torrents');
+        $index = $client->getIndex(config('scout.prefix').'torrents');
 
         $index->updatePagination([
             'maxTotalHits' => max(1, Torrent::query()->count()) + 1000,

app/Helpers/Helpers.php

@@ -191,6 +191,8 @@ function language_flag(?string $language): ?string
             'Spanish', 'Spanish (ES)', 'Spanish (CA)', 'Spanish (EU)', 'Spanish (150)' => 'es',
             'Spanish (Latin America)', 'Spanish (LA)', 'Spanish (MX)' => 'mx',
             'Spanish (AR)' => 'ar',
+            'Spanish (CL)' => 'cl',
+            'Spanish (VE)' => 've',
             'Basque', 'Basque (ES)' => 'es-pv',
             'Catalan', 'Catalan (ES)' => 'es-ct',
             'Galician', 'Galician (ES)' => 'es-ga',

app/Http/Controllers/API/QuickSearchController.php

@@ -59,7 +59,7 @@ public function index(Request $request): \Illuminate\Http\JsonResponse
         // Prepare the search queries
         $searchQueries = [
             (new SearchQuery())
-                ->setIndexUid('torrents')
+                ->setIndexUid(config('scout.prefix').'torrents')
                 ->setQuery($searchById ? '' : $query)
                 ->setFilter($filters)
                 ->setDistinct('imdb')
@@ -68,7 +68,7 @@ public function index(Request $request): \Illuminate\Http\JsonResponse
         // Add the people search query only if it's not an ID search
         if (!$searchById) {
             $searchQueries[] = (new SearchQuery())
-                ->setIndexUid('people')
+                ->setIndexUid(config('scout.prefix').'people')
                 ->setQuery($query);
             //->setFederationOptions((new FederationOptions())->setWeight(0.9));
         }
@@ -80,7 +80,7 @@ public function index(Request $request): \Illuminate\Http\JsonResponse
 
         // Process the hits from the multiSearchResults
         foreach ($multiSearchResults['hits'] as $hit) {
-            if ($hit['_federation']['indexUid'] === 'torrents') {
+            if ($hit['_federation']['indexUid'] === config('scout.prefix').'torrents') {
                 $type = $hit['category']['movie_meta'] === true ? 'movie' : 'tv';
 
                 $results[] = [
@@ -91,7 +91,7 @@ public function index(Request $request): \Illuminate\Http\JsonResponse
                     'url'   => route('torrents.similar', ['category_id' => $hit['category']['id'], 'tmdb' => $hit['tmdb']]),
                     'type'  => $type === 'movie' ? 'Movie' : 'TV Series',
                 ];
-            } elseif ($hit['_federation']['indexUid'] === 'people') {
+            } elseif ($hit['_federation']['indexUid'] === config('scout.prefix').'people') {
                 $results[] = [
                     'id'    => $hit['id'],
                     'name'  => $hit['name'],

app/Http/Controllers/PostController.php

@@ -117,7 +117,7 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse
             $topicStarter = $topic->user;
 
             // Notify All Subscribers Of New Reply
-            if ($topicStarter->isNot($user) && $topicStarter->acceptsNotification($user, $topicStarter, 'forum', 'show_forum_topic')) {
+            if ($topicStarter && $topicStarter->isNot($user) && $topicStarter->acceptsNotification($user, $topicStarter, 'forum', 'show_forum_topic')) {
                 $topicStarter->notify(new NewPost('topic', $user, $post));
             }
 

app/Http/Livewire/TorrentSearch.php

@@ -487,7 +487,7 @@ final public function torrents(): \Illuminate\Contracts\Pagination\LengthAwarePa
             $torrents = $torrents->paginate(min($this->perPage, 100));
         } else {
             $client = new Client(config('scout.meilisearch.host'), config('scout.meilisearch.key'));
-            $index = $client->getIndex('torrents');
+            $index = $client->getIndex(config('scout.prefix').'torrents');
 
             $results = $index->search($this->name, [
                 'sort' => [

app/Http/Requests/Staff/UpdateGroupRequest.php

@@ -47,7 +47,7 @@ public function rules(Request $request): array
                     'required',
                     'string',
                 ]),
-                Rule::prohibitedIf($group->system_required && $request->group->name !== $group->name),
+                Rule::prohibitedIf($group->system_required && $request->group['name'] !== $group->name),
             ],
             'group.position' => [
                 'required',

config/unit3d.php

@@ -23,7 +23,7 @@
     |
     */
 
-    'powered-by' => 'Powered By UNIT3D Community Edition v8.3.5',
+    'powered-by' => 'Powered By UNIT3D Community Edition v8.3.6',
 
     /*
     |--------------------------------------------------------------------------
@@ -45,7 +45,7 @@
     |
     */
 
-    'version' => 'v8.3.5',
+    'version' => 'v8.3.6',
 
     /*
     |--------------------------------------------------------------------------

package.json

@@ -21,7 +21,7 @@
     "sass-loader": "^16.0.4",
     "socket.io": "2.4.0",
     "socket.io-client": "2.3.1",
-    "sweetalert2": "^11.15.3",
+    "sweetalert2": "^11.15.10",
     "virtual-select-plugin": "^1.0.46",
     "vue": "^2.6.14",
     "vue-loader": "^15.9.8",

resources/sass/main.scss

@@ -1,89 +1,89 @@
 // Vendor components
-@import 'vendor/alpinejs';
-@import 'vendor/font-awesome';
-@import 'vendor/virtual-select';
-@import 'sweetalert2/src/sweetalert2';
+@use 'vendor/alpinejs';
+@use 'vendor/font-awesome';
+@use 'vendor/virtual-select';
+@use 'sweetalert2/src/sweetalert2';
 
 // Base
-@import 'base/normalize';
-@import 'base/typography';
-@import 'base/reset';
-@import 'base/scrollbar';
+@use 'base/normalize';
+@use 'base/typography';
+@use 'base/reset';
+@use 'base/scrollbar';
 
 // Layout
-@import 'layout/footer';
-@import 'layout/header';
-@import 'layout/main';
-@import 'layout/secondary-nav';
-@import 'layout/top_nav';
+@use 'layout/footer';
+@use 'layout/header';
+@use 'layout/main';
+@use 'layout/secondary-nav';
+@use 'layout/top_nav';
 
 // Components
-@import 'components/achievement';
-@import 'components/alert';
-@import 'components/article-preview';
-@import 'components/bbcode-input';
-@import 'components/bbcode-rendered';
-@import 'components/chatbox';
-@import 'components/collection-card';
-@import 'components/comment';
-@import 'components/comparison';
-@import 'components/data-table';
-@import 'components/dialog';
-@import 'components/donation-package';
-@import 'components/emoji';
-@import 'components/event';
-@import 'components/featured-pane';
-@import 'components/form/button';
-@import 'components/form/checkbox';
-@import 'components/form/fieldset.scss';
-@import 'components/form/file';
-@import 'components/form/form';
-@import 'components/form/form-group';
-@import 'components/form/label';
-@import 'components/form/legend';
-@import 'components/form/meter.scss';
-@import 'components/form/radio';
-@import 'components/form/select';
-@import 'components/form/text';
-@import 'components/form/textarea';
-@import 'components/forum/post';
-@import 'components/forum/subforum-listing';
-@import 'components/forum/topic-listing';
-@import 'components/forum/topic-tag';
-@import 'components/key-value';
-@import 'components/mediahub-card';
-@import 'components/mediainfo';
-@import 'components/meta';
-@import 'components/pagination';
-@import 'components/panel';
-@import 'components/person';
-@import 'components/playlist';
-@import 'components/quick_search';
-@import 'components/random-media';
-@import 'components/swal';
-@import 'components/tooltips';
-@import 'components/torrent-card';
-@import 'components/user-active';
-@import 'components/user-card';
-@import 'components/user-resurrections';
-@import 'components/user-stat-card';
-@import 'components/user-tag';
-@import 'components/user-torrents';
-@import 'components/user-uploads';
+@use 'components/achievement';
+@use 'components/alert';
+@use 'components/article-preview';
+@use 'components/bbcode-input';
+@use 'components/bbcode-rendered';
+@use 'components/chatbox';
+@use 'components/collection-card';
+@use 'components/comment';
+@use 'components/comparison';
+@use 'components/data-table';
+@use 'components/dialog';
+@use 'components/donation-package';
+@use 'components/emoji';
+@use 'components/event';
+@use 'components/featured-pane';
+@use 'components/form/button';
+@use 'components/form/checkbox';
+@use 'components/form/fieldset.scss';
+@use 'components/form/file';
+@use 'components/form/form';
+@use 'components/form/form-group';
+@use 'components/form/label';
+@use 'components/form/legend';
+@use 'components/form/meter.scss';
+@use 'components/form/radio';
+@use 'components/form/select';
+@use 'components/form/text';
+@use 'components/form/textarea';
+@use 'components/forum/post';
+@use 'components/forum/subforum-listing';
+@use 'components/forum/topic-listing';
+@use 'components/forum/topic-tag';
+@use 'components/key-value';
+@use 'components/mediahub-card';
+@use 'components/mediainfo';
+@use 'components/meta';
+@use 'components/pagination';
+@use 'components/panel';
+@use 'components/person';
+@use 'components/playlist';
+@use 'components/quick_search';
+@use 'components/random-media';
+@use 'components/swal';
+@use 'components/tooltips';
+@use 'components/torrent-card';
+@use 'components/user-active';
+@use 'components/user-card';
+@use 'components/user-resurrections';
+@use 'components/user-stat-card';
+@use 'components/user-tag';
+@use 'components/user-torrents';
+@use 'components/user-uploads';
 
 // Pages
-@import 'pages/error';
-@import 'pages/home';
-@import 'pages/missing';
-@import 'pages/notifications';
-@import 'pages/overview';
-@import 'pages/request';
-@import 'pages/staff';
-@import 'pages/stats';
-@import 'pages/top10';
-@import 'pages/torrent';
-@import 'pages/torrents';
-@import 'pages/user';
+@use 'pages/error';
+@use 'pages/home';
+@use 'pages/missing';
+@use 'pages/notifications';
+@use 'pages/overview';
+@use 'pages/request';
+@use 'pages/staff';
+@use 'pages/stats';
+@use 'pages/top10';
+@use 'pages/torrent';
+@use 'pages/torrents';
+@use 'pages/user';
 
 // Shame
-@import 'shame';
+@use 'shame';

resources/sass/themes/_dark-blue.scss

@@ -1,3 +1,4 @@
+@use 'sass:meta';
 /* 2014 material design colors from https://material.io/design/color/the-color-system.html#tools-for-picking-colors */
 
 /*
@@ -49,4 +50,4 @@ A700 #2962FF
     --gradient-background: radial-gradient(at 30% top, #072e46 0%, #081c24 70%);
 }
 
-@import 'dark-base';
+@include meta.load-css('dark-base');

resources/sass/themes/_dark-green.scss

@@ -1,3 +1,4 @@
+@use 'sass:meta';
 /* 2014 material design colors from https://material.io/design/color/the-color-system.html#tools-for-picking-colors */
 
 /*
@@ -49,4 +50,4 @@ A700 #00C853
     --gradient-background: radial-gradient(at 30% top, #074034 0%, #081c24 70%);
 }
 
-@import 'dark-base';
+@include meta.load-css('dark-base');

resources/sass/themes/_dark-pink.scss

@@ -1,3 +1,4 @@
+@use 'sass:meta';
 /* 2014 material design colors from https://material.io/design/color/the-color-system.html#tools-for-picking-colors */
 
 /*
@@ -49,4 +50,4 @@ A700 #C51162
     --gradient-background: radial-gradient(at 30% top, #341a38 0%, #081c24 70%);
 }
 
-@import 'dark-base';
+@include meta.load-css('dark-base');