about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-23 20:23:26 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-23 20:23:26 +0200
commit3f9708edc4cd799afb68000adc35036dd8b8faa5 (patch)
treeaf7e97a0095c562810577acf68933b461e126794 /app/views
parentc6d893a71dede65dd88a0dfac81178c8e81e27d2 (diff)
Change output of api/accounts/:id/follow and unfollow to return relationship
Track relationship in redux state. Display follow/unfollow and following-back
information on account view (unstyled)
Diffstat (limited to 'app/views')
-rw-r--r--app/views/api/accounts/relationship.rabl5
-rw-r--r--app/views/api/accounts/relationships.rabl5
2 files changed, 6 insertions, 4 deletions
diff --git a/app/views/api/accounts/relationship.rabl b/app/views/api/accounts/relationship.rabl
new file mode 100644
index 000000000..3e5bf882c
--- /dev/null
+++ b/app/views/api/accounts/relationship.rabl
@@ -0,0 +1,5 @@
+object @account
+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/relationships.rabl b/app/views/api/accounts/relationships.rabl
index dc1c1bc65..16fdc40d9 100644
--- a/app/views/api/accounts/relationships.rabl
+++ b/app/views/api/accounts/relationships.rabl
@@ -1,5 +1,2 @@
 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 }
+extends 'api/accounts/relationship'