diff options
author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2022-10-23 01:30:55 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-22 18:30:55 +0200 |
commit | 74ead7d10698c7f18ca22c07d2f04ff81f419097 (patch) | |
tree | 3bc7504ab88d44bbc28c0bb1dfa40a85963d65dd /app/controllers/settings | |
parent | 73a48318a19a207c63f6d03ecea8ce35b7e2364a (diff) |
Change featured tag updates to add/remove activity (#19409)
* Change featured tag updates to add/remove activity * Fix to check for the existence of feature tag * Rename service and worker * Merge AddHashtagSerializer with AddSerializer * Undo removal of sidekiq_options
Diffstat (limited to 'app/controllers/settings')
-rw-r--r-- | app/controllers/settings/featured_tags_controller.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb index ae714e912..cc6ec0843 100644 --- a/app/controllers/settings/featured_tags_controller.rb +++ b/app/controllers/settings/featured_tags_controller.rb @@ -10,10 +10,8 @@ class Settings::FeaturedTagsController < Settings::BaseController end def create - @featured_tag = current_account.featured_tags.new(featured_tag_params) - - if @featured_tag.save - ActivityPub::UpdateDistributionWorker.perform_in(3.minutes, current_account.id) + if !featured_tag_exists? + CreateFeaturedTagService.new.call(current_account, featured_tag_params[:name]) redirect_to settings_featured_tags_path else set_featured_tags @@ -24,13 +22,16 @@ class Settings::FeaturedTagsController < Settings::BaseController end def destroy - @featured_tag.destroy! - ActivityPub::UpdateDistributionWorker.perform_in(3.minutes, current_account.id) + RemoveFeaturedTagWorker.perform_async(current_account.id, @featured_tag.id) redirect_to settings_featured_tags_path end private + def featured_tag_exists? + current_account.featured_tags.by_name(featured_tag_params[:name]).exists? + end + def set_featured_tag @featured_tag = current_account.featured_tags.find(params[:id]) end |