diff options
| author | Effy Elden <git@effy.is> | 2017-01-15 08:58:50 +1100 |
|---|---|---|
| committer | Effy Elden <git@effy.is> | 2017-01-15 08:58:50 +1100 |
| commit | d6bc0e8db4d25a4533feb56164b0d9cd3ef2af6e (patch) | |
| tree | 60ab246a9e55deb6a64efee86a6a062cac94f440 /app/views | |
| parent | f63f0c46253f8d3c5524645160cbfe0c70cdec2f (diff) | |
Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/api/v1/apps/show.rabl | 3 | ||||
| -rw-r--r-- | app/views/api/v1/statuses/_show.rabl | 4 | ||||
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/views/api/v1/apps/show.rabl b/app/views/api/v1/apps/show.rabl new file mode 100644 index 000000000..30cfd81ab --- /dev/null +++ b/app/views/api/v1/apps/show.rabl @@ -0,0 +1,3 @@ +object @application + +attributes :id, :name, :website \ No newline at end of file diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl index a3391a67e..a3fc78763 100644 --- a/app/views/api/v1/statuses/_show.rabl +++ b/app/views/api/v1/statuses/_show.rabl @@ -6,6 +6,10 @@ node(:url) { |status| TagManager.instance.url_for(status) } node(:reblogs_count) { |status| defined?(@reblogs_counts_map) ? (@reblogs_counts_map[status.id] || 0) : status.reblogs.count } node(:favourites_count) { |status| defined?(@favourites_counts_map) ? (@favourites_counts_map[status.id] || 0) : status.favourites.count } +child :application do + extends 'api/v1/apps/show' +end + child :account do extends 'api/v1/accounts/show' end diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 32f7c2e40..bc9940915 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -28,6 +28,9 @@ = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: @external_links ? '_blank' : nil, rel: 'noopener' do %span= l(status.created_at) · + = link_to status.application.website, class: 'detailed-status__application', target: @external_links ? '_blank' : nil, rel: 'noooper' do + %span= status.application.name + · %span = fa_icon('retweet') %span= status.reblogs.count |