diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-23 13:56:57 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-23 13:56:57 +0100 |
| commit | aa9c51a34c4ca226a68f7116573bc37cd172c8f6 (patch) | |
| tree | e691fe76332e5e2ebc9a703d8546db1966e19125 /app | |
| parent | a1894786cfd4ed1d753743fc2313155a6795c6d9 (diff) | |
Fix a couple unhandled exceptions
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/stream_entries_controller.rb | 2 | ||||
| -rw-r--r-- | app/services/notify_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb index 3f60bb0c4..5701b2efa 100644 --- a/app/controllers/stream_entries_controller.rb +++ b/app/controllers/stream_entries_controller.rb @@ -46,7 +46,7 @@ class StreamEntriesController < ApplicationController @stream_entry = @account.stream_entries.find(params[:id]) @type = @stream_entry.activity_type.downcase - raise ActiveRecord::RecordNotFound if @stream_entry.hidden? && (@stream_entry.activity_type != 'Status' || (@stream_entry.activity_type == 'Status' && !@stream_entry.activity.permitted?(current_account))) + raise ActiveRecord::RecordNotFound if @stream_entry.activity.nil? || (@stream_entry.hidden? && (@stream_entry.activity_type != 'Status' || (@stream_entry.activity_type == 'Status' && !@stream_entry.activity.permitted?(current_account)))) end def check_account_suspension diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index 2eb0f417d..1ec36637c 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? + return if blocked? || recipient.user.nil? create_notification send_email if email_enabled? |