From e9b1a36f1d46624006ae770d9dbf5d357879f6b6 Mon Sep 17 00:00:00 2001 From: Essem Date: Tue, 18 Jun 2024 14:10:37 -0500 Subject: [PATCH] Turn custom emoji regexps into class level constants --- app/lib/activitypub/activity/emoji_react.rb | 4 +++- app/lib/activitypub/activity/like.rb | 4 +++- app/lib/activitypub/activity/undo.rb | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/lib/activitypub/activity/emoji_react.rb b/app/lib/activitypub/activity/emoji_react.rb index c9d88bc51c2605..ad9f9abbaa3b99 100644 --- a/app/lib/activitypub/activity/emoji_react.rb +++ b/app/lib/activitypub/activity/emoji_react.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class ActivityPub::Activity::EmojiReact < ActivityPub::Activity + CUSTOM_EMOJI_REGEX = /^:[^:]+:$/ + def perform original_status = status_from_uri(object_uri) name = @json['content'] @@ -8,7 +10,7 @@ def perform !original_status.account.local? || delete_arrived_first?(@json['id']) - if /^:.*:$/.match?(name) + if CUSTOM_EMOJI_REGEX.match?(name) name.delete! ':' custom_emoji = process_emoji_tags(name, @json['tag']) diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb index 006382082549a4..8856f7be4c1dcd 100644 --- a/app/lib/activitypub/activity/like.rb +++ b/app/lib/activitypub/activity/like.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class ActivityPub::Activity::Like < ActivityPub::Activity + CUSTOM_EMOJI_REGEX = /^:[^:]+:$/ + def perform original_status = status_from_uri(object_uri) return if original_status.nil? || !original_status.account.local? || delete_arrived_first?(@json['id']) @@ -23,7 +25,7 @@ def maybe_process_embedded_reaction name = @json['content'] || @json['_misskey_reaction'] return false if name.nil? - if /^:.*:$/.match?(name) + if CUSTOM_EMOJI_REGEX.match?(name) name.delete! ':' custom_emoji = process_emoji_tags(name, @json['tag']) diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb index 5f9f1bbecbfaf1..0c7714d6edf0e3 100644 --- a/app/lib/activitypub/activity/undo.rb +++ b/app/lib/activitypub/activity/undo.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class ActivityPub::Activity::Undo < ActivityPub::Activity + CUSTOM_EMOJI_REGEX = /^:[^:]+:$/ + def perform case @object['type'] when 'Announce' @@ -125,7 +127,7 @@ def undo_emoji_react return if status.nil? || !status.account.local? - if /^:.*:$/.match?(name) + if CUSTOM_EMOJI_REGEX.match?(name) name.delete! ':' custom_emoji = process_emoji_tags(name, @object['tag'])