Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users

Browse source
This commit is contained in:
Eugen Rochko 2016-12-22 21:34:19 +01:00
parent f91b6fa9e1
commit 2d2154ba75
9 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api_controller.rb
View file

@ -30,6 +30,10 @@ class ApiController < ApplicationController
render json: { error: 'Remote SSL certificate could not be verified' }, status: 503
end
rescue_from Mastodon::NotPermitted do
render json: { error: 'This action is not allowed' }, status: 403
end
def doorkeeper_unauthorized_render_options(error: nil)
{ json: { error: (error.try(:description) || 'Not authorized') } }
end

5
app/controllers/settings/profiles_controller.rb
View file

@ -1,12 +1,13 @@
# frozen_string_literal: true
class Settings::ProfilesController < ApplicationController
include ObfuscateFilename
layout 'auth'
before_action :authenticate_user!
before_action :set_account
include ObfuscateFilename
obfuscate_filename [:account, :avatar]
obfuscate_filename [:account, :header]
@ -23,7 +24,7 @@ class Settings::ProfilesController < ApplicationController
private
def account_params
params.require(:account).permit(:display_name, :note, :avatar, :header)
params.require(:account).permit(:display_name, :note, :avatar, :header, :locked)
end
def set_account