diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 210fbbbb49..9d2d817d09 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -3,7 +3,6 @@ class Api::BaseController < ApplicationController DEFAULT_STATUSES_LIMIT = 20 DEFAULT_ACCOUNTS_LIMIT = 40 - DEFAULT_EMOJI_REACTION_LIMIT = 10 include RateLimitHeaders include AccessTokenTrackingConcern diff --git a/app/controllers/api/v1/statuses/emoji_reactions_controller.rb b/app/controllers/api/v1/statuses/emoji_reactions_controller.rb index da68f5813c..1b56033bc4 100644 --- a/app/controllers/api/v1/statuses/emoji_reactions_controller.rb +++ b/app/controllers/api/v1/statuses/emoji_reactions_controller.rb @@ -42,7 +42,7 @@ class Api::V1::Statuses::EmojiReactionsController < Api::BaseController def create_private(emoji) count = EmojiReaction.where(account: current_account, status: @status).count - if count >= DEFAULT_EMOJI_REACTION_LIMIT + if count >= EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT bad_request return end diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb index 603816fcb2..9fd08280d9 100644 --- a/app/lib/activitypub/activity/like.rb +++ b/app/lib/activitypub/activity/like.rb @@ -38,7 +38,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity end end - return if EmojiReaction.where(account: @account, status: @original_status).count >= 10 + return if EmojiReaction.where(account: @account, status: @original_status).count >= EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT reaction = @original_status.emoji_reactions.create!(account: @account, name: shortcode, custom_emoji: emoji, uri: @json['id']) write_stream(reaction) diff --git a/app/models/emoji_reaction.rb b/app/models/emoji_reaction.rb index b66751ffed..44e880d9fc 100644 --- a/app/models/emoji_reaction.rb +++ b/app/models/emoji_reaction.rb @@ -17,6 +17,9 @@ class EmojiReaction < ApplicationRecord include Paginable + EMOJI_REACTION_LIMIT = 32767 + EMOJI_REACTION_PER_ACCOUNT_LIMIT = 5 + update_index('statuses', :status) belongs_to :account, inverse_of: :emoji_reactions diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index 9294f269ff..eb98750605 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -77,6 +77,11 @@ class REST::InstanceSerializer < ActiveModel::Serializer translation: { enabled: TranslationService.configured?, }, + + emoji_reactions: { + max_reactions: EmojiReaction::EMOJI_REACTION_LIMIT, + max_reactions_per_account: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT, + }, } end @@ -92,7 +97,9 @@ class REST::InstanceSerializer < ActiveModel::Serializer def fedibird_capabilities capabilities = [ :emoji_reaction, - :visibility_public_unlisted + :visibility_public_unlisted, + :enable_wide_emoji, + :enable_wide_emoji_reaction, ] capabilities << :profile_search unless Chewy.enabled? diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb index 19334bbebe..338c79383e 100644 --- a/app/serializers/rest/v1/instance_serializer.rb +++ b/app/serializers/rest/v1/instance_serializer.rb @@ -83,6 +83,11 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer min_expiration: PollValidator::MIN_EXPIRATION, max_expiration: PollValidator::MAX_EXPIRATION, }, + + emoji_reactions: { + max_reactions: EmojiReaction::EMOJI_REACTION_LIMIT, + max_reactions_per_account: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT, + }, } end @@ -102,7 +107,9 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer def fedibird_capabilities capabilities = [ :emoji_reaction, - :visibility_public_unlisted + :visibility_public_unlisted, + :enable_wide_emoji, + :enable_wide_emoji_reaction, ] capabilities << :profile_search unless Chewy.enabled?