mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 11:35:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix a couple unhandled exceptions

Browse Source
This commit is contained in:
Eugen Rochko 2017-01-23 13:56:57 +01:00
parent a1894786cf
commit aa9c51a34c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/stream_entries_controller.rb
View File

@ -46,7 +46,7 @@ class StreamEntriesController < ApplicationController
@stream_entry = @account.stream_entries.find(params[:id]) @stream_entry = @account.stream_entries.find(params[:id])
@type = @stream_entry.activity_type.downcase @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 end
def check_account_suspension def check_account_suspension

2
app/services/notify_service.rb
View File

@ -6,7 +6,7 @@ class NotifyService < BaseService
@activity = activity @activity = activity
@notification = Notification.new(account: @recipient, activity: @activity) @notification = Notification.new(account: @recipient, activity: @activity)
return if blocked? return if blocked? || recipient.user.nil?
create_notification create_notification
send_email if email_enabled? send_email if email_enabled?