summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-05-07 20:17:53 +0000
committerEmber <acomputerdog@gmail.com>2024-05-07 20:17:53 +0000
commit89f4f0e5f4df75552d2aaf111a56f8cc0f796e2c (patch)
tree60ac391c9b18a34781c03bf48ffa940b4b32b815 /packages/backend/src/core
parentmerge: hide images/videos in og cards, when under a CW - fixes #487 (!488) (diff)
downloadsharkey-89f4f0e5f4df75552d2aaf111a56f8cc0f796e2c.tar.gz
sharkey-89f4f0e5f4df75552d2aaf111a56f8cc0f796e2c.tar.bz2
sharkey-89f4f0e5f4df75552d2aaf111a56f8cc0f796e2c.zip
don't count "system" local accounts in user chart - fixes #451
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/chart/charts/users.ts7
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/backend/src/core/chart/charts/users.ts b/packages/backend/src/core/chart/charts/users.ts
index d148fc629b..840522ae9b 100644
--- a/packages/backend/src/core/chart/charts/users.ts
+++ b/packages/backend/src/core/chart/charts/users.ts
@@ -4,7 +4,7 @@
*/
import { Injectable, Inject } from '@nestjs/common';
-import { Not, IsNull, DataSource } from 'typeorm';
+import { Not, IsNull, Like, DataSource } from 'typeorm';
import type { MiUser } from '@/models/User.js';
import { AppLockService } from '@/core/AppLockService.js';
import { DI } from '@/di-symbols.js';
@@ -37,7 +37,10 @@ export default class UsersChart extends Chart<typeof schema> { // eslint-disable
protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
const [localCount, remoteCount] = await Promise.all([
- this.usersRepository.countBy({ host: IsNull() }),
+ // that Not(Like()) is ugly, but it matches the logic in
+ // packages/backend/src/models/User.ts to not count "system"
+ // accounts
+ this.usersRepository.countBy({ host: IsNull(), username: Not(Like('%.%')) }),
this.usersRepository.countBy({ host: Not(IsNull()) }),
]);