From 10ffd455a8f5b423624a3d5696043efa07eccf03 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 25 Jan 2017 01:48:46 +0100
Subject: [PATCH] Fix #522 - prevent blocked users from reblogging
---
app/services/reblog_service.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 0cb51eecd..4ea0dbf6c 100644
--- 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: '')
--
GitLab