ソースを参照

Merge pull request #4669 from pixelfed/staging

Update StatusTagsPipeline, fix object tags slug query
daniel 1 年間 前
コミット
dcc6f65e33
1 ファイル変更9 行追加8 行削除
  1. 9 8
      app/Jobs/StatusPipeline/StatusTagsPipeline.php

+ 9 - 8
app/Jobs/StatusPipeline/StatusTagsPipeline.php

@@ -81,16 +81,17 @@ class StatusTagsPipeline implements ShouldQueue
             		->orWhere('slug', 'ilike', str_slug($name, '-', false))
             		->first();
 
-            	if(!$hashtag) {
-            		$hashtag = new Hashtag;
-            		$hashtag->name = $name;
-            		$hashtag->slug = str_slug($name, '-', false);
-            		$hashtag->save();
-            	}
+				if(!$hashtag) {
+					$hashtag = Hashtag::updateOrCreate([
+						'slug' => str_slug($name, '-', false),
+					],[
+						'name' => $name
+					]);
+				}
             } else {
-				$hashtag = Hashtag::firstOrCreate([
+				$hashtag = Hashtag::updateOrCreate([
 					'slug' => str_slug($name, '-', false),
-                ],[
+				],[
 					'name' => $name
 				]);
             }