about summary refs log tree commit diff
diff options
context:
space:
mode:
authoralpaca-tc <alpaca-tc@alpaca.tc>2017-04-17 01:04:05 +0900
committerEugen <eugen@zeonfederated.com>2017-04-16 18:04:05 +0200
commit19f63ff8013644c53862849b86f60a97193a8745 (patch)
tree6977fe76156015a4c58ac84ae40d5595d0c6ed6b
parentbabbb2135e07faf74df19676c5ab886265890043 (diff)
Check @recipient.user at the first (#1939)
-rw-r--r--app/services/notify_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index ffeee5fcf..00f7cbd00 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -6,7 +6,7 @@ class NotifyService < BaseService
     @activity     = activity
     @notification = Notification.new(account: @recipient, activity: @activity)
 
-    return if blocked? || recipient.user.nil?
+    return if recipient.user.nil? || blocked?
 
     create_notification
     send_email if email_enabled?