about summary refs log tree commit diff
path: root/app/views/api
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-03-02 18:50:33 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-03-02 18:50:33 +0100
commit4c0e9f85c5c9e3be91f9a76139fab3b55abbf363 (patch)
tree9d60c6b37a6adb60b20a674630587de4e55d8765 /app/views/api
parent89fc2d7f4810ecdf66b17543f4603c1089a0c3f5 (diff)
parentc64a1c25c4e9a07c694863a38334ed66e368752e (diff)
Merge branch 'KitRedgrave-add-mute-button'
Diffstat (limited to 'app/views/api')
-rw-r--r--app/views/api/v1/accounts/relationship.rabl1
-rw-r--r--app/views/api/v1/mutes/index.rabl2
2 files changed, 3 insertions, 0 deletions
diff --git a/app/views/api/v1/accounts/relationship.rabl b/app/views/api/v1/accounts/relationship.rabl
index 22b37586e..d6f1dd48a 100644
--- a/app/views/api/v1/accounts/relationship.rabl
+++ b/app/views/api/v1/accounts/relationship.rabl
@@ -4,4 +4,5 @@ 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 }
+node(:muting)      { |account| @muting[account.id]      || false }
 node(:requested)   { |account| @requested[account.id]   || false }
diff --git a/app/views/api/v1/mutes/index.rabl b/app/views/api/v1/mutes/index.rabl
new file mode 100644
index 000000000..9f3b13a53
--- /dev/null
+++ b/app/views/api/v1/mutes/index.rabl
@@ -0,0 +1,2 @@
+collection @accounts
+extends 'api/v1/accounts/show'