From 67f5d0db8b5fd689b288a315baecece008cf5127 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 14:06:00 +0100
Subject: [PATCH 01/20] Remove laravelista/comments

---
 app/Models/Episode.php                        |   3 +-
 app/Models/Hentai.php                         |   3 +-
 app/Models/User.php                           |   4 +-
 app/Override/Comments/CommentPolicy.php       |  56 -----
 app/Override/Comments/CommentService.php      | 138 ------------
 composer.json                                 |  11 +-
 composer.lock                                 | 196 +-----------------
 resources/views/profile/comments.blade.php    |   2 +-
 .../views/series/partials/comments.blade.php  |   2 +-
 .../views/stream/partials/comments.blade.php  |   2 +-
 .../views/vendor/comments/_comment.blade.php  |  87 --------
 .../views/vendor/comments/_form.blade.php     |  30 ---
 .../comments/components/comments.blade.php    |  80 -------
 13 files changed, 10 insertions(+), 604 deletions(-)
 delete mode 100644 app/Override/Comments/CommentPolicy.php
 delete mode 100644 app/Override/Comments/CommentService.php
 delete mode 100644 resources/views/vendor/comments/_comment.blade.php
 delete mode 100644 resources/views/vendor/comments/_form.blade.php
 delete mode 100644 resources/views/vendor/comments/components/comments.blade.php

diff --git a/app/Models/Episode.php b/app/Models/Episode.php
index eef658e..7029eb3 100644
--- a/app/Models/Episode.php
+++ b/app/Models/Episode.php
@@ -8,7 +8,6 @@ use App\Models\PopularWeekly;
 use App\Models\PopularDaily;
 
 use Conner\Tagging\Taggable;
-use Laravelista\Comments\Commentable;
 use Laravel\Scout\Searchable;
 use Maize\Markable\Markable;
 use Maize\Markable\Models\Like;
@@ -26,7 +25,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Episode extends Model implements Sitemapable
 {
-    use Commentable, Markable, Taggable;
+    use Markable, Taggable;
     use HasFactory;
     use Searchable;
 
diff --git a/app/Models/Hentai.php b/app/Models/Hentai.php
index f17bd6f..c07852a 100644
--- a/app/Models/Hentai.php
+++ b/app/Models/Hentai.php
@@ -10,11 +10,10 @@ use Illuminate\Support\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Conner\Tagging\Taggable;
-use Laravelista\Comments\Commentable;
 
 class Hentai extends Model implements Sitemapable
 {
-    use Commentable, Taggable;
+    use Taggable;
     use HasFactory;
 
     /**
diff --git a/app/Models/User.php b/app/Models/User.php
index e2c7754..fc627a6 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -9,13 +9,11 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Storage;
 
-use Laravelista\Comments\Commenter;
-
 use Illuminate\Support\Facades\DB;
 
 class User extends Authenticatable
 {
-    use HasFactory, Notifiable, Commenter;
+    use HasFactory, Notifiable;
 
     /**
      * The attributes that are mass assignable.
diff --git a/app/Override/Comments/CommentPolicy.php b/app/Override/Comments/CommentPolicy.php
deleted file mode 100644
index 5d473d0..0000000
--- a/app/Override/Comments/CommentPolicy.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Laravelista\Comments;
-
-use Laravelista\Comments\Comment;
-
-class CommentPolicy
-{
-    /**
-     * Can user create the comment
-     *
-     * @param $user
-     * @return bool
-     */
-    public function create($user) : bool
-    {
-        return true;
-    }
-
-    /**
-     * Can user delete the comment
-     *
-     * @param $user
-     * @param Comment $comment
-     * @return bool
-     */
-    public function delete($user, Comment $comment) : bool
-    {
-        return ($user->getKey() == $comment->commenter_id) || $user->is_admin;
-    }
-
-    /**
-     * Can user update the comment
-     *
-     * @param $user
-     * @param Comment $comment
-     * @return bool
-     */
-    public function update($user, Comment $comment) : bool
-    {
-        return $user->getKey() == $comment->commenter_id;
-    }
-
-    /**
-     * Can user reply to the comment
-     *
-     * @param $user
-     * @param Comment $comment
-     * @return bool
-     */
-    public function reply($user, Comment $comment) : bool
-    {
-        return $user->getKey() != $comment->commenter_id;
-    }
-}
-
diff --git a/app/Override/Comments/CommentService.php b/app/Override/Comments/CommentService.php
deleted file mode 100644
index b72f260..0000000
--- a/app/Override/Comments/CommentService.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-namespace Laravelista\Comments;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Validator;
-
-use App\Notifications\CommentNotification;
-use App\Models\User;
-use App\Models\Episode;
-
-class CommentService
-{
-    /**
-     * Handles creating a new comment for given model.
-     * @return mixed the configured comment-model
-     */
-    public function store(Request $request)
-    {
-        // If guest commenting is turned off, authorize this action.
-        if (Config::get('comments.guest_commenting') == false) {
-            Gate::authorize('create-comment', Comment::class);
-        }
-
-        // Define guest rules if user is not logged in.
-        if (!Auth::check()) {
-            $guest_rules = [
-                'guest_name' => 'required|string|max:255',
-                'guest_email' => 'required|string|email|max:255',
-            ];
-        }
-
-        // Merge guest rules, if any, with normal validation rules.
-        Validator::make($request->all(), array_merge($guest_rules ?? [], [
-            'commentable_type' => 'required|string',
-            'commentable_id' => 'required|string|min:1',
-            'message' => 'required|string'
-        ]))->validate();
-
-        $model = $request->commentable_type::findOrFail($request->commentable_id);
-
-        $commentClass = Config::get('comments.model');
-        $comment = new $commentClass;
-
-        if (!Auth::check()) {
-            $comment->guest_name = $request->guest_name;
-            $comment->guest_email = $request->guest_email;
-        } else {
-            $comment->commenter()->associate(Auth::user());
-        }
-
-        $comment->commentable()->associate($model);
-        $comment->comment = $request->message;
-        $comment->approved = !Config::get('comments.approval_required');
-        $comment->save();
-
-        return $comment;
-    }
-
-    /**
-     * Handles updating the message of the comment.
-     * @return mixed the configured comment-model
-     */
-    public function update(Request $request, Comment $comment)
-    {
-        Gate::authorize('edit-comment', $comment);
-
-        Validator::make($request->all(), [
-            'message' => 'required|string'
-        ])->validate();
-
-        $comment->update([
-            'comment' => $request->message
-        ]);
-
-        return $comment;
-    }
-
-    /**
-     * Handles deleting a comment.
-     * @return mixed the configured comment-model
-     */
-    public function destroy(Comment $comment): void
-    {
-        Gate::authorize('delete-comment', $comment);
-
-        if (Config::get('comments.soft_deletes') == true) {
-            $comment->delete();
-        } else {
-            $comment->delete();
-        }
-    }
-
-    /**
-     * Handles creating a reply "comment" to a comment.
-     * @return mixed the configured comment-model
-     */
-    public function reply(Request $request, Comment $comment)
-    {
-        Gate::authorize('reply-to-comment', $comment);
-
-        Validator::make($request->all(), [
-            'message' => 'required|string'
-        ])->validate();
-
-        $commentClass = Config::get('comments.model');
-        $reply = new $commentClass;
-        $reply->commenter()->associate(Auth::user());
-        $reply->commentable()->associate($comment->commentable);
-        $reply->parent()->associate($comment);
-        $reply->comment = $request->message;
-        $reply->approved = !Config::get('comments.approval_required');
-        $reply->save();
-
-        // Notify
-        if ($comment->commentable_type == 'App\Models\Episode') {
-            $episode = Episode::where('id', $comment->commentable_id)->firstOrFail();
-            $url = '/hentai/' . $episode->slug . '#comment-' . $reply->id;
-
-            $user = Auth::user();
-    
-            $parentCommentUser = User::where('id', $comment->commenter_id)->firstOrFail();
-            $parentCommentUser->notify(
-                new CommentNotification(
-                    "{$user->name} replied to your comment.", 
-                    Str::limit($reply->comment, 50), 
-                    $url
-                )
-            );
-        }
-
-        return $reply;
-    }
-}
diff --git a/composer.json b/composer.json
index d0233f2..d59ce9d 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,6 @@
         "laravel/scout": "^10.20",
         "laravel/socialite": "^5.24",
         "laravel/tinker": "^2.10",
-        "laravelista/comments": "dev-l11-compatibility",
         "livewire/livewire": "^3.6.4",
         "maize-tech/laravel-markable": "^2.3.0",
         "meilisearch/meilisearch-php": "^1.16",
@@ -50,19 +49,13 @@
         }
     ],
     "autoload": {
-        "exclude-from-classmap": [
-            "vendor/laravelista/comments/src/CommentPolicy.php",
-            "vendor/laravelista/comments/src/CommentService.php"
-        ],
+        "exclude-from-classmap": [],
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/"
         },
-        "files": [
-            "app/Override/Comments/CommentPolicy.php",
-            "app/Override/Comments/CommentService.php"
-        ]
+        "files": []
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
index cedb267..68a4f97 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "749225dc4ea2aca06f1639bef889cc59",
+    "content-hash": "cf750c98603544d91cf1bdb428866a8f",
     "packages": [
         {
             "name": "brick/math",
@@ -581,56 +581,6 @@
             ],
             "time": "2025-03-06T22:45:56+00:00"
         },
-        {
-            "name": "erusev/parsedown",
-            "version": "1.7.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/erusev/parsedown.git",
-                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
-                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Parsedown": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Emanuil Rusev",
-                    "email": "hello@erusev.com",
-                    "homepage": "http://erusev.com"
-                }
-            ],
-            "description": "Parser for Markdown.",
-            "homepage": "http://parsedown.org",
-            "keywords": [
-                "markdown",
-                "parser"
-            ],
-            "support": {
-                "issues": "https://github.com/erusev/parsedown/issues",
-                "source": "https://github.com/erusev/parsedown/tree/1.7.x"
-            },
-            "time": "2019-12-30T22:54:17+00:00"
-        },
         {
             "name": "firebase/php-jwt",
             "version": "v7.0.2",
@@ -2266,70 +2216,6 @@
             },
             "time": "2025-01-27T14:24:01+00:00"
         },
-        {
-            "name": "laravelista/comments",
-            "version": "dev-l11-compatibility",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/renatokira/comments.git",
-                "reference": "490764a774d520a4d9e43395b472d0f9bf802ef6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/renatokira/comments/zipball/490764a774d520a4d9e43395b472d0f9bf802ef6",
-                "reference": "490764a774d520a4d9e43395b472d0f9bf802ef6",
-                "shasum": ""
-            },
-            "require": {
-                "erusev/parsedown": "^1.7",
-                "illuminate/database": "^9.0|^10.0|^11.0",
-                "illuminate/http": "^9.0|^10.0|^11.0",
-                "illuminate/pagination": "^9.0|^10.0|^11.0",
-                "illuminate/queue": "^9.0|^10.0|^11.0",
-                "illuminate/routing": "^9.0|^10.0|^11.0",
-                "illuminate/support": "^9.0|^10.0|^11.0",
-                "php": "^8.0",
-                "spatie/laravel-honeypot": "^4.5"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Laravelista\\Comments\\ServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laravelista\\Comments\\": "src/"
-                }
-            },
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mario Bašić",
-                    "email": "mario@laravelista.hr",
-                    "homepage": "https://laravelista.hr"
-                }
-            ],
-            "description": "Comments for Laravel.",
-            "keywords": [
-                "comments",
-                "laravel"
-            ],
-            "support": {
-                "source": "https://github.com/renatokira/comments/tree/l11-compatibility"
-            },
-            "funding": [
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/laravelista"
-                }
-            ],
-            "time": "2024-03-16T14:14:11+00:00"
-        },
         {
             "name": "league/commonmark",
             "version": "2.7.1",
@@ -5817,82 +5703,6 @@
             ],
             "time": "2025-05-20T08:42:52+00:00"
         },
-        {
-            "name": "spatie/laravel-honeypot",
-            "version": "4.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/laravel-honeypot.git",
-                "reference": "38d164f14939e943b92771859fc206c74cba8397"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-honeypot/zipball/38d164f14939e943b92771859fc206c74cba8397",
-                "reference": "38d164f14939e943b92771859fc206c74cba8397",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0|^12.0",
-                "illuminate/encryption": "^8.0|^9.0|^10.0|^11.0|^12.0",
-                "illuminate/http": "^8.0|^9.0|^10.0|^11.0|^12.0",
-                "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0",
-                "illuminate/validation": "^8.0|^9.0|^10.0|^11.0|^12.0",
-                "nesbot/carbon": "^2.0|^3.0",
-                "php": "^8.0",
-                "spatie/laravel-package-tools": "^1.9",
-                "symfony/http-foundation": "^5.1.2|^6.0|^7.0"
-            },
-            "require-dev": {
-                "livewire/livewire": "^2.10|^3.0",
-                "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0|^10.0",
-                "pestphp/pest-plugin-livewire": "^1.0|^2.1|^3.0",
-                "phpunit/phpunit": "^9.6|^10.5|^11.5",
-                "spatie/pest-plugin-snapshots": "^1.1|^2.1",
-                "spatie/phpunit-snapshot-assertions": "^4.2|^5.1",
-                "spatie/test-time": "^1.2.1"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Spatie\\Honeypot\\HoneypotServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\Honeypot\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://spatie.be",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Preventing spam submitted through forms",
-            "homepage": "https://github.com/spatie/laravel-honeypot",
-            "keywords": [
-                "laravel-honeypot",
-                "spatie"
-            ],
-            "support": {
-                "source": "https://github.com/spatie/laravel-honeypot/tree/4.6.1"
-            },
-            "funding": [
-                {
-                    "url": "https://spatie.be/open-source/support-us",
-                    "type": "custom"
-                }
-            ],
-            "time": "2025-05-05T13:50:37+00:00"
-        },
         {
             "name": "spatie/laravel-package-tools",
             "version": "1.92.7",
@@ -11900,9 +11710,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "laravelista/comments": 20
-    },
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
diff --git a/resources/views/profile/comments.blade.php b/resources/views/profile/comments.blade.php
index 3f65c5a..22e59fe 100644
--- a/resources/views/profile/comments.blade.php
+++ b/resources/views/profile/comments.blade.php
@@ -65,7 +65,7 @@
                                     </a>
                                 </div>
                                 <div class="md:w-[60vw]">
-                                    @comments(['model' => $episode])
+                                    {{--@comments(['model' => $episode])--}}
                                 </div>
                             </div>
                         @endforeach
diff --git a/resources/views/series/partials/comments.blade.php b/resources/views/series/partials/comments.blade.php
index 811fbd6..1f0589c 100644
--- a/resources/views/series/partials/comments.blade.php
+++ b/resources/views/series/partials/comments.blade.php
@@ -3,6 +3,6 @@
         <p class="leading-normal font-bold text-lg text-rose-600">
             {{ __('home.latest-comments') }}
         </p>
-        @comments(['model' => $hentai])
+        {{--@comments(['model' => $hentai])--}}
     </div>
 </div>
diff --git a/resources/views/stream/partials/comments.blade.php b/resources/views/stream/partials/comments.blade.php
index 1f46bae..6427f85 100644
--- a/resources/views/stream/partials/comments.blade.php
+++ b/resources/views/stream/partials/comments.blade.php
@@ -3,6 +3,6 @@
         <p class="leading-normal font-bold text-lg text-rose-600">
             {{ __('home.latest-comments') }}
         </p>
-        @comments(['model' => $episode])
+        {{--@comments(['model' => $episode])--}}
     </div>
 </div>
diff --git a/resources/views/vendor/comments/_comment.blade.php b/resources/views/vendor/comments/_comment.blade.php
deleted file mode 100644
index ac77b9f..0000000
--- a/resources/views/vendor/comments/_comment.blade.php
+++ /dev/null
@@ -1,87 +0,0 @@
-@inject('markdown', 'Parsedown')
-@php
-    // TODO: There should be a better place for this.
-    $markdown->setSafeMode(true);
-@endphp
-
-
-<div id="comment-{{ $comment->getKey() }}" class="flex rounded-lg p-1 mb-2 ">
-
-    <div class="contents">
-        <img class="w-12 h-12 rounded-lg m-2" src="{{ $comment->commenter->getAvatar() }}" alt="{{ $comment->commenter->name }} Avatar">
-    </div>
-
-    <div class="text-gray-800 dark:text-gray-200">
-        <div>
-            @if($comment->commenter->is_patreon)
-                <h5 class="text-gray-800 dark:text-gray-400">{{ $comment->commenter->name }} <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600 animate-pulse"></i></a> <small class="text-muted">- {{ $comment->created_at->diffForHumans() }}</small></h5>
-            @else
-                <h5 class="text-gray-800 dark:text-gray-400">{{ $comment->commenter->name }} <small class="text-muted">- {{ $comment->created_at->diffForHumans() }}</small></h5>
-            @endif
-        </div>
-        <div style="white-space: pre-wrap;">{!! $markdown->line($comment->comment) !!}</div>
-
-        @if (! Illuminate\Support\Facades\Route::is('profile.comments'))
-        <div>
-            @can('reply-to-comment', $comment)
-                <button data-te-toggle="modal" data-te-target="#reply-modal-{{ $comment->getKey() }}" class="inline-flex items-center px-4 py-2 mt-2 dark:focus:ring-offset-gray-800 bg-rose-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-rose-700 focus:bg-rose-700 active:bg-rose-900 focus:outline-none focus:ring-2 focus:ring-rose-500 focus:ring-offset-2 transition ease-in-out duration-150">@lang('comments::comments.reply')</button>
-            @endcan
-            @can('edit-comment', $comment)
-                <button data-te-toggle="modal" data-te-target="#comment-modal-{{ $comment->getKey() }}" class="inline-flex items-center px-4 py-2 mt-2 dark:focus:ring-offset-gray-800 bg-rose-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-rose-700 focus:bg-rose-700 active:bg-rose-900 focus:outline-none focus:ring-2 focus:ring-rose-500 focus:ring-offset-2 transition ease-in-out duration-150">@lang('comments::comments.edit')</button>
-            @endcan
-            @can('delete-comment', $comment)
-                <a href="{{ route('comments.destroy', $comment->getKey()) }}" onclick="event.preventDefault();document.getElementById('comment-delete-form-{{ $comment->getKey() }}').submit();" class="inline-flex items-center px-4 py-2 bg-red-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-red-500 active:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150 mt-2">@lang('comments::comments.delete')</a>
-                <form id="comment-delete-form-{{ $comment->getKey() }}" action="{{ route('comments.destroy', $comment->getKey()) }}" method="POST" style="display: none;">
-                    @method('DELETE')
-                    @csrf
-                </form>
-            @endcan
-        </div>
-        @endif
-
-
-        @can('edit-comment', $comment)
-            @include('modals.comment-edit')
-        @endcan
-
-        @can('reply-to-comment', $comment)
-            @include('modals.comment-reply')
-        @endcan
-
-        <br />{{-- Margin bottom --}}
-
-        <?php
-            if (!isset($indentationLevel)) {
-                $indentationLevel = 1;
-            } else {
-                $indentationLevel++;
-            }
-        ?>
-
-        {{-- Recursion for children --}}
-        @if($grouped_comments->has($comment->getKey()) && $indentationLevel <= $maxIndentationLevel)
-            {{-- TODO: Don't repeat code. Extract to a new file and include it. --}}
-            @foreach($grouped_comments[$comment->getKey()] as $child)
-                <div class="flex">
-                    <div class="h-[100px]  bg-rose-600 w-[4px] rounded-lg"></div>
-                    @include('comments::_comment', [
-                        'comment' => $child,
-                        'grouped_comments' => $grouped_comments
-                    ])
-                </div>
-            @endforeach
-        @endif
-
-    </div>
-</div>
-
-{{-- Recursion for children --}}
-@if($grouped_comments->has($comment->getKey()) && $indentationLevel > $maxIndentationLevel)
-    {{-- TODO: Don't repeat code. Extract to a new file and include it. --}}
-    @foreach($grouped_comments[$comment->getKey()] as $child)
-        @include('comments::_comment', [
-            'comment' => $child,
-            'grouped_comments' => $grouped_comments
-        ])
-    @endforeach
-@endif
diff --git a/resources/views/vendor/comments/_form.blade.php b/resources/views/vendor/comments/_form.blade.php
deleted file mode 100644
index ecb7536..0000000
--- a/resources/views/vendor/comments/_form.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    <div class="pt-5">
-        @if($errors->has('commentable_type'))
-            <div class="alert alert-danger" role="alert">
-                {{ $errors->first('commentable_type') }}
-            </div>
-        @endif
-        @if($errors->has('commentable_id'))
-            <div class="alert alert-danger" role="alert">
-                {{ $errors->first('commentable_id') }}
-            </div>
-        @endif
-        <form class="block rounded-lg p-6 dark:bg-neutral-700/40" method="POST" action="{{ route('comments.store') }}">
-            @csrf
-            @honeypot
-            <input type="hidden" name="commentable_type" value="\{{ get_class($model) }}" />
-            <input type="hidden" name="commentable_id" value="{{ $model->getKey() }}" />
-
-            <div class="pb-5">
-                <label class="mb-2 text-xl font-medium leading-tight text-gray-800 dark:text-gray-200 w-full" for="message">@lang('comments::comments.enter_your_message_here')</label>
-                <textarea class="peer block min-h-[auto] w-full border-1 bg-transparent px-3 py-[0.32rem] leading-[1.6] outline-none transition-all duration-200 ease-linear dark:placeholder:text-neutral-200 border-gray-300 dark:border-neutral-950 dark:bg-neutral-900 dark:text-gray-300 focus:border-rose-500 dark:focus:border-rose-600 focus:ring-rose-500 dark:focus:ring-rose-600 rounded-md shadow-sm @if($errors->has('message')) is-invalid @endif" name="message" rows="3"></textarea>
-            </div>
-
-            <x-primary-button>
-                @lang('comments::comments.submit')
-            </x-primary-button>
-        </form>
-    </div>
-
-<br />
diff --git a/resources/views/vendor/comments/components/comments.blade.php b/resources/views/vendor/comments/components/comments.blade.php
deleted file mode 100644
index d02a0e0..0000000
--- a/resources/views/vendor/comments/components/comments.blade.php
+++ /dev/null
@@ -1,80 +0,0 @@
-@php
-    if (isset($approved) and $approved == true) {
-        $comments = $model->approvedComments;
-    } else {
-        $comments = $model->comments;
-    }
-@endphp
-
-@if($comments->count() < 1)
-    <div class="mb-4 rounded-lg text-black px-6 py-5 text-base dark:text-neutral-50 bg-white dark:bg-neutral-700/40">@lang('comments::comments.there_are_no_comments')</div>
-@endif
-
-<div>
-    @php
-        $comments = $comments->sortByDesc('created_at');
-
-        if (isset($perPage)) {
-            $page = request()->query('page', 1) - 1;
-
-            $parentComments = $comments->where('child_id', '');
-
-            $slicedParentComments = $parentComments->slice($page * $perPage, $perPage);
-
-            $m = Config::get('comments.model'); // This has to be done like this, otherwise it will complain.
-            $modelKeyName = (new $m)->getKeyName(); // This defaults to 'id' if not changed.
-
-            $slicedParentCommentsIds = $slicedParentComments->pluck($modelKeyName)->toArray();
-
-            // Remove parent Comments from comments.
-            $comments = $comments->where('child_id', '!=', '');
-
-            $grouped_comments = new \Illuminate\Pagination\LengthAwarePaginator(
-                $slicedParentComments->merge($comments)->groupBy('child_id'),
-                $parentComments->count(),
-                $perPage
-            );
-
-            $grouped_comments->withPath(request()->url());
-        } else {
-            $grouped_comments = $comments->groupBy('child_id');
-        }
-    @endphp
-    @foreach($grouped_comments as $comment_id => $comments)
-        {{-- Process parent nodes --}}
-        @if($comment_id == '')
-            @foreach($comments as $comment)
-                @include('comments::_comment', [
-                    'comment' => $comment,
-                    'grouped_comments' => $grouped_comments,
-                    'maxIndentationLevel' => $maxIndentationLevel ?? 3
-                ])
-            @endforeach
-        @endif
-    @endforeach
-</div>
-
-@isset ($perPage)
-    {{ $grouped_comments->links() }}
-@endisset
-
-@if ((! Illuminate\Support\Facades\Route::is('profile.comments')) && (! Illuminate\Support\Facades\Route::is('home.index')))
-    @auth
-        @include('comments::_form')
-    @elseif(Config::get('comments.guest_commenting') == true)
-        @include('comments::_form', [
-            'guest_commenting' => true
-        ])
-    @else
-        <div class="block rounded-lg p-6 shadow-[0_2px_15px_-3px_rgba(0,0,0,0.07),0_10px_20px_-2px_rgba(0,0,0,0.04)] bg-white dark:bg-neutral-700/40">
-            <div class="card-body">
-                <h5 class="mb-2 text-xl font-medium leading-tight text-gray-800 dark:text-gray-200 w-full">@lang('comments::comments.authentication_required')</h5>
-                <p class="mb-2 leading-tight text-gray-800 dark:text-gray-200 w-full">@lang('comments::comments.you_must_login_to_post_a_comment')</p>
-                <br>
-                <a href="{{ route('login') }}" class="relative bg-blue-700 hover:bg-blue-600 text-white font-bold px-6 h-10 rounded pt-2 pb-2" style="width: 12px">
-                    <i class="fa-brands fa-discord"></i> Login
-                </a>
-            </div>
-        </div>
-    @endauth
-@endif

From 5f575024e2f720f5abf1b504a66a126081faba88 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 15:02:14 +0100
Subject: [PATCH 02/20] Add Livewire comment system

---
 app/Livewire/Comment.php                      | 90 +++++++++++++++++
 app/Livewire/Comments.php                     | 56 +++++++++++
 app/Models/Comment.php                        | 61 ++++++++++++
 app/Models/Episode.php                        |  5 +
 app/Models/Presenters/CommentPresenter.php    | 28 ++++++
 app/Policies/CommentPolicy.php                | 22 +++++
 ...026_01_10_120521_create_comments_table.php | 38 +++++++
 .../views/home/partials/comments.blade.php    |  4 +-
 resources/views/livewire/comment.blade.php    | 99 +++++++++++++++++++
 resources/views/livewire/comments.blade.php   | 54 ++++++++++
 resources/views/partials/comment.blade.php    | 22 -----
 resources/views/stream/index.blade.php        |  2 +-
 .../views/stream/partials/comments.blade.php  |  8 --
 13 files changed, 456 insertions(+), 33 deletions(-)
 create mode 100644 app/Livewire/Comment.php
 create mode 100644 app/Livewire/Comments.php
 create mode 100644 app/Models/Comment.php
 create mode 100644 app/Models/Presenters/CommentPresenter.php
 create mode 100644 app/Policies/CommentPolicy.php
 create mode 100644 database/migrations/2026_01_10_120521_create_comments_table.php
 create mode 100644 resources/views/livewire/comment.blade.php
 create mode 100644 resources/views/livewire/comments.blade.php
 delete mode 100644 resources/views/partials/comment.blade.php
 delete mode 100644 resources/views/stream/partials/comments.blade.php

diff --git a/app/Livewire/Comment.php b/app/Livewire/Comment.php
new file mode 100644
index 0000000..65d823f
--- /dev/null
+++ b/app/Livewire/Comment.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Livewire;
+
+use Livewire\Component;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
+class Comment extends Component
+{
+    use AuthorizesRequests;
+
+    public $comment;
+
+    public $isReplying = false;
+
+    public $replyState = [
+        'body' => ''
+    ];
+
+    public $isEditing = false;
+
+    public $editState = [
+        'body' => ''
+    ];
+
+    protected $listeners = [
+        'refresh' => '$refresh'
+    ];
+
+    protected $validationAttributes = [
+        'replyState.body' => 'reply'
+    ];
+
+    public function updatedIsEditing($isEditing)
+    {
+        if (! $isEditing) {
+            return;
+        }
+
+        $this->editState = [
+            'body' => $this->comment->body
+        ];
+    }
+
+    public function editComment()
+    {
+        $this->authorize('update', $this->comment);
+
+        $this->comment->update($this->editState);
+
+        $this->isEditing = false;
+    }
+
+    public function deleteComment()
+    {
+        $this->authorize('destroy', $this->comment);
+
+        $this->comment->delete();
+    }
+
+    public function postReply()
+    {
+        if (! $this->comment->depth() < 2) {
+            return;
+        }
+
+        $this->validate([
+            'replyState.body' => 'required'
+        ]);
+
+        $reply = $this->comment->children()->make($this->replyState);
+        $reply->user()->associate(auth()->user());
+        $reply->commentable()->associate($this->comment->commentable);
+
+        $reply->save();
+
+        $this->replyState = [
+            'body' => ''
+        ];
+
+        $this->isReplying = false;
+
+        $this->dispatch('refresh')->self(); 
+    }
+
+    public function render()
+    {
+        return view('livewire.comment');
+    }
+}
\ No newline at end of file
diff --git a/app/Livewire/Comments.php b/app/Livewire/Comments.php
new file mode 100644
index 0000000..824a4ec
--- /dev/null
+++ b/app/Livewire/Comments.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Livewire;
+
+use Livewire\Component;
+use Livewire\WithPagination;
+
+class Comments extends Component
+{
+    use WithPagination;
+
+    public $model;
+
+    public $newCommentState = [
+      'body' => ''
+    ];
+
+    protected $validationAttributes = [
+        'newCommentState.body' => 'comment'
+    ];
+
+    protected $listeners = [
+        'refresh' => '$refresh'
+    ];
+
+    public function postComment()
+    {
+        $this->validate([
+            'newCommentState.body' => 'required'
+        ]);
+
+        $comment = $this->model->comments()->make($this->newCommentState);
+        $comment->user()->associate(auth()->user());
+        $comment->save();
+
+        $this->newCommentState = [
+            'body' => ''
+        ];
+
+        $this->resetPage();
+    }
+
+    public function render()
+    {
+        $comments = $this->model
+            ->comments()
+            ->with('user', 'children.user', 'children.children')
+            ->parent()
+            ->latest()
+            ->paginate(3);
+
+        return view('livewire.comments', [
+            'comments' => $comments
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/app/Models/Comment.php b/app/Models/Comment.php
new file mode 100644
index 0000000..45b4071
--- /dev/null
+++ b/app/Models/Comment.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\Presenters\CommentPresenter;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class Comment extends Model
+{
+    use HasFactory, SoftDeletes;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var string[]
+     */
+    protected $fillable = [
+        'body'
+    ];
+
+    public function presenter()
+    {
+        return new CommentPresenter($this);
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function scopeParent(Builder $builder)
+    {
+        $builder->whereNull('parent_id');
+    }
+
+    public function children()
+    {
+        return $this->hasMany(Comment::class, 'parent_id')->oldest();
+    }
+
+    public function commentable()
+    {
+        return $this->morphTo();
+    }
+
+    public function parent()
+    {
+        return $this->hasOne(Comment::class, 'id', 'parent_id');
+    }
+
+    // Recursevly calculates how deep the nesting is
+    public function depth(): int
+    {
+        return $this->parent
+            ? $this->parent->depth() + 1
+            : 0;
+    }
+}
diff --git a/app/Models/Episode.php b/app/Models/Episode.php
index 7029eb3..31ef83d 100644
--- a/app/Models/Episode.php
+++ b/app/Models/Episode.php
@@ -160,6 +160,11 @@ class Episode extends Model implements Sitemapable
         return cache()->remember('episodeComments' . $this->id, 300, fn() => $this->comments->count());
     }
 
+    public function comments()
+    {
+        return $this->morphMany(Comment::class, 'commentable');
+    }
+
     public function getProblematicTags(): string
     {
         $problematicTags = ['Gore', 'Scat', 'Horror'];
diff --git a/app/Models/Presenters/CommentPresenter.php b/app/Models/Presenters/CommentPresenter.php
new file mode 100644
index 0000000..645f85f
--- /dev/null
+++ b/app/Models/Presenters/CommentPresenter.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models\Presenters;
+
+use App\Models\Comment;
+use Illuminate\Support\Str;
+
+class CommentPresenter
+{
+    public $comment;
+
+    public function __construct(Comment $comment)
+    {
+        $this->comment = $comment;
+    }
+
+    public function markdownBody()
+    {
+        return Str::of($this->comment->body)->markdown([
+            'html_input' => 'strip',
+        ]);
+    }
+
+    public function relativeCreatedAt()
+    {
+        return $this->comment->created_at->diffForHumans();
+    }
+}
\ No newline at end of file
diff --git a/app/Policies/CommentPolicy.php b/app/Policies/CommentPolicy.php
new file mode 100644
index 0000000..4f52686
--- /dev/null
+++ b/app/Policies/CommentPolicy.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\User;
+use App\Models\Comment;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class CommentPolicy
+{
+    use HandlesAuthorization;
+
+    public function update(User $user, Comment $comment): bool
+    {
+        return $user->id === $comment->user_id;
+    }
+
+    public function destroy(User $user, Comment $comment): bool
+    {
+        return $user->id === $comment->user_id;
+    }
+}
\ No newline at end of file
diff --git a/database/migrations/2026_01_10_120521_create_comments_table.php b/database/migrations/2026_01_10_120521_create_comments_table.php
new file mode 100644
index 0000000..98806de
--- /dev/null
+++ b/database/migrations/2026_01_10_120521_create_comments_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Remame old table from laravelista/comments
+        Schema::rename('comments', 'comments_old');
+
+        Schema::create('comments', function (Blueprint $table) {
+            $table->id();       
+            $table->foreignId('user_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('parent_id')->nullable()->constrained('comments')->cascadeOnDelete();
+            $table->morphs('commentable'); // What is being commented on
+            $table->text('body');
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('comments');
+
+        // Revert to old table from laravelista/comments
+        Schema::rename('comments_old', 'comments');
+    }
+};
diff --git a/resources/views/home/partials/comments.blade.php b/resources/views/home/partials/comments.blade.php
index 5ed6af4..2548d70 100644
--- a/resources/views/home/partials/comments.blade.php
+++ b/resources/views/home/partials/comments.blade.php
@@ -31,7 +31,7 @@
                     </a>
                 </div>
                 <div class="w-[60vw]">
-                    @include('partials.comment', ['comment' => $comment])
+                    {{--@include('partials.comment', ['comment' => $comment])--}}
                 </div>
             </div>
         @elseif($comment->commentable_type == 'App\Models\Hentai')
@@ -53,7 +53,7 @@
                     </a>
                 </div>
                 <div class="w-[60vw]">
-                    @include('partials.comment', ['comment' => $comment])
+                    {{--@include('partials.comment', ['comment' => $comment])--}}
                 </div>
             </div>
         @endif
diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php
new file mode 100644
index 0000000..fccc75d
--- /dev/null
+++ b/resources/views/livewire/comment.blade.php
@@ -0,0 +1,99 @@
+<div>
+    <div class="flex">
+        <div class="flex-shrink-0 mr-4">
+            <img class="h-10 w-10 rounded-full" src="{{ $comment->user->getAvatar() }}" alt="{{ $comment->user->name }}">
+        </div>
+        <div class="flex-grow">
+            <div>
+                <a href="#" class="font-medium text-gray-900">{{ $comment->user->name }}</a>
+            </div>
+            <div class="mt-1 flex-grow w-full">
+                @if ($isEditing)
+                    <form wire:submit.prevent="editComment">
+                        <div>
+                            <label for="comment" class="sr-only">Comment body</label>
+                            <textarea id="comment" name="comment" rows="3"
+                                      class="shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 rounded-md
+                                        @error('editState.body') border-red-500 @enderror"
+                                      placeholder="Write something" wire:model.defer="editState.body"></textarea>
+                            @error('editState.body')
+                            <p class="mt-2 text-sm text-red-500">{{ $message }}</p>
+                            @enderror
+                        </div>
+                        <div class="mt-3 flex items-center justify-between">
+                            <button type="submit"
+                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-rose-500">
+                                Edit
+                            </button>
+                        </div>
+                    </form>
+                @else
+                    <p class="text-gray-700">{!! $comment->presenter()->markdownBody() !!}</p>
+                @endif
+            </div>
+            <div class="mt-2 space-x-2">
+                <span class="text-gray-500 font-medium">
+                    {{ $comment->presenter()->relativeCreatedAt() }}
+                </span>
+                @auth
+                    {{--@if ($comment->hasParent())--}}
+                    @if ($comment->depth() < 2)
+                        <button wire:click="$toggle('isReplying')" type="button" class="text-gray-900 font-medium">
+                            Reply
+                        </button>
+                    @endif
+                    {{--@endif--}}
+
+                    @can ('update', $comment)
+                        <button wire:click="$toggle('isEditing')" type="button" class="text-gray-900 font-medium">
+                            Edit
+                        </button>
+                    @endcan
+
+                    @can ('destroy', $comment)
+                        <button x-data="{
+                            confirmCommentDeletion () {
+                                if (window.confirm('Are you sure you want to delete this comment?')) {
+                                    @this.call('deleteComment');
+                                }
+                            }
+                        }"
+                            @click="confirmCommentDeletion"
+                            type="button"
+                            class="text-gray-900 font-medium"
+                        >
+                            Delete
+                        </button>
+                    @endcan
+                @endauth
+            </div>
+        </div>
+    </div>
+
+    <div class="ml-14 mt-6">
+        @if ($isReplying)
+            <form wire:submit.prevent="postReply" class="my-4">
+                <div>
+                    <label for="comment" class="sr-only">Reply body</label>
+                    <textarea id="comment" name="comment" rows="3"
+                              class="shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 rounded-md
+                                        @error('replyState.body') border-red-500 @enderror"
+                              placeholder="Write something" wire:model.defer="replyState.body"></textarea>
+                    @error('replyState.body')
+                    <p class="mt-2 text-sm text-red-500">{{ $message }}</p>
+                    @enderror
+                </div>
+                <div class="mt-3 flex items-center justify-between">
+                    <button type="submit"
+                            class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-rose-500">
+                        Comment
+                    </button>
+                </div>
+            </form>
+        @endif
+
+        @foreach ($comment->children as $child)
+            <livewire:comment :comment="$child" :key="$child->id"/>
+        @endforeach
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/livewire/comments.blade.php b/resources/views/livewire/comments.blade.php
new file mode 100644
index 0000000..2aa0d26
--- /dev/null
+++ b/resources/views/livewire/comments.blade.php
@@ -0,0 +1,54 @@
+<section>
+    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden">
+        <div class="divide-y divide-gray-200">
+            <div class="px-4 py-5 sm:px-6">
+                <h2 class="text-lg font-medium text-gray-900">Comments</h2>
+            </div>
+            <div class="px-4 py-6 sm:px-6">
+                <div class="space-y-8">
+                    @if ($comments->isNotEmpty())
+                        @foreach($comments as $comment)
+                            <livewire:comment :comment="$comment" :key="$comment->id"/>
+                        @endforeach
+                        {{ $comments->links() }}
+                    @else
+                        <p>No comments yet.</p>
+                    @endif
+                </div>
+            </div>
+        </div>
+        <div class="bg-gray-50 px-4 py-6 sm:px-6">
+            @auth
+                <div class="flex">
+                <div class="flex-shrink-0 mr-4">
+                    <img class="h-10 w-10 rounded-full" src="{{ auth()->user()->getAvatar() }}" alt="{{ auth()->user()->name }}">
+                </div>
+                <div class="min-w-0 flex-1">
+                    <form wire:submit.prevent="postComment">
+                        <div>
+                            <label for="comment" class="sr-only">Comment body</label>
+                            <textarea id="comment" name="comment" rows="3"
+                                      class="shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 rounded-md
+                                        @error('newCommentState.body') border-red-500 @enderror"
+                                      placeholder="Write something" wire:model.defer="newCommentState.body"></textarea>
+                            @error('newCommentState.body')
+                                <p class="mt-2 text-sm text-red-500">{{ $message }}</p>
+                            @enderror
+                        </div>
+                        <div class="mt-3 flex items-center justify-between">
+                            <button type="submit"
+                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-rose-500">
+                                Comment
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+            @endauth
+
+            @guest
+                <p>Log in to comment.</p>
+            @endguest
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/resources/views/partials/comment.blade.php b/resources/views/partials/comment.blade.php
deleted file mode 100644
index c9eb525..0000000
--- a/resources/views/partials/comment.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@inject('markdown', 'Parsedown')
-@php
-    // TODO: There should be a better place for this.
-    $markdown->setSafeMode(true);
-@endphp
-<div id="comment-{{ $comment->id }}" class="flex rounded-lg bg-white p-1 mb-2 shadow-[0_2px_15px_-3px_rgba(0,0,0,0.07),0_10px_20px_-2px_rgba(0,0,0,0.04)] dark:bg-neutral-900">
-    @php $user = cache()->rememberForever('commentUser'.$comment->commenter_id, fn () => \App\Models\User::where('id', $comment->commenter_id)->first()); @endphp
-    <div>
-        <img class="w-16 h-16 rounded-full m-2" src="{{ $user->getAvatar() }}" alt="{{ $user->name }} Avatar">
-    </div>
-    <div class="text-gray-800 dark:text-gray-200">
-        <div>
-            @if($user->is_patreon)
-            <h5 class="text-gray-800 dark:text-gray-400">{{ $user->name }} <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600 animate-pulse"></i></a> <small class="text-muted">- {{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}</small></h5>
-            @else
-            <h5 class="text-gray-800 dark:text-gray-400">{{ $user->name }} <small class="text-muted">- {{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}</small></h5>
-            @endif
-        </div>
-        <div style="white-space: pre-wrap;">{!! $markdown->line($comment->comment) !!}</div>                                    
-        <br />
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/stream/index.blade.php b/resources/views/stream/index.blade.php
index 89fd342..826828d 100644
--- a/resources/views/stream/index.blade.php
+++ b/resources/views/stream/index.blade.php
@@ -26,7 +26,7 @@
                             <!-- Infos -->
                             @include('stream.partials.info')
                             <!-- Comments -->
-                            @include('stream.partials.comments')
+                            <livewire:comments :model="$episode"/>
                         </div>
                         <div class="flex flex-col">
                             @if(! $isMobile)
diff --git a/resources/views/stream/partials/comments.blade.php b/resources/views/stream/partials/comments.blade.php
deleted file mode 100644
index 6427f85..0000000
--- a/resources/views/stream/partials/comments.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="bg-transparent rounded-lg overflow-hidden bg-white dark:bg-neutral-700/40 p-5">
-    <div id="comments" class="grid grid-cols-1 bg-transparent rounded-lg">
-        <p class="leading-normal font-bold text-lg text-rose-600">
-            {{ __('home.latest-comments') }}
-        </p>
-        {{--@comments(['model' => $episode])--}}
-    </div>
-</div>

From 4c2a6024d715ec5848187ba469b083bb1aef753a Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 15:27:37 +0100
Subject: [PATCH 03/20] Add dark mode

---
 resources/views/livewire/comment.blade.php  | 18 ++++++++----------
 resources/views/livewire/comments.blade.php | 16 ++++++++--------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php
index fccc75d..876286a 100644
--- a/resources/views/livewire/comment.blade.php
+++ b/resources/views/livewire/comment.blade.php
@@ -5,7 +5,7 @@
         </div>
         <div class="flex-grow">
             <div>
-                <a href="#" class="font-medium text-gray-900">{{ $comment->user->name }}</a>
+                <p class="font-medium text-gray-900 dark:text-gray-100">{{ $comment->user->name }}</p>
             </div>
             <div class="mt-1 flex-grow w-full">
                 @if ($isEditing)
@@ -13,7 +13,7 @@
                         <div>
                             <label for="comment" class="sr-only">Comment body</label>
                             <textarea id="comment" name="comment" rows="3"
-                                      class="shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 rounded-md
+                                      class="bg-white dark:bg-neutral-700 shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 dark:border-gray-400/40 text-gray-900 dark:text-gray-200 placeholder:text-gray-400 rounded-md
                                         @error('editState.body') border-red-500 @enderror"
                                       placeholder="Write something" wire:model.defer="editState.body"></textarea>
                             @error('editState.body')
@@ -28,24 +28,22 @@
                         </div>
                     </form>
                 @else
-                    <p class="text-gray-700">{!! $comment->presenter()->markdownBody() !!}</p>
+                    <div class="text-gray-700 dark:text-gray-200">{!! $comment->presenter()->markdownBody() !!}</div>
                 @endif
             </div>
             <div class="mt-2 space-x-2">
-                <span class="text-gray-500 font-medium">
+                <span class="text-gray-500 dark:text-gray-300 font-medium">
                     {{ $comment->presenter()->relativeCreatedAt() }}
                 </span>
                 @auth
-                    {{--@if ($comment->hasParent())--}}
                     @if ($comment->depth() < 2)
-                        <button wire:click="$toggle('isReplying')" type="button" class="text-gray-900 font-medium">
+                        <button wire:click="$toggle('isReplying')" type="button" class="text-gray-900 dark:text-gray-100 font-medium">
                             Reply
                         </button>
                     @endif
-                    {{--@endif--}}
 
                     @can ('update', $comment)
-                        <button wire:click="$toggle('isEditing')" type="button" class="text-gray-900 font-medium">
+                        <button wire:click="$toggle('isEditing')" type="button" class="text-gray-900 dark:text-gray-100 font-medium">
                             Edit
                         </button>
                     @endcan
@@ -60,7 +58,7 @@
                         }"
                             @click="confirmCommentDeletion"
                             type="button"
-                            class="text-gray-900 font-medium"
+                            class="text-gray-900 dark:text-gray-100 font-medium"
                         >
                             Delete
                         </button>
@@ -76,7 +74,7 @@
                 <div>
                     <label for="comment" class="sr-only">Reply body</label>
                     <textarea id="comment" name="comment" rows="3"
-                              class="shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 rounded-md
+                              class="bg-white dark:bg-neutral-700 shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 dark:border-gray-400/40 text-gray-900 dark:text-gray-200 placeholder:text-gray-400 rounded-md
                                         @error('replyState.body') border-red-500 @enderror"
                               placeholder="Write something" wire:model.defer="replyState.body"></textarea>
                     @error('replyState.body')
diff --git a/resources/views/livewire/comments.blade.php b/resources/views/livewire/comments.blade.php
index 2aa0d26..7005fc8 100644
--- a/resources/views/livewire/comments.blade.php
+++ b/resources/views/livewire/comments.blade.php
@@ -1,8 +1,8 @@
 <section>
-    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden">
-        <div class="divide-y divide-gray-200">
+    <div class="bg-white dark:bg-neutral-800 shadow sm:rounded-lg sm:overflow-hidden">
+        <div class="divide-y divide-gray-200 dark:divide-gray-400/40">
             <div class="px-4 py-5 sm:px-6">
-                <h2 class="text-lg font-medium text-gray-900">Comments</h2>
+                <h2 class="text-lg font-medium text-gray-900 dark:text-gray-200">Comments</h2>
             </div>
             <div class="px-4 py-6 sm:px-6">
                 <div class="space-y-8">
@@ -12,12 +12,12 @@
                         @endforeach
                         {{ $comments->links() }}
                     @else
-                        <p>No comments yet.</p>
+                        <p class="text-gray-900 dark:text-gray-200">No comments yet.</p>
                     @endif
                 </div>
             </div>
         </div>
-        <div class="bg-gray-50 px-4 py-6 sm:px-6">
+        <div class="bg-gray-50 dark:bg-neutral-800 px-4 py-6 sm:px-6">
             @auth
                 <div class="flex">
                 <div class="flex-shrink-0 mr-4">
@@ -28,7 +28,7 @@
                         <div>
                             <label for="comment" class="sr-only">Comment body</label>
                             <textarea id="comment" name="comment" rows="3"
-                                      class="shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 rounded-md
+                                      class="bg-white dark:bg-neutral-700 shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 dark:border-gray-400/40 text-gray-900 dark:text-gray-200 placeholder:text-gray-400 rounded-md
                                         @error('newCommentState.body') border-red-500 @enderror"
                                       placeholder="Write something" wire:model.defer="newCommentState.body"></textarea>
                             @error('newCommentState.body')
@@ -37,7 +37,7 @@
                         </div>
                         <div class="mt-3 flex items-center justify-between">
                             <button type="submit"
-                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-rose-500">
+                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-rose-500">
                                 Comment
                             </button>
                         </div>
@@ -47,7 +47,7 @@
             @endauth
 
             @guest
-                <p>Log in to comment.</p>
+                <p class="text-gray-900 dark:text-gray-200">Log in to comment.</p>
             @endguest
         </div>
     </div>

From a3b66b483bcece554e9e5b3946c131194d2300e6 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 15:34:05 +0100
Subject: [PATCH 04/20] Add admin and donator badge

---
 resources/views/livewire/comment.blade.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php
index 876286a..4de4f20 100644
--- a/resources/views/livewire/comment.blade.php
+++ b/resources/views/livewire/comment.blade.php
@@ -4,8 +4,14 @@
             <img class="h-10 w-10 rounded-full" src="{{ $comment->user->getAvatar() }}" alt="{{ $comment->user->name }}">
         </div>
         <div class="flex-grow">
-            <div>
+            <div class="flex gap-2">
                 <p class="font-medium text-gray-900 dark:text-gray-100">{{ $comment->user->name }}</p>
+                @if($comment->user->is_admin)
+                <a data-te-toggle="tooltip" title="Admin"><i class="fa-solid fa-crown text-yellow-600"></i></a>
+                @endif
+                @if($comment->user->is_patreon)
+                <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600"></i></a>
+                @endif
             </div>
             <div class="mt-1 flex-grow w-full">
                 @if ($isEditing)

From e136e8e1b663f40018e6dc772628fc9c3ed827bd Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 15:45:41 +0100
Subject: [PATCH 05/20] Refresh on delete

---
 app/Livewire/Comment.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Livewire/Comment.php b/app/Livewire/Comment.php
index 65d823f..cdda05c 100644
--- a/app/Livewire/Comment.php
+++ b/app/Livewire/Comment.php
@@ -56,6 +56,8 @@ class Comment extends Component
         $this->authorize('destroy', $this->comment);
 
         $this->comment->delete();
+
+        $this->dispatch('refresh'); 
     }
 
     public function postReply()

From 6ce0255764b9a37fb54e0b2a822fe8dc57ae71cd Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 15:45:52 +0100
Subject: [PATCH 06/20] Remove ring offset

---
 resources/views/livewire/comment.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php
index 4de4f20..f800ba9 100644
--- a/resources/views/livewire/comment.blade.php
+++ b/resources/views/livewire/comment.blade.php
@@ -28,7 +28,7 @@
                         </div>
                         <div class="mt-3 flex items-center justify-between">
                             <button type="submit"
-                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-rose-500">
+                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-rose-500">
                                 Edit
                             </button>
                         </div>
@@ -89,7 +89,7 @@
                 </div>
                 <div class="mt-3 flex items-center justify-between">
                     <button type="submit"
-                            class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-rose-500">
+                            class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-rose-500">
                         Comment
                     </button>
                 </div>

From 871028930b388654e75a28332a2fb3f1b17f7334 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 16:41:06 +0100
Subject: [PATCH 07/20] Migrate existing comments

---
 ...026_01_10_120521_create_comments_table.php | 38 ----------
 ...26_01_10_120521_migrate_comments_table.php | 75 +++++++++++++++++++
 2 files changed, 75 insertions(+), 38 deletions(-)
 delete mode 100644 database/migrations/2026_01_10_120521_create_comments_table.php
 create mode 100644 database/migrations/2026_01_10_120521_migrate_comments_table.php

diff --git a/database/migrations/2026_01_10_120521_create_comments_table.php b/database/migrations/2026_01_10_120521_create_comments_table.php
deleted file mode 100644
index 98806de..0000000
--- a/database/migrations/2026_01_10_120521_create_comments_table.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        // Remame old table from laravelista/comments
-        Schema::rename('comments', 'comments_old');
-
-        Schema::create('comments', function (Blueprint $table) {
-            $table->id();       
-            $table->foreignId('user_id')->constrained()->cascadeOnDelete();
-            $table->foreignId('parent_id')->nullable()->constrained('comments')->cascadeOnDelete();
-            $table->morphs('commentable'); // What is being commented on
-            $table->text('body');
-            $table->softDeletes();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('comments');
-
-        // Revert to old table from laravelista/comments
-        Schema::rename('comments_old', 'comments');
-    }
-};
diff --git a/database/migrations/2026_01_10_120521_migrate_comments_table.php b/database/migrations/2026_01_10_120521_migrate_comments_table.php
new file mode 100644
index 0000000..94278fc
--- /dev/null
+++ b/database/migrations/2026_01_10_120521_migrate_comments_table.php
@@ -0,0 +1,75 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Drop Foreign Keys and Index
+        Schema::table('comments', function (Blueprint $table) {
+            $table->dropForeign(['child_id']);
+            $table->dropIndex(['commenter_id', 'commenter_type']);
+        });
+
+        // Rename and Drop columns
+        Schema::table('comments', function (Blueprint $table) {
+            $table->renameColumn('commenter_id', 'user_id');
+            $table->dropColumn('commenter_type');
+            $table->dropColumn('guest_name');
+            $table->dropColumn('guest_email');
+            $table->renameColumn('child_id', 'parent_id');
+            $table->renameColumn('comment', 'body');
+            $table->dropColumn('approved');
+        });
+
+        // Add Foreign Keys
+        Schema::table('comments', function (Blueprint $table) {
+            // Ensure the column is unsigned
+            $table->bigInteger('user_id')->unsigned()->change();
+
+            // Add the foreign key constraint
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            $table->foreign('parent_id')->references('id')->on('comments')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Drop Foreign Keys
+        Schema::table('comments', function (Blueprint $table) {
+            $table->dropForeign(['parent_id']);
+            $table->dropForeign(['user_id']);
+        });
+
+        // Rename and Re-Add Columns
+        Schema::table('comments', function (Blueprint $table) {
+            $table->renameColumn('user_id', 'commenter_id');
+            $table->string('commenter_type')->nullable()->after('commenter_id');
+            $table->string('guest_name')->nullable()->after('commenter_type');
+            $table->string('guest_email')->nullable()->after('guest_name');
+            $table->renameColumn('parent_id', 'child_id');
+            $table->renameColumn('body', 'comment');
+            $table->boolean('approved')->default(true)->after('comment');
+        });
+
+        DB::table('comments')->update([
+            'commenter_type' => 'App\Models\User',
+        ]);
+
+        // Re-Add foreign key constraint and index
+        Schema::table('comments', function (Blueprint $table) {
+            $table->foreign('child_id')->references('id')->on('comments')->onDelete('cascade');
+            $table->index(["commenter_id", "commenter_type"]);
+        });
+    }
+};

From 7810cd53fbf4c039398fc3403432ceaee51c7819 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 18:54:48 +0100
Subject: [PATCH 08/20] Add comments to Hentai

---
 app/Models/Hentai.php                              | 5 +++++
 resources/views/series/index.blade.php             | 2 +-
 resources/views/series/partials/comments.blade.php | 8 --------
 3 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 resources/views/series/partials/comments.blade.php

diff --git a/app/Models/Hentai.php b/app/Models/Hentai.php
index c07852a..2c5430a 100644
--- a/app/Models/Hentai.php
+++ b/app/Models/Hentai.php
@@ -36,6 +36,11 @@ class Hentai extends Model implements Sitemapable
         return $this->episodes->first()->title;
     }
 
+    public function comments()
+    {
+        return $this->morphMany(Comment::class, 'commentable');
+    }
+
     /**
      * Has a Gallery.
      */
diff --git a/resources/views/series/index.blade.php b/resources/views/series/index.blade.php
index 0986d93..0e6f84a 100644
--- a/resources/views/series/index.blade.php
+++ b/resources/views/series/index.blade.php
@@ -16,7 +16,7 @@
 
                             @include('series.partials.episodes')
 
-                            @include('series.partials.comments')
+                            <livewire:comments :model="$hentai"/>
                         </div>
 
                         @include('series.partials.popular')
diff --git a/resources/views/series/partials/comments.blade.php b/resources/views/series/partials/comments.blade.php
deleted file mode 100644
index 1f0589c..0000000
--- a/resources/views/series/partials/comments.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="bg-transparent rounded-lg overflow-hidden bg-white dark:bg-neutral-800 p-5">
-    <div id="comments" class="grid grid-cols-1 bg-transparent rounded-lg">
-        <p class="leading-normal font-bold text-lg text-rose-600">
-            {{ __('home.latest-comments') }}
-        </p>
-        {{--@comments(['model' => $hentai])--}}
-    </div>
-</div>

From cfd6af59fb2c2deb8540bebfcb37148512299d9c Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 18:55:47 +0100
Subject: [PATCH 09/20] Add Profile Comment Search (Livewire)

---
 app/Http/Controllers/ProfileController.php    |   4 +-
 app/Livewire/UserComments.php                 |  49 ++++++++
 app/Models/User.php                           |  10 +-
 .../views/livewire/user-comments.blade.php    | 116 ++++++++++++++++++
 resources/views/profile/comments.blade.php    |  59 +--------
 5 files changed, 178 insertions(+), 60 deletions(-)
 create mode 100644 app/Livewire/UserComments.php
 create mode 100644 resources/views/livewire/user-comments.blade.php

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 4d77ea2..c58ece8 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Models\Episode;
-use App\Models\Playlist;
-use App\Models\PlaylistEpisode;
 use App\Models\User;
 use App\Http\Requests\ProfileUpdateRequest;
 use Illuminate\Http\RedirectResponse;
@@ -84,7 +82,7 @@ class ProfileController extends Controller
     public function comments(Request $request): View
     {
         return view('profile.comments', [
-            'user'      => $request->user(),
+            'user' => $request->user(),
         ]);
     }
 
diff --git a/app/Livewire/UserComments.php b/app/Livewire/UserComments.php
new file mode 100644
index 0000000..010dfbb
--- /dev/null
+++ b/app/Livewire/UserComments.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Models\Comment;
+
+use Livewire\Component;
+use Livewire\WithPagination;
+
+class UserComments extends Component
+{
+    use WithPagination;
+
+    public $model;
+
+    public $commentSearch;
+
+    public $order = 'created_at_desc';
+
+    public function render()
+    {
+        $orderby = 'created_at';
+        $orderdirection = 'desc';
+
+        switch ($this->order) {
+            case 'created_at_desc':
+                $orderby = 'created_at';
+                $orderdirection = 'desc';
+                break;
+            case 'created_at_asc':
+                $orderby = 'created_at';
+                $orderdirection = 'asc';
+                break;
+            default:
+                $orderby = 'created_at';
+                $orderdirection = 'desc';
+        }
+
+
+        $comments = Comment::where('user_id', $this->model->id)
+            ->when($this->commentSearch != '', fn ($query) => $query->where('body', 'like', '%'.$this->commentSearch.'%'))
+            ->orderBy($orderby, $orderdirection)
+            ->paginate(10);
+
+        return view('livewire.user-comments', [
+            'comments' => $comments
+        ]);
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index fc627a6..d9de512 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -89,9 +89,17 @@ class User extends Authenticatable
     /**
      * Has Many Comments.
      */
+    public function comments()
+    {
+        return $this->hasMany(Comment::class, 'user_id');
+    }
+
+    /**
+     * Get Comment Count.
+     */
     public function commentCount(): int
     {
-        return DB::table('comments')->where('commenter_id', $this->id)->count();
+        return cache()->remember('userComments' . $this->id, 300, fn() => $this->comments->count());
     }
 
     /**
diff --git a/resources/views/livewire/user-comments.blade.php b/resources/views/livewire/user-comments.blade.php
new file mode 100644
index 0000000..9131288
--- /dev/null
+++ b/resources/views/livewire/user-comments.blade.php
@@ -0,0 +1,116 @@
+<div class="py-3 relative">
+    <div class="mx-auto sm:px-6 lg:px-8 space-y-6 max-w-[100%] lg:max-w-[90%] xl:max-w-[80%] 2xl:max-w-[90%] relative z-10">
+        <!-- Search Filter -->
+        <div class="p-4 sm:p-8 bg-white/30 dark:bg-neutral-950/40 shadow sm:rounded-lg backdrop-blur relative z-100">
+            <div class="grid grid-cols-1 sm:grid-cols-2 gap-4 ">
+
+                <!-- Title -->
+                <div>
+                    <label for="live-search"
+                        class="mb-2 text-sm font-medium text-gray-900 sr-only dark:text-white">Search</label>
+                    <div class="relative right-2 left-0 sm:left-2 transition-all">
+                        <div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
+                            <svg class="w-4 h-4 text-gray-500 dark:text-gray-400" aria-hidden="true"
+                                xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
+                                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                    stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z" />
+                            </svg>
+                        </div>
+
+                        <input wire:model.live.debounce.600ms="commentSearch" type="search" id="live-search"
+                            class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-rose-800 dark:focus:border-rose-900"
+                            placeholder="Search comment..." required>
+
+                        <div class="absolute right-0 top-[11px]" wire:loading>
+                            <svg aria-hidden="true"
+                                class="inline w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-pink-600"
+                                viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path
+                                    d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                                    fill="currentColor" />
+                                <path
+                                    d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                                    fill="currentFill" />
+                            </svg>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Ordering -->
+                <div>
+                    <div class="relative right-2 left-0 sm:left-2 transition-all">
+                        <div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
+                            <i class="fa-solid fa-sort text-gray-500 dark:text-gray-400"></i>
+                        </div>
+                        <select wire:model.live="order"
+                            class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-rose-800 dark:focus:border-rose-900">
+                            <option value="created_at_desc">Created DESC</option>
+                            <option value="created_at_asc">Created ASC</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div
+        class="relative pt-5 mx-auto sm:px-6 lg:px-8 space-y-6 text-gray-900 dark:text-white max-w-[100%] lg:max-w-[90%] xl:max-w-[80%] 2xl:max-w-[90%] 2xl:w-[50vw]">
+        <div class="flex flex-col">
+            <div class="overflow-x-auto sm:-mx-6 lg:-mx-8">
+                <div class="inline-block min-w-full py-2 sm:px-6 lg:px-8">
+                    <div class="overflow-hidden">
+
+                        <!-- Desktop -->
+                        <div class="w-full text-left text-sm font-light">
+                            <!-- Header -->
+                            <div
+                                class="flex bg-white/30 dark:bg-neutral-950/40 backdrop-blur font-medium dark:border-neutral-500 border-b rounded-tl-lg rounded-tr-lg">
+
+                                <div class="flex-1 px-6 py-4 text-center">Comment</div>
+                            </div>
+
+                            <!-- Rows -->
+                            @foreach ($comments as $comment)
+                                <div wire:key="comment-{{ $comment->id }}"
+                                    class="flex flex-col sm:flex-row items-center border-b bg-white dark:bg-neutral-950 dark:border-zinc-700 hover:bg-zinc-100 dark:hover:bg-neutral-800">
+
+                                    <!-- Image -->
+                                    <div class="flex w-fit sm:w-56">
+                                        @if($comment->commentable_type == \App\Models\Episode::class)
+                                            @php $episode = \App\Models\Episode::find($comment->commentable_id); @endphp
+                                            <div class="relative p-1 w-full transition duration-300 ease-in-out md:p-2 md:hover:-translate-y-1 md:hover:scale-110">
+                                                <a href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
+                                                    <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy" width="1000"
+                                                        class="block object-cover object-center relative z-20 rounded-lg aspect-video"
+                                                        src="{{ $episode->gallery->first()->thumbnail_url }}" />
+
+                                                    <p class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
+                                                        <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} 
+                                                        <i class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} 
+                                                        <i class="fa-regular fa-comment"></i> {{ $episode->commentCount() }}
+                                                    </p>
+                                                </a>
+                                            </div>
+                                        @endif
+                                    </div>
+
+                                    <!-- Body -->
+                                    <div class="flex text-lg flex-1 items-center space-x-2 px-3 py-2 bg-neutral-200 dark:bg-neutral-900 h-[115px] rounded-lg sm:mr-2">
+                                        {!! $comment->presenter()->markdownBody() !!}
+
+                                    </div>
+
+                                    <div class="space-x-2 sm:mr-2 w-24">
+                                        <span class="text-gray-500 dark:text-gray-300 font-medium">
+                                            {{ $comment->presenter()->relativeCreatedAt() }}
+                                        </span>
+                                    </div>
+                                </div>
+                            @endforeach
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        {{ $comments->links('pagination::tailwind') }}
+    </div>
+</div>
diff --git a/resources/views/profile/comments.blade.php b/resources/views/profile/comments.blade.php
index 22e59fe..5d9b79c 100644
--- a/resources/views/profile/comments.blade.php
+++ b/resources/views/profile/comments.blade.php
@@ -12,63 +12,10 @@
                 class="relative max-w-[120rem] mx-auto sm:px-6 lg:px-8 space-y-6 pt-20 mt-[65px] flex flex-row justify-center xl:justify-normal">
                 <div class="flex flex-col xl:flex-row">
                     @include('profile.partials.sidebar')
-                    <div class="pb-2  space-y-6 max-w-7xl px-0 md:px-6 lg:px-8 pt-8 xl:pt-0">
+                    <div class="pb-2 space-y-6 max-w-7xl px-0 md:px-6 lg:px-8 pt-8 xl:pt-0 flex flex-row">
+                        
+                        <livewire:user-comments :model="$user"/>
 
-                        @php
-                            $episode_ids = array_unique(
-                                DB::table('comments')
-                                    ->where('commenter_id', $user->id)
-                                    ->get()
-                                    ->pluck('commentable_id')
-                                    ->toArray(),
-                            );
-                        @endphp
-
-                        @foreach ($episode_ids as $episode_id)
-                            @php $episode = App\Models\Episode::where('id', $episode_id)->first(); @endphp
-                            <div
-                                class="flex flex-col 2xl:flex-row p-5 bg-white/40 dark:bg-neutral-950/40 backdrop-blur rounded-lg items-center">
-                                <div
-                                    class="w-[20vw] mr-5 p-1 md:p-2 mb-8 relative transition ease-in-out hover:-translate-y-1 hover:scale-110 duration-300">
-                                    <a class="hidden hover:text-blue-600 md:block"
-                                        href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
-                                        <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy"
-                                            width="1000"
-                                            class="block object-cover object-center relative z-20 rounded-lg aspect-video"
-                                            src="{{ $episode->gallery->first()->thumbnail_url }}"></img>
-                                        <p
-                                            class="absolute right-2 top-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                                            {{ $episode->getResolution() }}</p>
-                                        <p
-                                            class="absolute left-2 bottom-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                                            <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                                                class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i
-                                                class="fa-regular fa-comment"></i>
-                                            {{ $episode->commentCount() }}
-                                        </p>
-                                        <div class="absolute w-[95%] grid grid-cols-1 text-center">
-                                            <p class="text-sm text-center text-black dark:text-white">
-                                                {{ $episode->title }} - {{ $episode->episode }}</p>
-                                        </div>
-                                    </a>
-
-                                    <a class="block hover:text-blue-600 md:hidden"
-                                        href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
-                                        <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy"
-                                            width="1000"
-                                            class="block object-cover object-center relative z-20 rounded-lg"
-                                            src="{{ $episode->cover_url }}"></img>
-                                        <div class="relative w-[95%] grid grid-cols-1 text-center">
-                                            <p class="text-sm text-center text-black dark:text-white">
-                                                {{ $episode->title }} - {{ $episode->episode }}</p>
-                                        </div>
-                                    </a>
-                                </div>
-                                <div class="md:w-[60vw]">
-                                    {{--@comments(['model' => $episode])--}}
-                                </div>
-                            </div>
-                        @endforeach
                     </div>
                 </div>
             </div>

From 13b70fdf2372f5f80f106380e193a168f0c9cc71 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 18:55:53 +0100
Subject: [PATCH 10/20] Misc changes

---
 app/Livewire/Comments.php                        | 2 +-
 resources/views/home/partials/comments.blade.php | 4 ++--
 resources/views/livewire/comments.blade.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Livewire/Comments.php b/app/Livewire/Comments.php
index 824a4ec..b263330 100644
--- a/app/Livewire/Comments.php
+++ b/app/Livewire/Comments.php
@@ -47,7 +47,7 @@ class Comments extends Component
             ->with('user', 'children.user', 'children.children')
             ->parent()
             ->latest()
-            ->paginate(3);
+            ->paginate(50);
 
         return view('livewire.comments', [
             'comments' => $comments
diff --git a/resources/views/home/partials/comments.blade.php b/resources/views/home/partials/comments.blade.php
index 2548d70..9a9eb7c 100644
--- a/resources/views/home/partials/comments.blade.php
+++ b/resources/views/home/partials/comments.blade.php
@@ -4,7 +4,7 @@
 
 <div class="grid grid-cols-1 gap-2 md:grid-cols-2">
     @foreach ($latestComments as $comment)
-        @if ($comment->commentable_type == 'App\Models\Episode')
+        @if ($comment->commentable_type == \App\Models\Episode::class)
             @php $episode = cache()->rememberForever('commentEpisode'.$comment->commentable_id, fn () => App\Models\Episode::with('gallery')->where('id', $comment->commentable_id)->first()); @endphp
             <div id="comments" class="flex p-4 bg-white rounded-lg dark:bg-neutral-950">
                 <div
@@ -34,7 +34,7 @@
                     {{--@include('partials.comment', ['comment' => $comment])--}}
                 </div>
             </div>
-        @elseif($comment->commentable_type == 'App\Models\Hentai')
+        @elseif($comment->commentable_type == \App\Models\Hentai::class)
             @php $hentai = cache()->rememberForever('commentHentai'.$comment->commentable_id, fn () => App\Models\Hentai::with('gallery', 'episodes')->where('id', $comment->commentable_id)->first()); @endphp
             <div id="comments" class="flex p-4 bg-white rounded-lg dark:bg-neutral-950">
                 <div
diff --git a/resources/views/livewire/comments.blade.php b/resources/views/livewire/comments.blade.php
index 7005fc8..85b7c3d 100644
--- a/resources/views/livewire/comments.blade.php
+++ b/resources/views/livewire/comments.blade.php
@@ -10,7 +10,7 @@
                         @foreach($comments as $comment)
                             <livewire:comment :comment="$comment" :key="$comment->id"/>
                         @endforeach
-                        {{ $comments->links() }}
+                        {{ $comments->links('pagination::tailwind') }}
                     @else
                         <p class="text-gray-900 dark:text-gray-200">No comments yet.</p>
                     @endif

From db6da608aa183cfcff3e8a72f31a12ab6f60f2bf Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 19:11:28 +0100
Subject: [PATCH 11/20] Add comments to home page

---
 app/Helpers/CacheHelper.php                   |  3 +-
 .../views/home/partials/comments.blade.php    | 29 ++++++++++++-------
 resources/views/partials/comment.blade.php    | 26 +++++++++++++++++
 3 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 resources/views/partials/comment.blade.php

diff --git a/app/Helpers/CacheHelper.php b/app/Helpers/CacheHelper.php
index 155e044..cde2cee 100644
--- a/app/Helpers/CacheHelper.php
+++ b/app/Helpers/CacheHelper.php
@@ -2,6 +2,7 @@
 
 namespace App\Helpers;
 
+use App\Models\Comment;
 use App\Models\Episode;
 use App\Models\Hentai;
 use App\Models\PopularMonthly;
@@ -126,7 +127,7 @@ class CacheHelper
     public static function getLatestComments()
     {
         return Cache::remember("latest_comments", now()->addMinutes(60), function () {
-            return DB::table('comments')->latest()->take(10)->get();
+            return Comment::latest()->take(10)->get();
         });
     }
 }
diff --git a/resources/views/home/partials/comments.blade.php b/resources/views/home/partials/comments.blade.php
index 9a9eb7c..01c3258 100644
--- a/resources/views/home/partials/comments.blade.php
+++ b/resources/views/home/partials/comments.blade.php
@@ -2,14 +2,14 @@
     {{ __('home.latest-comments') }}
 </p>
 
-<div class="grid grid-cols-1 gap-2 md:grid-cols-2">
+<div class="grid gap-2 grid-cols-1 xl:grid-cols-2">
     @foreach ($latestComments as $comment)
         @if ($comment->commentable_type == \App\Models\Episode::class)
             @php $episode = cache()->rememberForever('commentEpisode'.$comment->commentable_id, fn () => App\Models\Episode::with('gallery')->where('id', $comment->commentable_id)->first()); @endphp
             <div id="comments" class="flex p-4 bg-white rounded-lg dark:bg-neutral-950">
                 <div
-                    class="w-[20vw] mr-5 p-1 md:p-2 mb-8 relative transition ease-in-out hover:-translate-y-1 hover:scale-110 duration-300">
-                    <a class="hidden hover:text-blue-600 xl:block"
+                    class="w-[15vw] mr-5 p-1 md:p-2 mb-4 relative transition ease-in-out hover:-translate-y-1 hover:scale-110 duration-300">
+                    <a class="hidden 2xl:block"
                         href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
                         <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy" width="1000"
                             class="block object-cover object-center relative z-20 rounded-lg aspect-video"
@@ -18,28 +18,28 @@
                             class="absolute right-2 top-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
                             {{ $episode->getResolution() }}</p>
                         <div class="absolute w-[95%] grid grid-cols-1 text-center">
-                            <p class="text-sm text-center text-black dark:text-white">{{ $episode->title }} -
+                            <p class="text-sm text-center text-black dark:text-white truncate">{{ $episode->title }} -
                                 {{ $episode->episode }}</p>
                         </div>
                     </a>
 
-                    <a class="block hover:text-blue-600 xl:hidden"
+                    <a class="block 2xl:hidden"
                         href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
                         <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy" width="1000"
                             class="block object-cover object-center relative z-20 rounded-lg"
                             src="{{ $episode->cover_url }}"></img>
                     </a>
                 </div>
-                <div class="w-[60vw]">
-                    {{--@include('partials.comment', ['comment' => $comment])--}}
+                <div class="w-[60vw] pt-4">
+                    @include('partials.comment', ['comment' => $comment])
                 </div>
             </div>
         @elseif($comment->commentable_type == \App\Models\Hentai::class)
             @php $hentai = cache()->rememberForever('commentHentai'.$comment->commentable_id, fn () => App\Models\Hentai::with('gallery', 'episodes')->where('id', $comment->commentable_id)->first()); @endphp
             <div id="comments" class="flex p-4 bg-white rounded-lg dark:bg-neutral-950">
                 <div
-                    class="w-[20vw] mr-5 p-1 md:p-2 mb-8 relative transition ease-in-out hover:-translate-y-1 hover:scale-110 duration-300">
-                    <a class="hover:text-blue-600" href="{{ route('hentai.index', ['title' => $hentai->slug]) }}">
+                    class="w-[15vw] mr-5 p-1 md:p-2 mb-8 relative transition ease-in-out hover:-translate-y-1 hover:scale-110 duration-300">
+                    <a class="hidden 2xl:block" href="{{ route('hentai.index', ['title' => $hentai->slug]) }}">
                         <img alt="{{ $hentai->episodes->first()->title }}" loading="lazy" width="1000"
                             class="block object-cover object-center relative z-20 rounded-lg aspect-video"
                             src="{{ $hentai->gallery->first()->thumbnail_url }}"></img>
@@ -47,13 +47,20 @@
                             class="absolute  right-2 top-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
                             {{ $hentai->episodes->first()->getResolution() }}</p>
                         <div class="absolute  w-[95%] grid grid-cols-1 text-center">
-                            <p class="text-sm text-center text-black dark:text-white">
+                            <p class="text-sm text-center text-black dark:text-white truncate">
                                 {{ $hentai->episodes->first()->title }}</p>
                         </div>
                     </a>
+
+                    <a class="block 2xl:hidden"
+                        href="{{ route('hentai.index', ['title' => $hentai->slug]) }}">
+                        <img alt="{{ $hentai->episodes->first()->title }}" loading="lazy" width="1000"
+                            class="block object-cover object-center relative z-20 rounded-lg"
+                            src="{{ $hentai->episodes->first()->cover_url }}"></img>
+                    </a>
                 </div>
                 <div class="w-[60vw]">
-                    {{--@include('partials.comment', ['comment' => $comment])--}}
+                    @include('partials.comment', ['comment' => $comment])
                 </div>
             </div>
         @endif
diff --git a/resources/views/partials/comment.blade.php b/resources/views/partials/comment.blade.php
new file mode 100644
index 0000000..1e3b6bc
--- /dev/null
+++ b/resources/views/partials/comment.blade.php
@@ -0,0 +1,26 @@
+<div>
+    <div class="flex">
+        <div class="flex-shrink-0 mr-4">
+            <img class="h-10 w-10 rounded-full" src="{{ $comment->user->getAvatar() }}" alt="{{ $comment->user->name }}">
+        </div>
+        <div class="flex-grow">
+            <div class="flex gap-2">
+                <p class="font-medium text-gray-900 dark:text-gray-100">{{ $comment->user->name }}</p>
+                @if($comment->user->is_admin)
+                <a data-te-toggle="tooltip" title="Admin"><i class="fa-solid fa-crown text-yellow-600"></i></a>
+                @endif
+                @if($comment->user->is_patreon)
+                <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600"></i></a>
+                @endif
+            </div>
+            <div class="mt-1 flex-grow w-full">
+                <div class="text-gray-700 dark:text-gray-200">{!! $comment->presenter()->markdownBody() !!}</div>
+            </div>
+            <div class="mt-2 space-x-2">
+                <span class="text-gray-500 dark:text-gray-300 font-medium">
+                    {{ $comment->presenter()->relativeCreatedAt() }}
+                </span>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

From 41c34e6d8960d0783c2fe07342c155888d65175b Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 19:15:32 +0100
Subject: [PATCH 12/20] Fix style

---
 resources/views/livewire/comment.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php
index f800ba9..d136f2d 100644
--- a/resources/views/livewire/comment.blade.php
+++ b/resources/views/livewire/comment.blade.php
@@ -28,7 +28,7 @@
                         </div>
                         <div class="mt-3 flex items-center justify-between">
                             <button type="submit"
-                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-rose-500">
+                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-rose-500">
                                 Edit
                             </button>
                         </div>

From b133db05735380b0e8de562818bf3aebd3050280 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 19:41:23 +0100
Subject: [PATCH 13/20] Add likes to comments

---
 app/Livewire/Comment.php                   | 39 ++++++++++++++++++++++
 app/Models/Comment.php                     | 17 +++++++++-
 resources/views/livewire/comment.blade.php | 20 ++++++++++-
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Comment.php b/app/Livewire/Comment.php
index cdda05c..bc632cf 100644
--- a/app/Livewire/Comment.php
+++ b/app/Livewire/Comment.php
@@ -1,10 +1,17 @@
 <?php
 
+
 namespace App\Livewire;
 
+use App\Models\User;
+
 use Livewire\Component;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
+use Maize\Markable\Models\Like;
+
 class Comment extends Component
 {
     use AuthorizesRequests;
@@ -13,6 +20,10 @@ class Comment extends Component
 
     public $isReplying = false;
 
+    public $likeCount = 0;
+
+    public $liked = false;
+
     public $replyState = [
         'body' => ''
     ];
@@ -85,6 +96,34 @@ class Comment extends Component
         $this->dispatch('refresh')->self(); 
     }
 
+    public function like()
+    {
+        if (! Auth::check()) {
+            return;
+        }
+
+        Like::toggle($this->comment, User::where('id', Auth::user()->id)->firstOrFail());
+
+        Cache::forget('commentLikes'.$this->comment->id);
+
+        if ($this->liked) {
+            $this->liked = false;
+            $this->likeCount--;
+            return;
+        }
+
+        $this->liked = true;
+        $this->likeCount++;
+    }
+
+    public function mount()
+    {
+        if (Auth::check()) {
+            $this->likeCount = $this->comment->likeCount();
+            $this->liked = Like::has($this->comment, User::where('id', Auth::user()->id)->firstOrFail());
+        }
+    }
+
     public function render()
     {
         return view('livewire.comment');
diff --git a/app/Models/Comment.php b/app/Models/Comment.php
index 45b4071..cc92d83 100644
--- a/app/Models/Comment.php
+++ b/app/Models/Comment.php
@@ -8,9 +8,16 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
+use Maize\Markable\Markable;
+use Maize\Markable\Models\Like;
+
 class Comment extends Model
 {
-    use HasFactory, SoftDeletes;
+    use HasFactory, SoftDeletes, Markable;
+
+    protected static $marks = [
+        Like::class
+    ];
 
     /**
      * The attributes that are mass assignable.
@@ -58,4 +65,12 @@ class Comment extends Model
             ? $this->parent->depth() + 1
             : 0;
     }
+
+    /**
+     * Get cached like count
+     */
+    public function likeCount(): int
+    {
+        return cache()->remember('commentLikes' . $this->id, 300, fn() => $this->likes->count());
+    }
 }
diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php
index d136f2d..4128bbe 100644
--- a/resources/views/livewire/comment.blade.php
+++ b/resources/views/livewire/comment.blade.php
@@ -37,10 +37,28 @@
                     <div class="text-gray-700 dark:text-gray-200">{!! $comment->presenter()->markdownBody() !!}</div>
                 @endif
             </div>
-            <div class="mt-2 space-x-2">
+            <div class="mt-2 space-x-2 flex flex-row">
+                @guest
+                    <span data-te-toggle="tooltip" title="Please login to like the episode" class=" text-gray-800 cursor-pointer dark:text-gray-200">
+                        <i class="fa-regular fa-heart pr-[4px]"></i> {{ $comment->likeCount() }}
+                    </span>
+                @endguest
+
+                @auth
+                    <!-- Like Button -->
+                    <button class="text-xl text-gray-800 dark:text-gray-200 leading-tight cursor-pointer whitespace-nowrap" wire:click="like">
+                        @if ($liked)
+                        <i class="fa-solid fa-heart pr-[4px] text-rose-600"></i> {{ $likeCount }}
+                        @else
+                        <i class="fa-regular fa-heart pr-[4px]"></i> {{ $likeCount }}
+                        @endif
+                    </button>
+                @endauth
+
                 <span class="text-gray-500 dark:text-gray-300 font-medium">
                     {{ $comment->presenter()->relativeCreatedAt() }}
                 </span>
+
                 @auth
                     @if ($comment->depth() < 2)
                         <button wire:click="$toggle('isReplying')" type="button" class="text-gray-900 dark:text-gray-100 font-medium">

From 3259e2197b5d720099f43d57dda1b9a4b1890803 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 19:45:19 +0100
Subject: [PATCH 14/20] Update design comments home page

---
 resources/views/home/partials/comments.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/home/partials/comments.blade.php b/resources/views/home/partials/comments.blade.php
index 01c3258..3edbe96 100644
--- a/resources/views/home/partials/comments.blade.php
+++ b/resources/views/home/partials/comments.blade.php
@@ -30,7 +30,7 @@
                             src="{{ $episode->cover_url }}"></img>
                     </a>
                 </div>
-                <div class="w-[60vw] pt-4">
+                <div class="w-[60vw] pt-4 bg-neutral-100 dark:bg-neutral-800 rounded-lg pl-4">
                     @include('partials.comment', ['comment' => $comment])
                 </div>
             </div>
@@ -59,7 +59,7 @@
                             src="{{ $hentai->episodes->first()->cover_url }}"></img>
                     </a>
                 </div>
-                <div class="w-[60vw]">
+                <div class="w-[60vw] pt-4 bg-neutral-100 dark:bg-neutral-800 rounded-lg pl-4">
                     @include('partials.comment', ['comment' => $comment])
                 </div>
             </div>

From 819e2fde27af9d58f5d48c900011371e9f76a64b Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 20:33:35 +0100
Subject: [PATCH 15/20] Misc changes

---
 resources/views/livewire/comment.blade.php    | 18 ++--
 resources/views/livewire/comments.blade.php   | 90 ++++++++++---------
 .../views/livewire/user-comments.blade.php    | 14 +++
 3 files changed, 71 insertions(+), 51 deletions(-)

diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php
index 4128bbe..2879be9 100644
--- a/resources/views/livewire/comment.blade.php
+++ b/resources/views/livewire/comment.blade.php
@@ -38,27 +38,27 @@
                 @endif
             </div>
             <div class="mt-2 space-x-2 flex flex-row">
+                <span class="text-gray-500 dark:text-gray-300">
+                    {{ $comment->presenter()->relativeCreatedAt() }}
+                </span>
+
                 @guest
-                    <span data-te-toggle="tooltip" title="Please login to like the episode" class=" text-gray-800 cursor-pointer dark:text-gray-200">
-                        <i class="fa-regular fa-heart pr-[4px]"></i> {{ $comment->likeCount() }}
+                    <span data-te-toggle="tooltip" title="Please login to like the episode" class="text-gray-800 cursor-pointer dark:text-gray-200">
+                        <i class="fa-regular fa-heart"></i> {{ $comment->likeCount() }}
                     </span>
                 @endguest
 
                 @auth
                     <!-- Like Button -->
-                    <button class="text-xl text-gray-800 dark:text-gray-200 leading-tight cursor-pointer whitespace-nowrap" wire:click="like">
+                    <button class="text-gray-800 dark:text-gray-200 leading-tight cursor-pointer whitespace-nowrap" wire:click="like">
                         @if ($liked)
-                        <i class="fa-solid fa-heart pr-[4px] text-rose-600"></i> {{ $likeCount }}
+                        <i class="fa-solid fa-heart text-rose-600"></i> {{ $likeCount }}
                         @else
-                        <i class="fa-regular fa-heart pr-[4px]"></i> {{ $likeCount }}
+                        <i class="fa-solid fa-heart"></i> {{ $likeCount }}
                         @endif
                     </button>
                 @endauth
 
-                <span class="text-gray-500 dark:text-gray-300 font-medium">
-                    {{ $comment->presenter()->relativeCreatedAt() }}
-                </span>
-
                 @auth
                     @if ($comment->depth() < 2)
                         <button wire:click="$toggle('isReplying')" type="button" class="text-gray-900 dark:text-gray-100 font-medium">
diff --git a/resources/views/livewire/comments.blade.php b/resources/views/livewire/comments.blade.php
index 85b7c3d..8ba26d4 100644
--- a/resources/views/livewire/comments.blade.php
+++ b/resources/views/livewire/comments.blade.php
@@ -4,51 +4,57 @@
             <div class="px-4 py-5 sm:px-6">
                 <h2 class="text-lg font-medium text-gray-900 dark:text-gray-200">Comments</h2>
             </div>
-            <div class="px-4 py-6 sm:px-6">
-                <div class="space-y-8">
-                    @if ($comments->isNotEmpty())
-                        @foreach($comments as $comment)
-                            <livewire:comment :comment="$comment" :key="$comment->id"/>
-                        @endforeach
-                        {{ $comments->links('pagination::tailwind') }}
-                    @else
-                        <p class="text-gray-900 dark:text-gray-200">No comments yet.</p>
-                    @endif
-                </div>
-            </div>
-        </div>
-        <div class="bg-gray-50 dark:bg-neutral-800 px-4 py-6 sm:px-6">
-            @auth
-                <div class="flex">
-                <div class="flex-shrink-0 mr-4">
-                    <img class="h-10 w-10 rounded-full" src="{{ auth()->user()->getAvatar() }}" alt="{{ auth()->user()->name }}">
-                </div>
-                <div class="min-w-0 flex-1">
-                    <form wire:submit.prevent="postComment">
-                        <div>
-                            <label for="comment" class="sr-only">Comment body</label>
-                            <textarea id="comment" name="comment" rows="3"
-                                      class="bg-white dark:bg-neutral-700 shadow-sm block w-full focus:ring-rose-500 focus:border-rose-500 border-gray-300 dark:border-gray-400/40 text-gray-900 dark:text-gray-200 placeholder:text-gray-400 rounded-md
-                                        @error('newCommentState.body') border-red-500 @enderror"
-                                      placeholder="Write something" wire:model.defer="newCommentState.body"></textarea>
-                            @error('newCommentState.body')
-                                <p class="mt-2 text-sm text-red-500">{{ $message }}</p>
-                            @enderror
+            <div>
+                <!-- Comment Input -->
+                <div class="bg-gray-50 dark:bg-neutral-800 px-4 py-6 sm:px-6">
+                    @auth
+                        <div class="flex">
+                        <div class="flex-shrink-0 mr-4">
+                            <img class="h-10 w-10 rounded-full" src="{{ auth()->user()->getAvatar() }}" alt="{{ auth()->user()->name }}">
                         </div>
-                        <div class="mt-3 flex items-center justify-between">
-                            <button type="submit"
-                                    class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-rose-500">
-                                Comment
-                            </button>
+                        <div class="min-w-0 flex-1">
+                            <form wire:submit.prevent="postComment">
+                                <div>
+                                    <label for="comment" class="sr-only">Comment body</label>
+                                    <textarea id="comment" name="comment" rows="3"
+                                            class="peer block min-h-[auto] w-full border-1 bg-transparent px-3 py-[0.32rem] leading-[1.6] outline-none transition-all duration-200 ease-linear dark:placeholder:text-neutral-200 border-gray-300 dark:border-neutral-950 dark:bg-neutral-900 dark:text-gray-300 focus:border-rose-500 dark:focus:border-rose-600 focus:ring-rose-500 dark:focus:ring-rose-600 rounded-md shadow-sm
+                                                @error('newCommentState.body') border-red-500 @enderror"
+                                            placeholder="Write something" wire:model.defer="newCommentState.body"></textarea>
+                                    @error('newCommentState.body')
+                                        <p class="mt-2 text-sm text-red-500">{{ $message }}</p>
+                                    @enderror
+                                </div>
+                                <div class="mt-3 flex items-center justify-between">
+                                    <button type="submit"
+                                            class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md shadow-sm text-white bg-rose-600 hover:bg-rose-700 focus:outline-none focus:ring-2 focus:ring-rose-500">
+                                        Comment
+                                    </button>
+                                </div>
+                            </form>
                         </div>
-                    </form>
-                </div>
-            </div>
-            @endauth
+                    </div>
+                    @endauth
 
-            @guest
-                <p class="text-gray-900 dark:text-gray-200">Log in to comment.</p>
-            @endguest
+                    @guest
+                        <p class="text-gray-900 dark:text-gray-200">Log in to comment.</p>
+                    @endguest
+                </div>
+
+                <!-- Comments -->
+                <div class="px-4 py-6 sm:px-6">
+                    <div class="space-y-8">
+                        @if ($comments->isNotEmpty())
+                            @foreach($comments as $comment)
+                                <livewire:comment :comment="$comment" :key="$comment->id"/>
+                            @endforeach
+                            {{ $comments->links('pagination::tailwind') }}
+                        @else
+                            <p class="text-gray-900 dark:text-gray-200">No comments yet.</p>
+                        @endif
+                    </div>
+                </div>
+            </div>
         </div>
+
     </div>
 </section>
\ No newline at end of file
diff --git a/resources/views/livewire/user-comments.blade.php b/resources/views/livewire/user-comments.blade.php
index 9131288..59078f6 100644
--- a/resources/views/livewire/user-comments.blade.php
+++ b/resources/views/livewire/user-comments.blade.php
@@ -88,6 +88,20 @@
                                                         <i class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} 
                                                         <i class="fa-regular fa-comment"></i> {{ $episode->commentCount() }}
                                                     </p>
+                                                </a>
+                                            </div>
+                                        @elseif($comment->commentable_type == \App\Models\Hentai::class)
+                                            @php 
+                                                $hentai = \App\Models\Hentai::find($comment->commentable_id);
+                                                $episode = $hentai->episodes->first();
+                                            @endphp
+                                                <div class="relative p-1 w-full transition duration-300 ease-in-out md:p-2 md:hover:-translate-y-1 md:hover:scale-110">
+                                                <a href="{{ route('hentai.index', ['title' => $hentai->slug]) }}">
+                                                    <img alt="{{ $episode->title }}" loading="lazy" width="1000"
+                                                        class="block object-cover object-center relative z-20 rounded-lg aspect-video"
+                                                        src="{{ $episode->gallery->first()->thumbnail_url }}" />
+
+    
                                                 </a>
                                             </div>
                                         @endif

From e949ba955a65c502d569886333a7dca69bf2a5e4 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 21:04:26 +0100
Subject: [PATCH 16/20] Add rate limiter to comment system

---
 app/Livewire/Comment.php  | 15 ++++++++++++++-
 app/Livewire/Comments.php | 19 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Comment.php b/app/Livewire/Comment.php
index bc632cf..66b68e0 100644
--- a/app/Livewire/Comment.php
+++ b/app/Livewire/Comment.php
@@ -8,6 +8,7 @@ use App\Models\User;
 use Livewire\Component;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 use Maize\Markable\Models\Like;
@@ -77,12 +78,24 @@ class Comment extends Component
             return;
         }
 
+        $user = auth()->user();
+        $rateLimitKey = "send-comment:{$user->id}";
+
+        if (RateLimiter::tooManyAttempts($rateLimitKey, 5)) {
+            $seconds = RateLimiter::availableIn($rateLimitKey);
+
+            $this->addError('replyState.body', "Too many comments. Try again in {$seconds} seconds.");
+            return;
+        }
+
+        RateLimiter::hit($rateLimitKey, 60);
+
         $this->validate([
             'replyState.body' => 'required'
         ]);
 
         $reply = $this->comment->children()->make($this->replyState);
-        $reply->user()->associate(auth()->user());
+        $reply->user()->associate($user);
         $reply->commentable()->associate($this->comment->commentable);
 
         $reply->save();
diff --git a/app/Livewire/Comments.php b/app/Livewire/Comments.php
index b263330..75d499a 100644
--- a/app/Livewire/Comments.php
+++ b/app/Livewire/Comments.php
@@ -5,6 +5,8 @@ namespace App\Livewire;
 use Livewire\Component;
 use Livewire\WithPagination;
 
+use Illuminate\Support\Facades\RateLimiter;
+
 class Comments extends Component
 {
     use WithPagination;
@@ -29,8 +31,23 @@ class Comments extends Component
             'newCommentState.body' => 'required'
         ]);
 
+        $this->addError('newCommentState.body', "Too many comments. Try again in 1 seconds.");
+        return;
+
+        $user = auth()->user();
+        $rateLimitKey = "send-comment:{$user->id}";
+
+        if (RateLimiter::tooManyAttempts($rateLimitKey, 5)) {
+            $seconds = RateLimiter::availableIn($rateLimitKey);
+
+            $this->addError('newCommentState.body', "Too many comments. Try again in {$seconds} seconds.");
+            return;
+        }
+
+        RateLimiter::hit($rateLimitKey, 60);
+
         $comment = $this->model->comments()->make($this->newCommentState);
-        $comment->user()->associate(auth()->user());
+        $comment->user()->associate($user);
         $comment->save();
 
         $this->newCommentState = [

From 81038b6c26f982c630bcab675b52246a5d878ea1 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 21:59:08 +0100
Subject: [PATCH 17/20] Add id to comment, so it can autoscroll to that
 notification

---
 resources/views/livewire/comment.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php
index 2879be9..2230dd9 100644
--- a/resources/views/livewire/comment.blade.php
+++ b/resources/views/livewire/comment.blade.php
@@ -1,5 +1,5 @@
 <div>
-    <div class="flex">
+    <div class="flex" id="comment-{{ $comment->id }}">
         <div class="flex-shrink-0 mr-4">
             <img class="h-10 w-10 rounded-full" src="{{ $comment->user->getAvatar() }}" alt="{{ $comment->user->name }}">
         </div>

From ab61574956f43f5f185d4679a3238e3d5e1dd353 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 21:59:53 +0100
Subject: [PATCH 18/20] Fix comment depth chain check

---
 app/Livewire/Comment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Livewire/Comment.php b/app/Livewire/Comment.php
index 66b68e0..d06c7b7 100644
--- a/app/Livewire/Comment.php
+++ b/app/Livewire/Comment.php
@@ -74,7 +74,7 @@ class Comment extends Component
 
     public function postReply()
     {
-        if (! $this->comment->depth() < 2) {
+        if (!($this->comment->depth() < 2)) {
             return;
         }
 

From 268e3eb4c2a149d0688195ce09607dd53a85d862 Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 22:00:09 +0100
Subject: [PATCH 19/20] Add Notification for comments

---
 app/Livewire/Comment.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/Livewire/Comment.php b/app/Livewire/Comment.php
index d06c7b7..6ecd5f9 100644
--- a/app/Livewire/Comment.php
+++ b/app/Livewire/Comment.php
@@ -4,8 +4,12 @@
 namespace App\Livewire;
 
 use App\Models\User;
+use App\Models\Episode;
+use App\Notifications\CommentNotification;
 
 use Livewire\Component;
+
+use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\RateLimiter;
@@ -75,6 +79,7 @@ class Comment extends Component
     public function postReply()
     {
         if (!($this->comment->depth() < 2)) {
+            $this->addError('replyState.body', "Too many sub comments.");
             return;
         }
 
@@ -100,6 +105,22 @@ class Comment extends Component
 
         $reply->save();
 
+        // Notify if Episode and if not the same user
+        if ($reply->commentable_type == Episode::class && $user->id !== $reply->parent->user->id) {
+            $episode = Episode::where('id', $reply->commentable_id)
+                ->firstOrFail();
+            
+            $url = route('hentai.index', ['title' => $episode->slug]);
+
+            $reply->parent->user->notify(
+                new CommentNotification(
+                    "{$user->name} replied to your comment.", 
+                    Str::limit($reply->body, 50), 
+                    "{$url}#comment-{$reply->id}"
+                )
+            );
+        }
+
         $this->replyState = [
             'body' => ''
         ];

From dfedf4058eced0beb901c98efd287aeeaa10b1ec Mon Sep 17 00:00:00 2001
From: w33b <w33b@hstream.moe>
Date: Sat, 10 Jan 2026 22:15:50 +0100
Subject: [PATCH 20/20] Fix rate limit and make it more strict (1 message in 5
 minutes)

---
 app/Livewire/Comment.php  | 5 +++--
 app/Livewire/Comments.php | 8 +++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/Livewire/Comment.php b/app/Livewire/Comment.php
index 6ecd5f9..9fe9bf8 100644
--- a/app/Livewire/Comment.php
+++ b/app/Livewire/Comment.php
@@ -85,15 +85,16 @@ class Comment extends Component
 
         $user = auth()->user();
         $rateLimitKey = "send-comment:{$user->id}";
+        $rateLimitMinutes = 60 * 5; // 5 minutes
 
-        if (RateLimiter::tooManyAttempts($rateLimitKey, 5)) {
+        if (RateLimiter::tooManyAttempts($rateLimitKey, 1)) {
             $seconds = RateLimiter::availableIn($rateLimitKey);
 
             $this->addError('replyState.body', "Too many comments. Try again in {$seconds} seconds.");
             return;
         }
 
-        RateLimiter::hit($rateLimitKey, 60);
+        RateLimiter::hit($rateLimitKey, $rateLimitMinutes);
 
         $this->validate([
             'replyState.body' => 'required'
diff --git a/app/Livewire/Comments.php b/app/Livewire/Comments.php
index 75d499a..156ef60 100644
--- a/app/Livewire/Comments.php
+++ b/app/Livewire/Comments.php
@@ -31,20 +31,18 @@ class Comments extends Component
             'newCommentState.body' => 'required'
         ]);
 
-        $this->addError('newCommentState.body', "Too many comments. Try again in 1 seconds.");
-        return;
-
         $user = auth()->user();
         $rateLimitKey = "send-comment:{$user->id}";
+        $rateLimitMinutes = 60 * 5; // 5 minutes
 
-        if (RateLimiter::tooManyAttempts($rateLimitKey, 5)) {
+        if (RateLimiter::tooManyAttempts($rateLimitKey, 1)) {
             $seconds = RateLimiter::availableIn($rateLimitKey);
 
             $this->addError('newCommentState.body', "Too many comments. Try again in {$seconds} seconds.");
             return;
         }
 
-        RateLimiter::hit($rateLimitKey, 60);
+        RateLimiter::hit($rateLimitKey, $rateLimitMinutes);
 
         $comment = $this->model->comments()->make($this->newCommentState);
         $comment->user()->associate($user);