]> cat aescling's git repositories - mastodon.git/commitdiff
Fix Code Climate failed (regression from #3622) (#3624)
authorYamagishi Kazutoshi <ykzts@desire.sh>
Wed, 7 Jun 2017 13:57:59 +0000 (22:57 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 7 Jun 2017 13:57:59 +0000 (15:57 +0200)
app/services/process_feed_service.rb

index 924a78b65ffd6f067c5d31154337bf2ded5ebd1f..eabeb1799ad5d446724364a5c3a7e5ed0c617add 100644 (file)
@@ -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)