From 004382e4d09f90e5ca824996c4b20e99599bf98f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 26 Dec 2016 19:30:45 +0100
Subject: Adding follow requests API

---
 .../api/v1/follow_requests_controller.rb           | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 app/controllers/api/v1/follow_requests_controller.rb

(limited to 'app/controllers/api/v1')

diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
new file mode 100644
index 000000000..a30e97e71
--- /dev/null
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Api::V1::FollowRequestsController < ApiController
+  before_action -> { doorkeeper_authorize! :follow }
+  before_action :require_user!
+
+  def index
+    results   = FollowRequest.where(target_account: current_account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
+    accounts  = Account.where(id: results.map(&:account_id)).map { |a| [a.id, a] }.to_h
+    @accounts = results.map { |f| accounts[f.account_id] }
+
+    set_account_counters_maps(@accounts)
+
+    next_path = api_v1_follow_requests_url(max_id: results.last.id)    if results.size == DEFAULT_ACCOUNTS_LIMIT
+    prev_path = api_v1_follow_requests_url(since_id: results.first.id) unless results.empty?
+
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def authorize
+    FollowRequest.find_by!(account_id: params[:id], target_account: current_account).authorize!
+    render_empty
+  end
+
+  def reject
+    FollowRequest.find_by!(account_id: params[:id], target_account: current_account).reject!
+    render_empty
+  end
+end
-- 
cgit 


From 2146ac91a004bad2a6c4dc1d01599a85515928f5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 26 Dec 2016 21:52:03 +0100
Subject: Follow requests send e-mail notifications, but are excluded from
 notifications API Better initial state for unlisted/nsfw toggles

---
 .../features/compose/components/compose_form.jsx       |  5 +++--
 .../follow_requests/components/account_authorize.jsx   |  2 +-
 app/controllers/api/v1/notifications_controller.rb     |  2 +-
 app/mailers/notification_mailer.rb                     |  9 +++++++++
 app/models/follow_request.rb                           |  2 ++
 app/models/notification.rb                             | 18 ++++++++++++------
 app/models/user.rb                                     |  2 +-
 app/services/follow_service.rb                         |  7 ++++++-
 app/services/notify_service.rb                         |  5 +++++
 app/views/notification_mailer/follow_request.text.erb  |  5 +++++
 config/locales/en.yml                                  |  3 +++
 11 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 app/views/notification_mailer/follow_request.text.erb

(limited to 'app/controllers/api/v1')

diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 760b0efd1..012e39c91 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -20,6 +20,7 @@ const messages = defineMessages({
 const ComposeForm = React.createClass({
 
   propTypes: {
+    intl: React.PropTypes.object.isRequired,
     text: React.PropTypes.string.isRequired,
     suggestion_token: React.PropTypes.string,
     suggestions: ImmutablePropTypes.list,
@@ -129,7 +130,7 @@ const ComposeForm = React.createClass({
           <span style={{ display: 'inline-block', verticalAlign: 'middle', marginBottom: '14px', marginLeft: '8px', color: '#9baec8' }}><FormattedMessage id='compose_form.private' defaultMessage='Mark as private' /></span>
         </label>
 
-        <Motion defaultStyle={{ opacity: 100, height: 39.5 }} style={{ opacity: spring(this.props.private ? 0 : 100), height: spring(this.props.private ? 0 : 39.5) }}>
+        <Motion defaultStyle={{ opacity: this.props.private ? 0 : 100, height: this.props.private ? 39.5 : 0 }} style={{ opacity: spring(this.props.private ? 0 : 100), height: spring(this.props.private ? 0 : 39.5) }}>
           {({ opacity, height }) =>
             <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle', height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
               <Toggle checked={this.props.unlisted} onChange={this.handleChangeListability} />
@@ -138,7 +139,7 @@ const ComposeForm = React.createClass({
           }
         </Motion>
 
-        <Motion defaultStyle={{ opacity: 100, height: 39.5 }} style={{ opacity: spring(this.props.media_count === 0 ? 0 : 100), height: spring(this.props.media_count === 0 ? 0 : 39.5) }}>
+        <Motion defaultStyle={{ opacity: 0, height: 0 }} style={{ opacity: spring(this.props.media_count === 0 ? 0 : 100), height: spring(this.props.media_count === 0 ? 0 : 39.5) }}>
           {({ opacity, height }) =>
             <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle', height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
               <Toggle checked={this.props.sensitive} onChange={this.handleChangeSensitivity} />
diff --git a/app/assets/javascripts/components/features/follow_requests/components/account_authorize.jsx b/app/assets/javascripts/components/features/follow_requests/components/account_authorize.jsx
index c16488aea..0d41d192f 100644
--- a/app/assets/javascripts/components/features/follow_requests/components/account_authorize.jsx
+++ b/app/assets/javascripts/components/features/follow_requests/components/account_authorize.jsx
@@ -35,7 +35,7 @@ const AccountAuthorize = ({ intl, account, onAuthorize, onReject }) => {
   return (
     <div>
       <div style={outerStyle}>
-        <Permalink href={account.get('url')} className='detailed-status__display-name' style={{ display: 'block', overflow: 'hidden', marginBottom: '15px' }}>
+        <Permalink href={account.get('url')} to={`/accounts/${account.get('id')}`} className='detailed-status__display-name' style={{ display: 'block', overflow: 'hidden', marginBottom: '15px' }}>
           <div style={{ float: 'left', marginRight: '10px' }}><Avatar src={account.get('avatar')} size={48} /></div>
           <DisplayName account={account} />
         </Permalink>
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index a24e0beb7..c8f162cb0 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -7,7 +7,7 @@ class Api::V1::NotificationsController < ApiController
   respond_to :json
 
   def index
-    @notifications = Notification.where(account: current_account).paginate_by_max_id(20, params[:max_id], params[:since_id])
+    @notifications = Notification.where(account: current_account).browserable.paginate_by_max_id(20, params[:max_id], params[:since_id])
     @notifications = cache_collection(@notifications, Notification)
     statuses       = @notifications.select { |n| !n.target_status.nil? }.map(&:target_status)
 
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 7b2cac7f3..a1b084682 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -40,4 +40,13 @@ class NotificationMailer < ApplicationMailer
       mail to: @me.user.email, subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct)
     end
   end
+
+  def follow_request(recipient, notification)
+    @me      = recipient
+    @account = notification.from_account
+
+    I18n.with_locale(@me.user.locale || I18n.default_locale) do
+      mail to: @me.user.email, subject: I18n.t('notification_mailer.follow_request.subject', name: @account.acct)
+    end
+  end
 end
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index b46065d53..8eef3abf4 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -6,6 +6,8 @@ class FollowRequest < ApplicationRecord
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
 
+  has_one :notification, as: :activity, dependent: :destroy
+
   validates :account, :target_account, presence: true
   validates :account_id, uniqueness: { scope: :target_account_id }
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 9d076ad41..c0b5c45a8 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -8,16 +8,18 @@ class Notification < ApplicationRecord
   belongs_to :from_account, class_name: 'Account'
   belongs_to :activity, polymorphic: true
 
-  belongs_to :mention,   foreign_type: 'Mention',   foreign_key: 'activity_id'
-  belongs_to :status,    foreign_type: 'Status',    foreign_key: 'activity_id'
-  belongs_to :follow,    foreign_type: 'Follow',    foreign_key: 'activity_id'
-  belongs_to :favourite, foreign_type: 'Favourite', foreign_key: 'activity_id'
+  belongs_to :mention,        foreign_type: 'Mention',       foreign_key: 'activity_id'
+  belongs_to :status,         foreign_type: 'Status',        foreign_key: 'activity_id'
+  belongs_to :follow,         foreign_type: 'Follow',        foreign_key: 'activity_id'
+  belongs_to :follow_request, foreign_type: 'FollowRequest', foreign_key: 'activity_id'
+  belongs_to :favourite,      foreign_type: 'Favourite',     foreign_key: 'activity_id'
 
   validates :account_id, uniqueness: { scope: [:activity_type, :activity_id] }
 
   STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :media_attachments, :tags, mentions: :account]].freeze
 
   scope :cache_ids, -> { select(:id, :updated_at, :activity_type, :activity_id) }
+  scope :browserable, -> { where.not(activity_type: ['FollowRequest']) }
 
   cache_associated :from_account, status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account
 
@@ -30,7 +32,7 @@ class Notification < ApplicationRecord
     when 'Status'
       :reblog
     else
-      activity_type.downcase.to_sym
+      activity_type.underscore.to_sym
     end
   end
 
@@ -43,6 +45,10 @@ class Notification < ApplicationRecord
     end
   end
 
+  def browserable?
+    type != :follow_request
+  end
+
   class << self
     def reload_stale_associations!(cached_items)
       account_ids = cached_items.map(&:from_account_id).uniq
@@ -61,7 +67,7 @@ class Notification < ApplicationRecord
 
   def set_from_account
     case activity_type
-    when 'Status', 'Follow', 'Favourite'
+    when 'Status', 'Follow', 'Favourite', 'FollowRequest'
       self.from_account_id = activity(false)&.account_id
     when 'Mention'
       self.from_account_id = activity(false)&.status&.account_id
diff --git a/app/models/user.rb b/app/models/user.rb
index 3fc028a6a..d5a52da06 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,7 +15,7 @@ class User < ApplicationRecord
   scope :admins,   -> { where(admin: true) }
 
   has_settings do |s|
-    s.key :notification_emails, defaults: { follow: false, reblog: false, favourite: false, mention: false }
+    s.key :notification_emails, defaults: { follow: false, reblog: false, favourite: false, mention: false, follow_request: true }
     s.key :interactions, defaults: { must_be_follower: false, must_be_following: false }
   end
 
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index a73ec344d..555f01b6d 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -20,7 +20,12 @@ class FollowService < BaseService
   private
 
   def request_follow(source_account, target_account)
-    FollowRequest.create!(account: source_account, target_account: target_account)
+    return unless target_account.local?
+
+    follow_request = FollowRequest.create!(account: source_account, target_account: target_account)
+    NotifyService.new.call(target_account, follow_request)
+
+    follow_request
   end
 
   def direct_follow(source_account, target_account)
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 8263c4376..2fb1d3919 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -32,6 +32,10 @@ class NotifyService < BaseService
     false
   end
 
+  def blocked_follow_request?
+    false
+  end
+
   def blocked?
     blocked   = @recipient.suspended?                                                                                             # Skip if the recipient account is suspended anyway
     blocked ||= @recipient.id == @notification.from_account.id                                                                    # Skip for interactions with self
@@ -45,6 +49,7 @@ class NotifyService < BaseService
 
   def create_notification
     @notification.save!
+    return unless @notification.browserable?
     FeedManager.instance.broadcast(@recipient.id, type: 'notification', message: FeedManager.instance.inline_render(@recipient, 'api/v1/notifications/show', @notification))
   end
 
diff --git a/app/views/notification_mailer/follow_request.text.erb b/app/views/notification_mailer/follow_request.text.erb
new file mode 100644
index 000000000..c0d38ec67
--- /dev/null
+++ b/app/views/notification_mailer/follow_request.text.erb
@@ -0,0 +1,5 @@
+<%= display_name(@me) %>,
+
+<%= t('notification_mailer.follow_request.body', name: @account.acct) %>
+
+<%= web_url("follow_requests") %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e5916dd76..760078862 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -54,6 +54,9 @@ en:
     follow:
       body: "%{name} is now following you!"
       subject: "%{name} is now following you"
+    follow_request:
+      body: "%{name} has requested to follow you"
+      subject: 'Pending follower: %{name}'
     mention:
       body: 'You were mentioned by %{name} in:'
       subject: You were mentioned by %{name}
-- 
cgit 


From 49834a6e7f06301a5bcc17b8771ed4513622b6a8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 29 Dec 2016 20:12:32 +0100
Subject: Add API for retrieving blocked accounts

---
 .rubocop.yml                                        |  1 +
 app/controllers/api/v1/blocks_controller.rb         | 21 +++++++++++++++++++++
 app/helpers/api/oembed_helper.rb                    |  2 --
 app/helpers/api/v1/follow_requests_helper.rb        |  2 --
 app/helpers/authorize_follow_helper.rb              |  2 ++
 app/helpers/stream_entries_helper.rb                |  2 +-
 app/models/block.rb                                 |  1 +
 app/views/api/v1/blocks/index.rabl                  |  2 ++
 app/workers/processing_worker.rb                    |  2 +-
 app/workers/salmon_worker.rb                        |  2 +-
 config/routes.rb                                    |  1 +
 spec/controllers/api/v1/accounts_controller_spec.rb |  1 -
 spec/controllers/api/v1/blocks_controller_spec.rb   | 19 +++++++++++++++++++
 .../controllers/api/v1/timelines_controller_spec.rb |  1 -
 spec/helpers/api/oembed_helper_spec.rb              |  5 -----
 15 files changed, 50 insertions(+), 14 deletions(-)
 create mode 100644 app/controllers/api/v1/blocks_controller.rb
 delete mode 100644 app/helpers/api/oembed_helper.rb
 delete mode 100644 app/helpers/api/v1/follow_requests_helper.rb
 create mode 100644 app/views/api/v1/blocks/index.rabl
 create mode 100644 spec/controllers/api/v1/blocks_controller_spec.rb
 delete mode 100644 spec/helpers/api/oembed_helper_spec.rb

(limited to 'app/controllers/api/v1')

diff --git a/.rubocop.yml b/.rubocop.yml
index b973f01cd..28c735913 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -86,3 +86,4 @@ AllCops:
   - 'config/**/*'
   - 'bin/*'
   - 'Rakefile'
+  - 'node_modules/**/*'
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
new file mode 100644
index 000000000..8629242ab
--- /dev/null
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Api::V1::BlocksController < ApiController
+  before_action -> { doorkeeper_authorize! :follow }
+  before_action :require_user!
+
+  respond_to :json
+
+  def index
+    results   = Block.where(account: current_account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
+    accounts  = Account.where(id: results.map(&:target_account_id)).map { |a| [a.id, a] }.to_h
+    @accounts = results.map { |f| accounts[f.target_account_id] }
+
+    set_account_counters_maps(@accounts)
+
+    next_path = api_v1_blocks_url(max_id: results.last.id)    if results.size == DEFAULT_ACCOUNTS_LIMIT
+    prev_path = api_v1_blocks_url(since_id: results.first.id) unless results.empty?
+
+    set_pagination_headers(next_path, prev_path)
+  end
+end
diff --git a/app/helpers/api/oembed_helper.rb b/app/helpers/api/oembed_helper.rb
deleted file mode 100644
index 05d5ca216..000000000
--- a/app/helpers/api/oembed_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Api::OembedHelper
-end
diff --git a/app/helpers/api/v1/follow_requests_helper.rb b/app/helpers/api/v1/follow_requests_helper.rb
deleted file mode 100644
index b36faf2a3..000000000
--- a/app/helpers/api/v1/follow_requests_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Api::V1::FollowRequestsHelper
-end
diff --git a/app/helpers/authorize_follow_helper.rb b/app/helpers/authorize_follow_helper.rb
index 43659ccfa..99ee03c2f 100644
--- a/app/helpers/authorize_follow_helper.rb
+++ b/app/helpers/authorize_follow_helper.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module AuthorizeFollowHelper
 end
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index 5cd65008e..ae2f575b5 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -10,7 +10,7 @@ module StreamEntriesHelper
   end
 
   def avatar_for_status_url(status)
-    status.reblog? ? status.reblog.account.avatar.url( :original) : status.account.avatar.url( :original)
+    status.reblog? ? status.reblog.account.avatar.url(:original) : status.account.avatar.url(:original)
   end
 
   def entry_classes(status, is_predecessor, is_successor, include_threads)
diff --git a/app/models/block.rb b/app/models/block.rb
index ad225d180..c2067c5b8 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Block < ApplicationRecord
+  include Paginable
   include Streamable
 
   belongs_to :account
diff --git a/app/views/api/v1/blocks/index.rabl b/app/views/api/v1/blocks/index.rabl
new file mode 100644
index 000000000..9f3b13a53
--- /dev/null
+++ b/app/views/api/v1/blocks/index.rabl
@@ -0,0 +1,2 @@
+collection @accounts
+extends 'api/v1/accounts/show'
diff --git a/app/workers/processing_worker.rb b/app/workers/processing_worker.rb
index b31cd0aaf..5df404bcc 100644
--- a/app/workers/processing_worker.rb
+++ b/app/workers/processing_worker.rb
@@ -2,7 +2,7 @@
 
 class ProcessingWorker
   include Sidekiq::Worker
-  
+
   sidekiq_options backtrace: true
 
   def perform(account_id, body)
diff --git a/app/workers/salmon_worker.rb b/app/workers/salmon_worker.rb
index 0903ca487..fc95ce47f 100644
--- a/app/workers/salmon_worker.rb
+++ b/app/workers/salmon_worker.rb
@@ -2,7 +2,7 @@
 
 class SalmonWorker
   include Sidekiq::Worker
-  
+
   sidekiq_options backtrace: true
 
   def perform(account_id, body)
diff --git a/config/routes.rb b/config/routes.rb
index 1468d426b..7a1d38ad2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,6 +100,7 @@ Rails.application.routes.draw do
       resources :follows,  only: [:create]
       resources :media,    only: [:create]
       resources :apps,     only: [:create]
+      resources :blocks,   only: [:index]
 
       resources :follow_requests, only: [:index] do
         member do
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index e4532305b..98b284f7a 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
   let(:token) { double acceptable?: true, resource_owner_id: user.id }
 
   before do
-    stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {})
     allow(controller).to receive(:doorkeeper_token) { token }
   end
 
diff --git a/spec/controllers/api/v1/blocks_controller_spec.rb b/spec/controllers/api/v1/blocks_controller_spec.rb
new file mode 100644
index 000000000..ca20a2d17
--- /dev/null
+++ b/spec/controllers/api/v1/blocks_controller_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::BlocksController, 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
diff --git a/spec/controllers/api/v1/timelines_controller_spec.rb b/spec/controllers/api/v1/timelines_controller_spec.rb
index c94519ac5..5e9954baf 100644
--- a/spec/controllers/api/v1/timelines_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines_controller_spec.rb
@@ -6,7 +6,6 @@ RSpec.describe Api::V1::TimelinesController, type: :controller do
   let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
 
   before do
-    stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {})
     allow(controller).to receive(:doorkeeper_token) { token }
   end
 
diff --git a/spec/helpers/api/oembed_helper_spec.rb b/spec/helpers/api/oembed_helper_spec.rb
deleted file mode 100644
index a671e2d65..000000000
--- a/spec/helpers/api/oembed_helper_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Api::OembedHelper, type: :helper do
-
-end
-- 
cgit 


From a302e56f9a06b67cdf2184a278d99f9e65a67fca Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 29 Dec 2016 20:33:26 +0100
Subject: Add API for retrieving favourites

---
 app/controllers/api/v1/favourites_controller.rb     | 21 +++++++++++++++++++++
 app/services/favourite_service.rb                   |  4 +++-
 app/views/api/v1/favourites/index.rabl              |  2 ++
 config/routes.rb                                    |  1 +
 .../api/v1/favourites_controller_spec.rb            | 19 +++++++++++++++++++
 5 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/api/v1/favourites_controller.rb
 create mode 100644 app/views/api/v1/favourites/index.rabl
 create mode 100644 spec/controllers/api/v1/favourites_controller_spec.rb

(limited to 'app/controllers/api/v1')

diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
new file mode 100644
index 000000000..a71592acd
--- /dev/null
+++ 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
index 5c04cfee4..d5fbd29e9 100644
--- 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
new file mode 100644
index 000000000..44d29d91b
--- /dev/null
+++ 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
index 7a1d38ad2..842fbe71e 100644
--- 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
new file mode 100644
index 000000000..a6e9963e5
--- /dev/null
+++ 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
-- 
cgit