gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Adding a test for ReblogService, fixing mentions for remote statuses

Browse source
This commit is contained in:
Eugen Rochko 2016-02-28 21:22:56 +01:00
parent 47d50b0e39
commit 11ff92c9d7
10 changed files with 82 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/atom_helper.rb
View file

@ -1,6 +1,6 @@
module AtomHelper
def stream_updated_at
@account.stream_entries.last ? @account.stream_entries.last.created_at : @account.updated_at
@account.stream_entries.last ? (@account.updated_at > @account.stream_entries.last.created_at ? @account.updated_at : @account.stream_entries.last.created_at) : @account.updated_at
end
def entry(xml, is_root, &block)
@ -126,7 +126,9 @@ module AtomHelper
end
def link_avatar(xml, account)
xml.link(rel: 'avatar', type: account.avatar_content_type, href: asset_url(account.avatar.url(:large)))
xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => '300', 'media:height' =>'300', 'href' => asset_url(account.avatar.url(:large)))
xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => '96', 'media:height' =>'96', 'href' => asset_url(account.avatar.url(:medium)))
xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => '48', 'media:height' =>'48', 'href' => asset_url(account.avatar.url(:small)))
end
def logo(xml, url)