Check for content attribute in Misskey likes

essem/emoji-reactions-plus-upstream
Essem 5 months ago
parent a27b838741
commit 0838432237
No known key found for this signature in database
GPG Key ID: 7D497397CC3A2A8C

@ -15,11 +15,12 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
Trends.statuses.register(original_status)
end
# Misskey delivers reactions as likes with the emoji in _misskey_reaction
# see https://misskey-hub.net/ns.html#misskey-reaction for details
# Misskey delivers reactions as likes with the emoji in _misskey_reaction and content
# Versions of Misskey before 12.1.0 only specify emojis in _misskey_reaction, so we check both
# See https://misskey-hub.net/ns.html#misskey-reaction for details
def maybe_process_misskey_reaction
original_status = status_from_uri(object_uri)
name = @json['_misskey_reaction']
name = @json['content'] || @json['_misskey_reaction']
return false if name.nil?
if /^:.*:$/.match?(name)

@ -110,7 +110,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
if @account.favourited?(status)
favourite = status.favourites.where(account: @account).first
favourite&.destroy
elsif @object['_misskey_reaction'].present?
elsif @object['content'].present? || @object['_misskey_reaction'].present?
undo_emoji_react
else
delete_later!(object_uri)

Loading…
Cancel
Save