Check @recipient.user at the first (#1939)

mastodon · Apr 16, 2017 · 19f63ff · 19f63ff
1 parent babbb21
commit 19f63ff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
@@ -6,7 +6,7 @@ def call(recipient, activity)
     @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?