Skip to content

A platform for community discussion. Free, open, simple.

FIX: Hide AI models and invite details from other Rewind viewers

Régis Hanol04aae4d1fa69
diff --git a/plugins/discourse-rewind/app/services/discourse_rewind/fetch_report.rb b/plugins/discourse-rewind/app/services/discourse_rewind/fetch_report.rb
index 6cc55b34e31..42e5672cf37 100644
--- a/plugins/discourse-rewind/app/services/discourse_rewind/fetch_report.rb
+++ b/plugins/discourse-rewind/app/services/discourse_rewind/fetch_report.rb
@@ -53,21 +53,30 @@ module DiscourseRewind
cache_single_report(for_user.id, year, report_name, report.as_json)
end
- report = filter_report_for_viewer(report, guardian, report_class) if report_class.in?(
- FetchReports::VISIBILITY_FILTERED_REPORTS,
- )
- report
+ return report if !report || !report_class.in?(FetchReports::VISIBILITY_FILTERED_REPORTS)
+
+ filter_report_for_viewer(report, guardian, for_user, report_class)
end
- def filter_report_for_viewer(report, guardian, report_class)
+ def filter_report_for_viewer(report, guardian, for_user, report_class)
case report_class.name
when Action::BestTopics.name
filter_best_topics_for_viewer(report, guardian)
when Action::BestPosts.name
filter_best_posts_for_viewer(report, guardian)
+ when Action::AiUsage.name
+ filter_ai_usage_for_viewer(report, guardian, for_user)
+ when Action::Invites.name
+ report if guardian.can_see_invite_details?(for_user)
end
end
+ def filter_ai_usage_for_viewer(report, guardian, for_user)
+ return report if guardian.is_me?(for_user) || guardian.is_admin?
+
+ report.merge(data: report[:data].except(:model_usage))
+ end
+
def filter_best_topics_for_viewer(report, guardian)
topic_ids = report[:data].pluck(:topic_id)
visible_topic_ids = guardian.can_see_topic_ids(topic_ids:)
diff --git a/plugins/discourse-rewind/app/services/discourse_rewind/fetch_reports.rb b/plugins/discourse-rewind/app/services/discourse_rewind/fetch_reports.rb
index 5344d751283..21005174f61 100644
--- a/plugins/discourse-rewind/app/services/discourse_rewind/fetch_reports.rb
+++ b/plugins/discourse-rewind/app/services/discourse_rewind/fetch_reports.rb
@@ -20,7 +20,12 @@ module DiscourseRewind
# @return [Service::Base::Context]
INITIAL_REPORT_COUNT = 3
- VISIBILITY_FILTERED_REPORTS = [Action::BestTopics, Action::BestPosts].freeze
+ VISIBILITY_FILTERED_REPORTS = [
+ Action::BestTopics,
+ Action::BestPosts,
+ Action::AiUsage,
+ Action::Invites,
+ ].freeze
# The order here controls the order of reports in the UI,
# so be careful when moving these around.
diff --git a/plugins/discourse-rewind/spec/services/fetch_report_spec.rb b/plugins/discourse-rewind/spec/services/fetch_report_spec.rb
index 89d7e4ac319..d304170cffc 100644
--- a/plugins/discourse-rewind/spec/services/fetch_report_spec.rb
+++ b/plugins/discourse-rewind/spec/services/fetch_report_spec.rb
@@ -215,6 +215,88 @@ RSpec.describe(DiscourseRewind::FetchReport) do
end
end
+ context "when viewing someone else's AI usage" do
+ fab!(:owner, :user)
+
+ let(:params) do
+ {
+ index: DiscourseRewind::FetchReports::REPORTS.index(DiscourseRewind::Action::AiUsage),
+ for_user_username: owner.username,
+ }
+ end
+ let(:report) do
+ {
+ data: {
+ total_requests: 1,
+ model_usage: [{ name: "secret-model", count: 1 }],
+ },
+ identifier: "ai-usage",
+ }
+ end
+
+ before do
+ freeze_time DateTime.parse("2021-12-22")
+ owner.user_option.update!(discourse_rewind_share_publicly: true)
+ DiscourseRewind::Action::AiUsage.stubs(:call).returns(report)
+ end
+
+ it "hides the models" do
+ expect(result.report[:data]).to eq(total_requests: 1)
+ end
+
+ context "when the viewer is the owner" do
+ let(:guardian) { owner.guardian }
+
+ it "shows the models" do
+ expect(result.report).to eq(report)
+ end
+ end
+
+ context "when the viewer is an admin" do
+ let(:guardian) { Fabricate(:admin).guardian }
+
+ it "shows the models" do
+ expect(result.report).to eq(report)
+ end
+ end
+ end
+
+ context "when viewing someone else's invites" do
+ fab!(:owner, :user)
+
+ let(:params) do
+ {
+ index: DiscourseRewind::FetchReports::REPORTS.index(DiscourseRewind::Action::Invites),
+ for_user_username: owner.username,
+ }
+ end
+ let(:report) { { data: { total_invites: 1 }, identifier: "invites" } }
+
+ before do
+ freeze_time DateTime.parse("2021-12-22")
+ owner.user_option.update!(discourse_rewind_share_publicly: true)
+ DiscourseRewind::Action::Invites.stubs(:call).returns(report)
+ end
+
+ it { is_expected.to fail_to_find_a_model(:report) }
+
+ context "when the viewer is the owner" do
+ let(:guardian) { owner.guardian }
+
+ it "shows the invites" do
+ expect(result.report).to eq(report)
+ end
+ end
+
+ context "when the viewer is a moderator" do
+ let(:guardian) { Fabricate(:moderator).guardian }
+
+ it "shows the invites" do
+ expect(result.report).to eq(report)
+ end
+ end
+ end
+
context "with for_user_username parameter" do
fab!(:other_user, :user)
fab!(:admin, :admin)