gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Move emoji reaction limitation constraints

Browse source
This commit is contained in:
KMY 2023-03-08 16:31:22 +09:00
parent dcf52daa9b
commit 47bedd20ca
6 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/api/base_controller.rb
View file

@ -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

2
app/controllers/api/v1/statuses/emoji_reactions_controller.rb
View file

@ -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

2
app/lib/activitypub/activity/like.rb
View file

@ -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)

3
app/models/emoji_reaction.rb
View file

@ -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

9
app/serializers/rest/instance_serializer.rb
View file

@ -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?

9
app/serializers/rest/v1/instance_serializer.rb
View file

@ -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?