Update StatusTagsPipeline, fix hashtag bug and formatting

app/Jobs/StatusPipeline/StatusTagsPipeline.php

@@ -2,27 +2,28 @@
 
 namespace App\Jobs\StatusPipeline;
 
+use App\Hashtag;
+use App\Jobs\MentionPipeline\MentionPipeline;
+use App\Mention;
+use App\Services\AccountService;
+use App\Services\CustomEmojiService;
+use App\Services\StatusService;
+use App\Services\TrendingHashtagService;
+use App\StatusHashtag;
+use App\Util\ActivityPub\Helpers;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Services\AccountService;
+use Illuminate\Support\Facades\DB;
-use App\Services\CustomEmojiService;
-use App\Services\StatusService;
-use App\Jobs\MentionPipeline\MentionPipeline;
-use App\Mention;
-use App\Hashtag;
-use App\StatusHashtag;
-use App\Services\TrendingHashtagService;
-use App\Util\ActivityPub\Helpers;
 
 class StatusTagsPipeline implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $activity;
+
     protected $status;
 
     /**
@@ -77,28 +78,62 @@ class StatusTagsPipeline implements ShouldQueue
                 }
 
                 if (config('database.default') === 'pgsql') {
-                $hashtag = Hashtag::where('name', 'ilike', $name)
+                    $hashtag = DB::transaction(function () use ($name) {
-                    ->orWhere('slug', 'ilike', str_slug($name, '-', false))
+                        $baseSlug = str_slug($name, '-', false);
+                        $slug = $baseSlug;
+                        $counter = 1;
+
+                        $existing = Hashtag::where('name', $name)
+                            ->lockForUpdate()
                             ->first();
 
-                if(!$hashtag) {
+                        if ($existing) {
-                    $hashtag = Hashtag::updateOrCreate([
+                            if ($existing->slug !== $slug) {
-                        'slug' => str_slug($name, '-', false),
+                                while (Hashtag::where('slug', $slug)
-                        'name' => $name
+                                    ->where('name', '!=', $name)
-                    ]);
+                                    ->exists()) {
+                                    $slug = $baseSlug.'-'.$counter++;
                                 }
-            } else {
+                                $existing->slug = $slug;
-                $hashtag = Hashtag::updateOrCreate([
+                                $existing->save();
-                    'slug' => str_slug($name, '-', false),
+                            }
-                    'name' => $name
+
+                            return $existing;
+                        }
+
+                        while (Hashtag::where('slug', $slug)->exists()) {
+                            $slug = $baseSlug.'-'.$counter++;
+                        }
+
+                        return Hashtag::create([
+                            'name' => $name,
+                            'slug' => $slug,
                         ]);
+                    });
+                } else {
+                    $hashtag = DB::transaction(function () use ($name) {
+                        $baseSlug = str_slug($name, '-', false);
+                        $slug = $baseSlug;
+                        $counter = 1;
+
+                        while (Hashtag::where('slug', $slug)
+                            ->where('name', '!=', $name)
+                            ->exists()) {
+                            $slug = $baseSlug.'-'.$counter++;
+                        }
+
+                        return Hashtag::updateOrCreate(
+                            ['name' => $name],
+                            ['slug' => $slug]
+                        );
+                    });
                 }
 
                 StatusHashtag::firstOrCreate([
                     'status_id' => $status->id,
                     'hashtag_id' => $hashtag->id,
                     'profile_id' => $status->profile_id,
-                'status_visibility' => $status->scope
+                    'status_visibility' => $status->scope,
                 ]);
             });