diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 50e5bf001d..9eadbbafcd 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -4,6 +4,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity include FormattingHelper include NgRuleHelper + LINK_MEDIA_TYPES = ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].freeze + def perform @account.schedule_refresh_if_stale! @@ -645,8 +647,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity @quote ||= quote_from_tags || @object['quote'] || @object['quoteUrl'] || @object['quoteURL'] || @object['_misskey_quote'] end - LINK_MEDIA_TYPES = ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].freeze - def quote_from_tags return @quote_from_tags if defined?(@quote_from_tags) diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb index 89e94d168b..1968f18468 100644 --- a/app/lib/activitypub/parser/status_parser.rb +++ b/app/lib/activitypub/parser/status_parser.rb @@ -5,6 +5,9 @@ class ActivityPub::Parser::StatusParser NORMALIZED_LOCALE_NAMES = LanguagesHelper::SUPPORTED_LOCALES.keys.index_by(&:downcase).freeze + SCAN_SEARCHABILITY_RE = /\[searchability:(public|followers|reactors|private)\]/ + SCAN_SEARCHABILITY_FEDIBIRD_RE = /searchable_by_(all_users|followers_only|reacted_users_only|nobody)/ + # @param [Hash] json # @param [Hash] options # @option options [String] :followers_collection @@ -182,9 +185,6 @@ class ActivityPub::Parser::StatusParser %i(public unlisted).include?(visibility) ? :public : :limited end - SCAN_SEARCHABILITY_RE = /\[searchability:(public|followers|reactors|private)\]/ - SCAN_SEARCHABILITY_FEDIBIRD_RE = /searchable_by_(all_users|followers_only|reacted_users_only|nobody)/ - def default_searchability_from_bio? note = @account.note return false if note.blank? diff --git a/app/models/status.rb b/app/models/status.rb index 59ce718c92..12960f16f2 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -425,7 +425,7 @@ class Status < ApplicationRecord end emoji_reaction['count'] = emoji_reaction['account_ids'].size - public_emoji_reactions << emoji_reaction if (emoji_reaction['count']).positive? + public_emoji_reactions << emoji_reaction if emoji_reaction['count'].positive? end public_emoji_reactions