A platform for community discussion. Free, open, simple.
FEATURE: Show recent voice participants on the About page
Jake Goldsborough0d1950f77df9
diff --git a/plugins/voice/app/services/voice/statistics.rb b/plugins/voice/app/services/voice/statistics.rbnew file mode 100644index 00000000000..82ca6b616ee--- /dev/null+++ b/plugins/voice/app/services/voice/statistics.rb@@ -0,0 +1,11 @@+# frozen_string_literal: true++module Voice+ class Statistics+ def self.about_users+ return {} unless SiteSetting.voice_enabled && SiteSetting.voice_analytics_enabled++ { "7_days": Voice::Session.where("joined_at > ?", 7.days.ago).distinct.count(:user_id) }+ end+ end+enddiff --git a/plugins/voice/assets/javascripts/discourse/initializers/voice-about.js b/plugins/voice/assets/javascripts/discourse/initializers/voice-about.jsnew file mode 100644index 00000000000..3f3c9f0dfb6--- /dev/null+++ b/plugins/voice/assets/javascripts/discourse/initializers/voice-about.js@@ -0,0 +1,20 @@+import { apiInitializer } from "discourse/lib/api";+import { number } from "discourse/lib/formatter";+import { i18n } from "discourse-i18n";++export default apiInitializer((api) => {+ api.addAboutPageActivity("voice_users", (periods) => {+ const count = periods["7_days"];+ if (api.container.lookup("service:site-settings").voice_enabled && count) {+ return {+ icon: "microphone",+ class: "voice-users",+ activityText: i18n("voice.about.participants", {+ count,+ formatted_number: number(count),+ }),+ period: i18n("about.activities.periods.last_7_days"),+ };+ }+ });+});diff --git a/plugins/voice/config/locales/client.en.yml b/plugins/voice/config/locales/client.en.ymlindex 27a7cd755a0..49e51861c09 100644--- a/plugins/voice/config/locales/client.en.yml+++ b/plugins/voice/config/locales/client.en.yml@@ -1,6 +1,10 @@en:js:voice:+ about:+ participants:+ one: "%{formatted_number} person joined voice chats"+ other: "%{formatted_number} people joined voice chats"sidebar:title: "Voice rooms"create: "Create room"diff --git a/plugins/voice/plugin.rb b/plugins/voice/plugin.rbindex 08326df60d5..5091cc19134 100644--- a/plugins/voice/plugin.rb+++ b/plugins/voice/plugin.rb@@ -98,6 +98,8 @@ add_admin_route "voice.admin.title", "voice", use_new_show_route: truerequire_relative "lib/voice"after_initialize do+ register_stat("voice_users", expose_via_api: true) { Voice::Statistics.about_users }+SeedFu.fixture_paths << Rails.root.join("plugins/voice/db/fixtures").to_srequire_relative "lib/voice/user_extension"diff --git a/plugins/voice/spec/services/voice/statistics_spec.rb b/plugins/voice/spec/services/voice/statistics_spec.rbnew file mode 100644index 00000000000..ce7cf0986d9--- /dev/null+++ b/plugins/voice/spec/services/voice/statistics_spec.rb@@ -0,0 +1,41 @@+# frozen_string_literal: true++require "rails_helper"++RSpec.describe Voice::Statistics do+ fab!(:user)+ fab!(:room, :voice_room)++ before do+ freeze_time+ SiteSetting.voice_enabled = true+ SiteSetting.voice_analytics_enabled = true+ end++ it "counts each participant once across rooms and repeat visits in the last seven days" do+ Fabricate(:voice_session, user: user, room: room, joined_at: 1.day.ago)+ Fabricate(:voice_session, user: user, joined_at: 2.days.ago)+ Fabricate(:voice_session, room: room, joined_at: 6.days.ago, left_at: nil)+ Fabricate(:voice_session, room: room, joined_at: 7.days.ago)+ Fabricate(:voice_session, room: room, joined_at: 8.days.ago)++ expect(described_class.about_users).to eq("7_days": 2)+ expect(About.fetch_stats[:voice_users_7_days]).to eq(2)+ end++ it "returns zero when nobody joined recently" do+ expect(described_class.about_users).to eq("7_days": 0)+ end++ it "omits the statistic when voice is disabled" do+ SiteSetting.voice_enabled = false++ expect(About.fetch_stats).not_to have_key(:voice_users_7_days)+ end++ it "omits the statistic when analytics are disabled" do+ SiteSetting.voice_analytics_enabled = false++ expect(About.fetch_stats).not_to have_key(:voice_users_7_days)+ end+end