Browse Source

Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501)

This patch fixes NoMethodError and others in RemoteProfileUpdateWorker.
master
unarist 6 years ago
committed by Eugen Rochko
parent
commit
d47091eb97
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      app/services/update_remote_profile_service.rb

+ 6
- 6
app/services/update_remote_profile_service.rb View File

@@ -41,24 +41,24 @@ class UpdateRemoteProfileService < BaseService
account.header.destroy
end

save_emojis(account) if remote_profile.emojis.present?
save_emojis if remote_profile.emojis.present?
end
end

def save_emojis(parent)
do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
def save_emojis
do_not_download = DomainBlock.find_by(domain: account.domain)&.reject_media?

return if do_not_download

remote_account.emojis.each do |link|
remote_profile.emojis.each do |link|
next unless link['href'] && link['name']

shortcode = link['name'].delete(':')
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: parent.account.domain)
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: account.domain)

next unless emoji.nil?

emoji = CustomEmoji.new(shortcode: shortcode, domain: parent.account.domain)
emoji = CustomEmoji.new(shortcode: shortcode, domain: account.domain)
emoji.image_remote_url = link['href']
emoji.save
end


Loading…
Cancel
Save