From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 7 Jun 2017 13:57:59 +0000 (+0900)
Subject: Fix Code Climate failed (regression from #3622) (#3624)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1d68fe1a60088183e6907a93dc5148b7dd11cdec;p=mastodon.git

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

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 924a78b65..eabeb1799 100644
--- 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)