Eugen Rochko
7 years ago
committed by
GitHub
parent
c5157ef07b
commit
9caa90025f
@ -0,0 +1,28 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class Api::V1::Statuses::PinsController < Api::BaseController
|
||||||
|
include Authorization
|
||||||
|
|
||||||
|
before_action -> { doorkeeper_authorize! :write }
|
||||||
|
before_action :require_user!
|
||||||
|
before_action :set_status
|
||||||
|
|
||||||
|
respond_to :json
|
||||||
|
|
||||||
|
def create
|
||||||
|
StatusPin.create!(account: current_account, status: @status)
|
||||||
|
render json: @status, serializer: REST::StatusSerializer
|
||||||
|
end
|
||||||
|
|
||||||
|
def destroy
|
||||||
|
pin = StatusPin.find_by(account: current_account, status: @status)
|
||||||
|
pin&.destroy!
|
||||||
|
render json: @status, serializer: REST::StatusSerializer
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def set_status
|
||||||
|
@status = Status.find(params[:status_id])
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
# == Schema Information
|
||||||
|
#
|
||||||
|
# Table name: status_pins
|
||||||
|
#
|
||||||
|
# id :integer not null, primary key
|
||||||
|
# account_id :integer not null
|
||||||
|
# status_id :integer not null
|
||||||
|
#
|
||||||
|
|
||||||
|
class StatusPin < ApplicationRecord
|
||||||
|
belongs_to :account, required: true
|
||||||
|
belongs_to :status, required: true
|
||||||
|
|
||||||
|
validates_with StatusPinValidator
|
||||||
|
end
|
||||||
@ -1,19 +1,24 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class StatusRelationshipsPresenter
|
class StatusRelationshipsPresenter
|
||||||
attr_reader :reblogs_map, :favourites_map, :mutes_map
|
attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map
|
||||||
|
|
||||||
def initialize(statuses, current_account_id = nil, reblogs_map: {}, favourites_map: {}, mutes_map: {})
|
def initialize(statuses, current_account_id = nil, options = {})
|
||||||
if current_account_id.nil?
|
if current_account_id.nil?
|
||||||
@reblogs_map = {}
|
@reblogs_map = {}
|
||||||
@favourites_map = {}
|
@favourites_map = {}
|
||||||
@mutes_map = {}
|
@mutes_map = {}
|
||||||
|
@pins_map = {}
|
||||||
else
|
else
|
||||||
status_ids = statuses.compact.flat_map { |s| [s.id, s.reblog_of_id] }.uniq
|
statuses = statuses.compact
|
||||||
conversation_ids = statuses.compact.map(&:conversation_id).compact.uniq
|
status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq
|
||||||
@reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(reblogs_map)
|
conversation_ids = statuses.map(&:conversation_id).compact.uniq
|
||||||
@favourites_map = Status.favourites_map(status_ids, current_account_id).merge(favourites_map)
|
pinnable_status_ids = statuses.map(&:proper).select { |s| s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) }.map(&:id)
|
||||||
@mutes_map = Status.mutes_map(conversation_ids, current_account_id).merge(mutes_map)
|
|
||||||
|
@reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
|
||||||
|
@favourites_map = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})
|
||||||
|
@mutes_map = Status.mutes_map(conversation_ids, current_account_id).merge(options[:mutes_map] || {})
|
||||||
|
@pins_map = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -0,0 +1,9 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class StatusPinValidator < ActiveModel::Validator
|
||||||
|
def validate(pin)
|
||||||
|
pin.errors.add(:status, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog?
|
||||||
|
pin.errors.add(:status, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id
|
||||||
|
pin.errors.add(:status, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility)
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
class CreateStatusPins < ActiveRecord::Migration[5.1]
|
||||||
|
def change
|
||||||
|
create_table :status_pins do |t|
|
||||||
|
t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false
|
||||||
|
t.belongs_to :status, foreign_key: { on_delete: :cascade }, null: false
|
||||||
|
end
|
||||||
|
|
||||||
|
add_index :status_pins, [:account_id, :status_id], unique: true
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,57 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
describe Api::V1::Statuses::PinsController do
|
||||||
|
render_views
|
||||||
|
|
||||||
|
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||||
|
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
|
||||||
|
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write', application: app) }
|
||||||
|
|
||||||
|
context 'with an oauth token' do
|
||||||
|
before do
|
||||||
|
allow(controller).to receive(:doorkeeper_token) { token }
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'POST #create' do
|
||||||
|
let(:status) { Fabricate(:status, account: user.account) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
post :create, params: { status_id: status.id }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
expect(response).to have_http_status(:success)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'updates the pinned attribute' do
|
||||||
|
expect(user.account.pinned?(status)).to be true
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'return json with updated attributes' do
|
||||||
|
hash_body = body_as_json
|
||||||
|
|
||||||
|
expect(hash_body[:id]).to eq status.id
|
||||||
|
expect(hash_body[:pinned]).to be true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'POST #destroy' do
|
||||||
|
let(:status) { Fabricate(:status, account: user.account) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
Fabricate(:status_pin, status: status, account: user.account)
|
||||||
|
post :destroy, params: { status_id: status.id }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
expect(response).to have_http_status(:success)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'updates the pinned attribute' do
|
||||||
|
expect(user.account.pinned?(status)).to be false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
Fabricator(:status_pin) do
|
||||||
|
account
|
||||||
|
status
|
||||||
|
end
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe StatusPin, type: :model do
|
||||||
|
describe 'validations' do
|
||||||
|
it 'allows pins of own statuses' do
|
||||||
|
account = Fabricate(:account)
|
||||||
|
status = Fabricate(:status, account: account)
|
||||||
|
|
||||||
|
expect(StatusPin.new(account: account, status: status).save).to be true
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not allow pins of statuses by someone else' do
|
||||||
|
account = Fabricate(:account)
|
||||||
|
status = Fabricate(:status)
|
||||||
|
|
||||||
|
expect(StatusPin.new(account: account, status: status).save).to be false
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not allow pins of reblogs' do
|
||||||
|
account = Fabricate(:account)
|
||||||
|
status = Fabricate(:status, account: account)
|
||||||
|
reblog = Fabricate(:status, reblog: status)
|
||||||
|
|
||||||
|
expect(StatusPin.new(account: account, status: reblog).save).to be false
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not allow pins of private statuses' do
|
||||||
|
account = Fabricate(:account)
|
||||||
|
status = Fabricate(:status, account: account, visibility: :private)
|
||||||
|
|
||||||
|
expect(StatusPin.new(account: account, status: status).save).to be false
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not allow pins of direct statuses' do
|
||||||
|
account = Fabricate(:account)
|
||||||
|
status = Fabricate(:status, account: account, visibility: :direct)
|
||||||
|
|
||||||
|
expect(StatusPin.new(account: account, status: status).save).to be false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Loading…
Reference in new issue