logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: f2931af61ebf2c84d895c398654194321972320d
parent: 8b16f8188203c4761970997a83f4de784cbc1b76
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 17 Feb 2017 01:50:01 +0100

Quick fix for avatars with the same URL not being perceived as updated and in need of re-download

Diffstat:

Mapp/helpers/atom_builder_helper.rb2+-
Mapp/views/accounts/show.atom.ruby2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb @@ -275,6 +275,6 @@ module AtomBuilderHelper end def single_link_avatar(xml, account, size, px) - xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => px, 'media:height' => px, 'href' => full_asset_url(account.avatar.url(size, false))) + xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => px, 'media:height' => px, 'href' => full_asset_url(account.avatar.url(size))) end end diff --git a/app/views/accounts/show.atom.ruby b/app/views/accounts/show.atom.ruby @@ -6,7 +6,7 @@ Nokogiri::XML::Builder.new do |xml| title xml, @account.display_name subtitle xml, @account.note updated_at xml, stream_updated_at - logo xml, full_asset_url(@account.avatar.url( :original)) + logo xml, full_asset_url(@account.avatar.url(:original)) author(xml) do include_author xml, @account