about summary refs log tree commit diff
path: root/app/helpers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-07 12:42:33 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-07 12:42:33 +0100
commitab6696e855b58cdb2b6264c9acb0397dd7384e25 (patch)
tree516e8c8f3a574e669d9f5b192655c54a7bcda38b /app/helpers
parent3824c588533f481011d2be19ff9476c001ffbee9 (diff)
Adding doorkeeper, adding a REST API
POST /api/statuses                  Params: status (text contents), in_reply_to_id (optional)
GET  /api/statuses/:id
POST /api/statuses/:id/reblog

GET  /api/accounts/:id
GET  /api/accounts/:id/following
GET  /api/accounts/:id/followers
POST /api/accounts/:id/follow
POST /api/accounts/:id/unfollow

POST /api/follows                  Params: uri (e.g. user@domain)

OAuth authentication is currently disabled, but the API can be used with HTTP Auth.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/api/accounts_helper.rb2
-rw-r--r--app/helpers/api/follows_helper.rb2
-rw-r--r--app/helpers/api/statuses_helper.rb2
-rw-r--r--app/helpers/stream_entries_helper.rb4
4 files changed, 8 insertions, 2 deletions
diff --git a/app/helpers/api/accounts_helper.rb b/app/helpers/api/accounts_helper.rb
new file mode 100644
index 000000000..d9a54c7bc
--- /dev/null
+++ b/app/helpers/api/accounts_helper.rb
@@ -0,0 +1,2 @@
+module Api::AccountsHelper
+end
diff --git a/app/helpers/api/follows_helper.rb b/app/helpers/api/follows_helper.rb
new file mode 100644
index 000000000..d8022d93c
--- /dev/null
+++ b/app/helpers/api/follows_helper.rb
@@ -0,0 +1,2 @@
+module Api::FollowsHelper
+end
diff --git a/app/helpers/api/statuses_helper.rb b/app/helpers/api/statuses_helper.rb
new file mode 100644
index 000000000..3187f3e3b
--- /dev/null
+++ b/app/helpers/api/statuses_helper.rb
@@ -0,0 +1,2 @@
+module Api::StatusesHelper
+end
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index d6a14352f..2a59553ab 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -31,10 +31,10 @@ module StreamEntriesHelper
   end
 
   def reblogged_by_me_class(status)
-    user_signed_in? && (status.reblog? ? status.reblog : status).reblogs.where(account: current_user.account).count == 1 ? 'reblogged' : ''
+    user_signed_in? && current_user.account.reblogged?(status) ? 'reblogged' : ''
   end
 
   def favourited_by_me_class(status)
-    user_signed_in? && (status.reblog? ? status.reblog : status).favourites.where(account: current_user.account).count == 1 ? 'favourited' : ''
+    user_signed_in? && current_user.account.favourited?(status) ? 'favourited' : ''
   end
 end