Add featured tag add/remove activity handler (#19408)

This commit is contained in:
Takeshi Umeda 2022-10-22 18:49:41 +09:00 committed by GitHub
parent 7c152acb2c
commit 1d34eff63f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 2 deletions

View File

@ -2,12 +2,32 @@
class ActivityPub::Activity::Add < ActivityPub::Activity class ActivityPub::Activity::Add < ActivityPub::Activity
def perform def perform
return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url return if @json['target'].blank?
case value_or_id(@json['target'])
when @account.featured_collection_url
case @object['type']
when 'Hashtag'
add_featured_tags
else
add_featured
end
end
end
private
def add_featured
status = status_from_object status = status_from_object
return unless !status.nil? && status.account_id == @account.id && !@account.pinned?(status) return unless !status.nil? && status.account_id == @account.id && !@account.pinned?(status)
StatusPin.create!(account: @account, status: status) StatusPin.create!(account: @account, status: status)
end end
def add_featured_tags
name = @object['name']&.delete_prefix('#')
FeaturedTag.create!(account: @account, name: name) if name.present?
end
end end

View File

@ -2,8 +2,22 @@
class ActivityPub::Activity::Remove < ActivityPub::Activity class ActivityPub::Activity::Remove < ActivityPub::Activity
def perform def perform
return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url return if @json['target'].blank?
case value_or_id(@json['target'])
when @account.featured_collection_url
case @object['type']
when 'Hashtag'
remove_featured_tags
else
remove_featured
end
end
end
private
def remove_featured
status = status_from_uri(object_uri) status = status_from_uri(object_uri)
return unless !status.nil? && status.account_id == @account.id return unless !status.nil? && status.account_id == @account.id
@ -11,4 +25,13 @@ class ActivityPub::Activity::Remove < ActivityPub::Activity
pin = StatusPin.find_by(account: @account, status: status) pin = StatusPin.find_by(account: @account, status: status)
pin&.destroy! pin&.destroy!
end end
def remove_featured_tags
name = @object['name']&.delete_prefix('#')
return if name.blank?
featured_tag = FeaturedTag.by_name(name).find_by(account: @account)
featured_tag&.destroy!
end
end end

View File

@ -22,6 +22,8 @@ class FeaturedTag < ApplicationRecord
before_create :set_tag before_create :set_tag
before_create :reset_data before_create :reset_data
scope :by_name, ->(name) { joins(:tag).where(tag: { name: HashtagNormalizer.new.normalize(name) }) }
delegate :display_name, to: :tag delegate :display_name, to: :tag
attr_writer :name attr_writer :name