IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: allow local oneboxes to public topics/posts in PM

Browse Source
This commit is contained in:
Régis Hanol
2018-02-15 18:13:57 +01:00
parent 991dfadad7
commit 8e0da35857
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/oneboxer.rb
View File

@@ -165,14 +165,16 @@ module Oneboxer
def self.local_topic_html(url, route, opts)
return unless current_user = User.find_by(id: opts[:user_id])
return unless current_category = Category.find_by(id: opts[:category_id])
return unless Guardian.new(current_user).can_see_category?(current_category)
if current_category = Category.find_by(id: opts[:category_id])
return unless Guardian.new(current_user).can_see_category?(current_category)
end
if route[:post_number].to_i > 1
post = Post.find_by(topic_id: route[:topic_id], post_number: route[:post_number])
return unless post.present? && !post.hidden
return unless current_category.id == post.topic.category_id || Guardian.new.can_see_post?(post)
return unless current_category&.id == post.topic.category_id || Guardian.new.can_see_post?(post)
topic = post.topic
excerpt = post.excerpt(SiteSetting.post_onebox_maxlength)
@@ -184,7 +186,7 @@ module Oneboxer
PrettyText.cook(quote)
else
return unless topic = Topic.find_by(id: route[:topic_id])
return unless current_category.id == topic.category_id || Guardian.new.can_see_topic?(topic)
return unless current_category&.id == topic.category_id || Guardian.new.can_see_topic?(topic)
first_post = topic.ordered_posts.first