logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 10ffd455a8f5b423624a3d5696043efa07eccf03
parent: ca28d9c2aec0764dc9190e2802e5e6e23cf6d8c3
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Wed, 25 Jan 2017 01:48:46 +0100

Fix #522 - prevent blocked users from reblogging

Diffstat:

Mapp/services/reblog_service.rb4+++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb @@ -6,7 +6,9 @@ class ReblogService < BaseService # @param [Status] reblogged_status Status to be reblogged # @return [Status] def call(account, reblogged_status) - raise Mastodon::NotPermitted if reblogged_status.private_visibility? + reblogged_status = reblogged_status.reblog if reblogged_status.reblog? + + raise Mastodon::NotPermitted if reblogged_status.private_visibility? || !reblogged_status.permitted?(account) reblog = account.statuses.create!(reblog: reblogged_status, text: '')