Fix a couple unhandled exceptions
This commit is contained in:
parent
a1894786cf
commit
aa9c51a34c
|
@ -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
|
||||
|
|
|
@ -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?
|
||||
|
|
Reference in a new issue