Merge pull request #4669 from pixelfed/staging

Update StatusTagsPipeline, fix object tags slug query
2 years ago · dcc6f65e33
parent 7fdb87ef9b 9989d6c66f
commit dcc6f65e33
1 changed files with 9 additions and 8 deletions
--- a/app/Jobs/StatusPipeline/StatusTagsPipeline.php
+++ b/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
 				]);
            }