Turn custom emoji regexps into class level constants
This commit is contained in:
parent
c791890b77
commit
69adea4342
@ -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 @@ class ActivityPub::Activity::EmojiReact < ActivityPub::Activity
|
||||
!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'])
|
||||
|
||||
|
@ -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 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
|
||||
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'])
|
||||
|
||||
|
@ -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 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
|
||||
|
||||
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'])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user