logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 1d68fe1a60088183e6907a93dc5148b7dd11cdec
parent: 6bd6dcf6df37dea077c4c6af84d979a49dd058db
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Wed,  7 Jun 2017 22:57:59 +0900

Fix Code Climate failed (regression from #3622) (#3624)


Diffstat:

Mapp/services/process_feed_service.rb6+-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb @@ -63,11 +63,7 @@ class ProcessFeedService < BaseService return status unless just_created if verb == :share - if original_status.reblog? - status.reblog = original_status.reblog - else - status.reblog = original_status - end + status.reblog = original_status.reblog? ? original_status.reblog : original_status end status.thread = find_status(thread(@xml).first) if thread?(@xml)