mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-25 16:41:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply changes from emoji PR:

Browse source 
- Quick fixes
- Move reaction normalization to API controller
This commit is contained in:
Essem 2024-01-17 22:40:51 +01:00 committed by Jeremy Kescher
parent 5d4cfe4cd8
commit f0cba6f57d
No known key found for this signature in database
GPG key ID: 80A419A7A613DFA4
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/api/v1/statuses/reactions_controller.rb
View file

@ -8,12 +8,12 @@ class Api::V1::Statuses::ReactionsController < Api::BaseController
before_action :set_status before_action :set_status
def create def create
ReactService.new.call(current_account, @status, params[:id]) ReactService.new.call(current_account, @status, normalize(params[:id]))
render json: @status, serializer: REST::StatusSerializer render json: @status, serializer: REST::StatusSerializer
end end
def destroy def destroy
UnreactWorker.perform_async(current_account.id, @status.id, params[:id]) UnreactWorker.perform_async(current_account.id, @status.id, normalize(params[:id]))
render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, reactions_map: { @status.id => false }) render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, reactions_map: { @status.id => false })
rescue Mastodon::NotPermittedError rescue Mastodon::NotPermittedError
@ -22,6 +22,13 @@ class Api::V1::Statuses::ReactionsController < Api::BaseController
private private
def normalize(name)
normalized = "#{name}\uFE0F"
return normalized if StatusReactionValidator::SUPPORTED_EMOJIS.include?(normalized)
name
end
def set_status def set_status
@status = Status.find(params[:status_id]) @status = Status.find(params[:status_id])
authorize @status, :show? authorize @status, :show?

3
app/services/react_service.rb
View file

@ -10,9 +10,6 @@ class ReactService < BaseService
name, domain = emoji.split('@') name, domain = emoji.split('@')
return unless domain.nil? || status.local? return unless domain.nil? || status.local?
normalized = "#{name}\uFE0F"
name = normalized if StatusReactionValidator::SUPPORTED_EMOJIS.include?(normalized)
custom_emoji = CustomEmoji.find_by(shortcode: name, domain: domain) custom_emoji = CustomEmoji.find_by(shortcode: name, domain: domain)
reaction = StatusReaction.find_by(account: account, status: status, name: name, custom_emoji: custom_emoji) reaction = StatusReaction.find_by(account: account, status: status, name: name, custom_emoji: custom_emoji)
return reaction unless reaction.nil? return reaction unless reaction.nil?