diff --git a/app/models/dmail.rb b/app/models/dmail.rb index dcf7977a6..a85035704 100644 --- a/app/models/dmail.rb +++ b/app/models/dmail.rb @@ -189,7 +189,7 @@ class Dmail < ApplicationRecord end def reportable_by?(user) - is_recipient? && !is_automated? && !from.is_moderator? + owner == user && is_recipient? && !is_automated? && !from.is_moderator? end def dtext_shortlink(key: false, **options) diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb index 9fd5aa48c..7e29a4298 100644 --- a/app/models/forum_post.rb +++ b/app/models/forum_post.rb @@ -95,7 +95,7 @@ class ForumPost < ApplicationRecord end def reportable_by?(user) - creator_id != user.id && !creator.is_moderator? + visible?(user) && creator_id != user.id && !creator.is_moderator? end def votable?