fix(analytics): handle anonymous users, fix #269

koishijs · Dec 18, 2023 · 1060ecc · 1060ecc
1 parent 4fe9615
commit 1060ecc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/plugins/analytics/package.json b/plugins/analytics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@koishijs/plugin-analytics",
   "description": "Show statistics for Koishi application",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

diff --git a/plugins/analytics/src/index.ts b/plugins/analytics/src/index.ts
@@ -69,7 +69,6 @@ class Analytics extends DataService<Analytics.Payload> {
     })
 
     ctx.on('message', (session) => {
-      if (session.bot.hidden) return
       this.addAudit(this.messages, {
         ...this.createIndex(session),
         type: 'receive',
@@ -78,7 +77,6 @@ class Analytics extends DataService<Analytics.Payload> {
     })
 
     ctx.on('send', (session) => {
-      if (session.bot.hidden) return
       this.addAudit(this.messages, {
         ...this.createIndex(session),
         type: 'send',
@@ -87,11 +85,10 @@ class Analytics extends DataService<Analytics.Payload> {
     })
 
     ctx.any().before('command/execute', ({ command, session }) => {
-      if (session.bot.hidden) return
       this.addAudit(this.commands, {
         ...this.createIndex(session),
         name: command.name,
-        userId: session.user['id'],
+        userId: session.user['id'] || 0,
         channelId: session.channelId,
       })
       this.upload()
@@ -171,6 +168,7 @@ class Analytics extends DataService<Analytics.Payload> {
     const data = await this.ctx.database
       .select('analytics.command', {
         date: { $gte: Time.getDateNumber() - 7 },
+        userId: { $gt: 0 },
       })
       .groupBy(['date'], {
         count: row => $.count(row.userId),

diff --git a/plugins/status/package.json b/plugins/status/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@koishijs/client": "^5.21.0",
-    "@koishijs/plugin-analytics": "^2.0.1",
+    "@koishijs/plugin-analytics": "^2.0.2",
     "@types/envinfo": "^7.8.3",
     "@types/throttle-debounce": "^2.1.0",
     "koishi": "^4.16.1"