commit: a302e56f9a06b67cdf2184a278d99f9e65a67fca
parent: 49834a6e7f06301a5bcc17b8771ed4513622b6a8
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 29 Dec 2016 20:33:26 +0100
Add API for retrieving favourites
Diffstat:
5 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Api::V1::FavouritesController < ApiController
+ before_action -> { doorkeeper_authorize! :read }
+ before_action :require_user!
+
+ respond_to :json
+
+ def index
+ results = Favourite.where(account: current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
+ @statuses = cache_collection(Status.where(id: results.map(&:status_id)), Status)
+
+ set_maps(@statuses)
+ set_counters_maps(@statuses)
+
+ next_path = api_v1_favourites_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
+ prev_path = api_v1_favourites_url(since_id: results.first.id) unless results.empty?
+
+ set_pagination_headers(next_path, prev_path)
+ end
+end
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
@@ -6,12 +6,14 @@ class FavouriteService < BaseService
# @param [Status] status
# @return [Favourite]
def call(account, status)
+ raise Mastodon::NotPermitted unless status.permitted?(account)
+
favourite = Favourite.create!(account: account, status: status)
Pubsubhubbub::DistributionWorker.perform_async(favourite.stream_entry.id)
if status.local?
- NotifyService.new.call(status.account, favourite)
+ NotifyService.new.call(favourite.status.account, favourite)
else
NotificationWorker.perform_async(favourite.stream_entry.id, status.account_id)
end
diff --git a/app/views/api/v1/favourites/index.rabl b/app/views/api/v1/favourites/index.rabl
@@ -0,0 +1,2 @@
+collection @statuses
+extends 'api/v1/statuses/show'
diff --git a/config/routes.rb b/config/routes.rb
@@ -110,6 +110,7 @@ Rails.application.routes.draw do
end
resources :notifications, only: [:index]
+ resources :favourites, only: [:index]
resources :accounts, only: [:show] do
collection do
diff --git a/spec/controllers/api/v1/favourites_controller_spec.rb b/spec/controllers/api/v1/favourites_controller_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::FavouritesController, type: :controller do
+ render_views
+
+ let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:token) { double acceptable?: true, resource_owner_id: user.id }
+
+ before do
+ allow(controller).to receive(:doorkeeper_token) { token }
+ end
+
+ describe 'GET #index' do
+ it 'returns http success' do
+ get :index
+ expect(response).to have_http_status(:success)
+ end
+ end
+end