From e46abc71cad590c2113247d41feca80d27a557b0 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 21 Sep 2016 22:07:18 +0200 Subject: Fix notifications in UI, added new API for fetching account relationships --- app/views/api/accounts/lookup/index.rabl | 2 -- app/views/api/accounts/relationships.rabl | 5 +++++ app/views/api/accounts/show.rabl | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 app/views/api/accounts/lookup/index.rabl create mode 100644 app/views/api/accounts/relationships.rabl (limited to 'app/views') diff --git a/app/views/api/accounts/lookup/index.rabl b/app/views/api/accounts/lookup/index.rabl deleted file mode 100644 index f6ae172ed..000000000 --- a/app/views/api/accounts/lookup/index.rabl +++ /dev/null @@ -1,2 +0,0 @@ -collection @accounts -extends('api/accounts/show') diff --git a/app/views/api/accounts/relationships.rabl b/app/views/api/accounts/relationships.rabl new file mode 100644 index 000000000..dc1c1bc65 --- /dev/null +++ b/app/views/api/accounts/relationships.rabl @@ -0,0 +1,5 @@ +collection @accounts +attribute :id +node(:following) { |account| @following[account.id] || false } +node(:followed_by) { |account| @followed_by[account.id] || false } +node(:blocking) { |account| @blocking[account.id] || false } diff --git a/app/views/api/accounts/show.rabl b/app/views/api/accounts/show.rabl index 5af295c54..4f6a3ff99 100644 --- a/app/views/api/accounts/show.rabl +++ b/app/views/api/accounts/show.rabl @@ -8,4 +8,3 @@ node(:header) { |account| full_asset_url(account.header.url(:medium, fa node(:followers_count) { |account| account.followers.count } node(:following_count) { |account| account.following.count } node(:statuses_count) { |account| account.statuses.count } -node(:following) { |account| current_account.following?(account) } -- cgit