Merge pull request #4669 from pixelfed/staging

Update StatusTagsPipeline, fix object tags slug query
pull/4679/head
daniel 2 years ago committed by GitHub
commit dcc6f65e33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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

Loading…
Cancel
Save