- 
- 🎉 A Big Thanks To All Our Contributors and Subscribers 🎉 + 🎉 A Big Thanks To All Our Contributors and Donors 🎉
## 📝 Table of Contents @@ -20,66 +19,56 @@ 1. [Introduction](#introduction) 2. [Installation](#installation) 3. [Updating](#updating) -4. [Support UNIT3D](#support) -5. [Funding Issues/Requests](#funding) -6. [Special Thanks](#thanks) +4. [Contributing](#contributing) +5. [License](#license) +6. [Services](#services) +7. [Donations](#donations) +8. [Discord Support](#discord) +9. [Special Thanks](#thanks) ## 🧐 Introduction -We have been developing a Private Torrent Tracker Software called `UNIT3D`. This is a PHP software based on Laravel 11, Livewire and AlpineJS. It is MySQL Strict Mode Compliant, and PHP 8.3 Ready. The code is well-designed and follows the PSR-2 coding style. It uses an MVC Architecture to ensure clarity between logic and presentation. As a hashing algorithm of Bcrypt or Argon2 is used, to ensure a safe and proper way to store the passwords for the users. A lightweight Blade Templating Engine. Caching System Supporting: "apc,” "array,” "database,” "file," "memcached," and "redis" methods. Eloquent and much more! +We have been developing a Private Torrent Tracker Software called `UNIT3D`. This is a PHP software based on Laravel 11, Livewire and AlpineJS. It is MySQL Strict Mode Compliant, and PHP 8.3 Ready. It uses an MVC Architecture to ensure clarity between logic and presentation. ## 🖥️ Installation Check it out here for more information: https://github.com/HDInnovations/UNIT3D-Installer -### Demo Data - -Use this command to generate demo users and torrents for testing purposes in a dev environment: +## 🖥️ Updating -`php artisan demo:seed` +To update your installation to the latest version, run the following command. This will pull the latest changes from the repository and update your instance: -## 🖥️ Updating `php artisan git:update` +## 🤝 Contributing -## ✨ Support UNIT3D +Please read [CONTRIBUTING.md](https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us. -You can support our work if you are enjoying UNIT3D. Sponsors will recieve an email with a Discord invite link to UNIT3Ds Discord server which is used for support and more. +## 📜 License -
+
-Litecoin (LTC) - MDLKyHzupt1mchuo8mrjW9mihkKp1LD4nG
+## 📞 Discord Community
-USDC - 0xB32102d9104d2bfd0D4E3E4069618ADD985a4e2E
+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 [hdinnovations@protonmail.com](mailto:hdinnovations@protonmail.com?subject=[Discord]%20UNIT3D%20)
-USDT (ERC-20) - 0x24c79c41EEAd9d81203ee567fE4bA3a6c81374DB
+## 🎉 Shoutouts
-DOGE - DJ78fQspiu879y3adLbTZVSFABKhKqHE7B
-```
+
+
-## ✨ Funding issues and feature requests
-
-## 🎉 Special Thanks
-
-
-
-
-
-
-
diff --git a/app/Enums/Occupation.php b/app/Enums/Occupation.php
index 431fe1e74b..570825179e 100644
--- a/app/Enums/Occupation.php
+++ b/app/Enums/Occupation.php
@@ -1,4 +1,5 @@
take(5)
->get(),
),
+ 'comments' => cache()->remember(
+ 'latest_comments',
+ $expiresAt,
+ fn () => Comment::query()
+ ->with('user', 'user.group', 'commentable')
+ ->whereHasMorph('commentable', [\App\Models\Torrent::class])
+ ->orWhereHasMorph('commentable', [\App\Models\TorrentRequest::class])
+ ->latest()
+ ->take(5)
+ ->get(),
+ ),
'featured' => cache()->remember(
'latest_featured',
$expiresAt,
diff --git a/app/Http/Controllers/Staff/GroupController.php b/app/Http/Controllers/Staff/GroupController.php
index 1dc02d6239..e9ebc2f9d0 100644
--- a/app/Http/Controllers/Staff/GroupController.php
+++ b/app/Http/Controllers/Staff/GroupController.php
@@ -19,9 +19,8 @@
use App\Http\Controllers\Controller;
use App\Http\Requests\Staff\StoreGroupRequest;
use App\Http\Requests\Staff\UpdateGroupRequest;
-use App\Models\Forum;
+use App\Models\ForumCategory;
use App\Models\Group;
-use App\Models\ForumPermission;
use App\Services\Unit3dAnnounce;
use Illuminate\Support\Str;
@@ -45,7 +44,14 @@ public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vie
*/
public function create(): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
{
- return view('Staff.group.create');
+ return view('Staff.group.create', [
+ 'forumCategories' => ForumCategory::query()
+ ->with([
+ 'forums' => fn ($query) => $query->orderBy('position')
+ ])
+ ->orderBy('position')
+ ->get(),
+ ]);
}
/**
@@ -53,17 +59,9 @@ public function create(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vi
*/
public function store(StoreGroupRequest $request): \Illuminate\Http\RedirectResponse
{
- $group = Group::create(['slug' => Str::slug($request->name)] + $request->validated());
-
- foreach (Forum::pluck('id') as $collection) {
- ForumPermission::create([
- 'forum_id' => $collection,
- 'group_id' => $group->id,
- 'read_topic' => false,
- 'reply_topic' => false,
- 'start_topic' => false,
- ]);
- }
+ $group = Group::create(['slug' => Str::slug($request->validated('group.name'))] + $request->validated('group'));
+
+ $group->permissions()->upsert($request->validated('permissions'), ['forum_id', 'group_id']);
Unit3dAnnounce::addGroup($group);
@@ -77,7 +75,13 @@ public function store(StoreGroupRequest $request): \Illuminate\Http\RedirectResp
public function edit(Group $group): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
{
return view('Staff.group.edit', [
- 'group' => $group,
+ 'group' => $group,
+ 'forumCategories' => ForumCategory::query()
+ ->with([
+ 'forums' => fn ($query) => $query->orderBy('position')
+ ])
+ ->orderBy('position')
+ ->get(),
]);
}
@@ -86,7 +90,9 @@ public function edit(Group $group): \Illuminate\Contracts\View\Factory|\Illumina
*/
public function update(UpdateGroupRequest $request, Group $group): \Illuminate\Http\RedirectResponse
{
- $group->update(['slug' => Str::slug($request->name)] + $request->validated());
+ $group->update(['slug' => Str::slug($request->validated('group.name'))] + $request->validated('group'));
+
+ $group->permissions()->upsert($request->validated('permissions'), ['forum_id', 'group_id']);
cache()->forget('group:'.$group->id);
diff --git a/app/Http/Controllers/Staff/ModerationController.php b/app/Http/Controllers/Staff/ModerationController.php
index d91005aa53..c36a31585c 100644
--- a/app/Http/Controllers/Staff/ModerationController.php
+++ b/app/Http/Controllers/Staff/ModerationController.php
@@ -48,15 +48,15 @@ public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vie
return view('Staff.moderation.index', [
'current' => now(),
'pending' => Torrent::withoutGlobalScope(ApprovedScope::class)
- ->with(['user.group', 'category', 'type', 'resolution', 'category'])
+ ->with(['user.group', 'category', 'type', 'resolution'])
->where('status', '=', Torrent::PENDING)
->get(),
'postponed' => Torrent::withoutGlobalScope(ApprovedScope::class)
- ->with(['user.group', 'moderated.group', 'category', 'type', 'resolution', 'category'])
+ ->with(['user.group', 'moderated.group', 'category', 'type', 'resolution'])
->where('status', '=', Torrent::POSTPONED)
->get(),
'rejected' => Torrent::withoutGlobalScope(ApprovedScope::class)
- ->with(['user.group', 'moderated.group', 'category', 'type', 'resolution', 'category'])
+ ->with(['user.group', 'moderated.group', 'category', 'type', 'resolution'])
->where('status', '=', Torrent::REJECTED)
->get(),
]);
diff --git a/app/Http/Controllers/TorrentPendingController.php b/app/Http/Controllers/TorrentPendingController.php
new file mode 100644
index 0000000000..79a6232556
--- /dev/null
+++ b/app/Http/Controllers/TorrentPendingController.php
@@ -0,0 +1,34 @@
+
+ * @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
+ */
+
+namespace App\Http\Controllers;
+
+use App\Models\Scopes\ApprovedScope;
+use App\Models\Torrent;
+
+class TorrentPendingController extends Controller
+{
+ public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ {
+ return view('torrent.pending', [
+ 'torrents' => Torrent::withoutGlobalScope(ApprovedScope::class)
+ ->with(['category', 'type', 'resolution'])
+ ->where('status', '=', Torrent::PENDING)
+ ->orWhere('status', '=', Torrent::POSTPONED)
+ ->get(),
+ ]);
+ }
+}
diff --git a/app/Http/Controllers/User/TorrentZipController.php b/app/Http/Controllers/User/TorrentZipController.php
index e9925c37ac..aa75e9adf9 100644
--- a/app/Http/Controllers/User/TorrentZipController.php
+++ b/app/Http/Controllers/User/TorrentZipController.php
@@ -35,7 +35,7 @@ public function show(Request $request, User $user): \Illuminate\Http\RedirectRes
set_time_limit(1200);
// Extend The Maximum Memory Limit
- ini_set('memory_limit', '1024M');
+ ini_set('memory_limit', '2048M');
// Authorized User
abort_unless($request->user()->is($user), 403);
diff --git a/app/Http/Livewire/LaravelLogViewer.php b/app/Http/Livewire/LaravelLogViewer.php
index df876048d2..05c5cc326a 100644
--- a/app/Http/Livewire/LaravelLogViewer.php
+++ b/app/Http/Livewire/LaravelLogViewer.php
@@ -64,7 +64,7 @@ final public function logFiles()
}
/**
- * @return \Illuminate\Pagination\LengthAwarePaginator<\Illuminate\Support\Collection