This reverts commit a3a1285dc5
.
c.f. https://github.com/discourse/discourse/pull/24742
This commit is contained in:
parent
525ba801ff
commit
24370a9ca6
|
@ -41,12 +41,11 @@ module DiscourseAi::AiBot::Commands
|
|||
topic_id = topic_id.to_i
|
||||
|
||||
topic = Topic.find_by(id: topic_id)
|
||||
return not_found if !topic || !Guardian.basic_user.can_see?(topic)
|
||||
return not_found if !topic || !Guardian.new.can_see?(topic)
|
||||
|
||||
@title = topic.title
|
||||
|
||||
posts =
|
||||
Post.secured(Guardian.basic_user).where(topic_id: topic_id).order(:post_number).limit(40)
|
||||
posts = Post.secured(Guardian.new).where(topic_id: topic_id).order(:post_number).limit(40)
|
||||
@url = topic.relative_url(post_number)
|
||||
|
||||
posts = posts.where("post_number = ?", post_number) if post_number
|
||||
|
@ -61,7 +60,7 @@ module DiscourseAi::AiBot::Commands
|
|||
content << "\ncategories: #{category_names}" if category_names.present?
|
||||
|
||||
if topic.tags.length > 0
|
||||
tags = DiscourseTagging.filter_visible(topic.tags, Guardian.basic_user)
|
||||
tags = DiscourseTagging.filter_visible(topic.tags, Guardian.new)
|
||||
content << "\ntags: #{tags.map(&:name).join(", ")}\n\n" if tags.length > 0
|
||||
end
|
||||
|
||||
|
|
|
@ -123,7 +123,7 @@ module DiscourseAi::AiBot::Commands
|
|||
Search.execute(
|
||||
search_string.to_s + " status:public",
|
||||
search_type: :full_page,
|
||||
guardian: Guardian.basic_user,
|
||||
guardian: Guardian.new(),
|
||||
)
|
||||
|
||||
# let's be frugal with tokens, 50 results is too much and stuff gets cut off
|
||||
|
@ -140,10 +140,10 @@ module DiscourseAi::AiBot::Commands
|
|||
posts = posts[0..limit - 1]
|
||||
|
||||
if should_try_semantic_search
|
||||
semantic_search = DiscourseAi::Embeddings::SemanticSearch.new(Guardian.basic_user)
|
||||
semantic_search = DiscourseAi::Embeddings::SemanticSearch.new(Guardian.new())
|
||||
topic_ids = Set.new(posts.map(&:topic_id))
|
||||
|
||||
search = Search.new(search_string, guardian: Guardian.basic_user)
|
||||
search = Search.new(search_string, guardian: Guardian.new)
|
||||
|
||||
results = nil
|
||||
begin
|
||||
|
|
|
@ -51,7 +51,7 @@ module DiscourseAi::AiBot::Commands
|
|||
topic = nil
|
||||
if topic_id > 0
|
||||
topic = Topic.find_by(id: topic_id)
|
||||
topic = nil if !topic || !Guardian.basic_user.can_see?(topic)
|
||||
topic = nil if !topic || !Guardian.new.can_see?(topic)
|
||||
end
|
||||
|
||||
@last_summary = nil
|
||||
|
|
|
@ -5,7 +5,7 @@ RSpec.describe DiscourseAi::Embeddings::SemanticSearch do
|
|||
fab!(:user) { Fabricate(:user) }
|
||||
|
||||
let(:query) { "test_query" }
|
||||
let(:subject) { described_class.new(user.guardian) }
|
||||
let(:subject) { described_class.new(Guardian.new(user)) }
|
||||
|
||||
describe "#search_for_topics" do
|
||||
let(:hypothetical_post) { "This is an hypothetical post generated from the keyword test_query" }
|
||||
|
@ -129,7 +129,7 @@ RSpec.describe DiscourseAi::Embeddings::SemanticSearch do
|
|||
posts =
|
||||
DiscourseAi::Completions::Llm.with_prepared_responses(
|
||||
["<ai>#{hypothetical_post}</ai>"],
|
||||
) { described_class.new(Guardian.basic_user).search_for_topics(query) }
|
||||
) { described_class.new(Guardian.new(nil)).search_for_topics(query) }
|
||||
|
||||
expect(posts).to be_empty
|
||||
end
|
||||
|
|
|
@ -58,7 +58,7 @@ describe DiscourseAi::Toxicity::EntryPoint do
|
|||
fab!(:chat_message) { Fabricate(:chat_message) }
|
||||
let(:updater) do
|
||||
Chat::UpdateMessage.call(
|
||||
guardian: chat_message.user.guardian,
|
||||
guardian: Guardian.new(chat_message.user),
|
||||
message_id: chat_message.id,
|
||||
message: "This is my updated message",
|
||||
)
|
||||
|
|
|
@ -6,7 +6,7 @@ describe ReviewableAiPost do
|
|||
fab!(:target) { Fabricate(:post) }
|
||||
|
||||
describe "#build_actions" do
|
||||
let(:guardian) { Guardian.basic_user }
|
||||
let(:guardian) { Guardian.new }
|
||||
|
||||
let(:reviewable) do
|
||||
subject.tap do |r|
|
||||
|
|
|
@ -8,7 +8,7 @@ RSpec.describe AiChatChannelSerializer do
|
|||
fab!(:dm_channel) { Fabricate(:direct_message_channel) }
|
||||
|
||||
it "display every participant" do
|
||||
serialized = described_class.new(dm_channel, scope: admin.guardian, root: nil)
|
||||
serialized = described_class.new(dm_channel, scope: Guardian.new(admin), root: nil)
|
||||
|
||||
expect(serialized.title).to eq(dm_channel.title(nil))
|
||||
end
|
||||
|
@ -18,7 +18,7 @@ RSpec.describe AiChatChannelSerializer do
|
|||
fab!(:channel) { Fabricate(:chat_channel) }
|
||||
|
||||
it "displays the category title" do
|
||||
serialized = described_class.new(channel, scope: admin.guardian, root: nil)
|
||||
serialized = described_class.new(channel, scope: Guardian.new(admin), root: nil)
|
||||
|
||||
expect(serialized.title).to eq(channel.title)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue