feat(metrics): add temporary/permanent/status roles count individually

tippfehlr · Mar 11, 2024 · 84fdc79 · 84fdc79
1 parent ecc07fb
commit 84fdc79
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/src/modules/bot.ts b/src/modules/bot.ts
@@ -6,7 +6,7 @@ import {
   DBCurrentlyActiveActivity,
   addActivity,
   getActivityRoles,
-  getDBUserCount,
+  getUserCount,
   getGuildConfig,
   getRolesCount,
   getStatusRoles,
@@ -98,7 +98,7 @@ client.on(Events.ClientReady, () => {
             singular: '%s user',
             plural: '%s users',
             locale: 'en-US',
-            count: getDBUserCount()
+            count: getUserCount()
           }),
           type: ActivityType.Watching
         }
@@ -128,7 +128,7 @@ client.on(Events.ClientReady, () => {
     `Logged in as ${client.user?.username}#${client.user?.discriminator} (${client.user?.id})`
   );
   log.info(
-    `The bot is currently on ${client.guilds.cache.size} guilds with ${getDBUserCount()} users and manages ${getRolesCount()} roles`
+    `The bot is currently on ${client.guilds.cache.size} guilds with ${getUserCount()} users and manages ${getRolesCount()} roles`
   );
 
   const activityCountInCurrentlyActiveActivities = (

diff --git a/src/modules/db.ts b/src/modules/db.ts
@@ -173,31 +173,30 @@ export async function addActivity(guildID: string, activityName: string) {
   ).run(guildID, activityName, 1);
 }
 
-export function getDBUserCount(): number {
+export function getUserCount(): number {
   return (prepare('SELECT COUNT(*) FROM users').get() as { 'COUNT(*)': number })['COUNT(*)'];
 }
 
-export function getDBActivityRoleCount(): number {
+export function getActivityRoleCount(): number {
   return (prepare('SELECT COUNT(*) FROM activityRoles').get() as { 'COUNT(*)': number })['COUNT(*)'];
 }
 
-export function getDBStatusRoleCount(): number {
+export function getStatusRoleCount(): number {
   return (prepare('SELECT COUNT(*) FROM statusRoles').get() as { 'COUNT(*)': number })['COUNT(*)'];
 }
 
-export function getDBCurrentlyActiveActivityCount(): number {
+export function getCurrentlyActiveActivityCount(): number {
   return (prepare('SELECT COUNT(*) FROM currentlyActiveActivities').get() as { 'COUNT(*)': number })['COUNT(*)'];
 }
 
+export function getTempRoleCount(): number {
+  return (prepare('SELECT COUNT(*) FROM activityRoles WHERE live = 1').get() as { 'COUNT(*)': number; })['COUNT(*)'];
+}
+
+export function getPermRoleCount(): number {
+  return (prepare('SELECT COUNT(*) FROM activityRoles WHERE live = 0').get() as { 'COUNT(*)': number; })['COUNT(*)'];
+}
+
 export function getRolesCount(): number {
-  return (
-    prepare('SELECT COUNT(*) FROM activityRoles').get() as {
-      'COUNT(*)': number;
-    }
-  )['COUNT(*)'] +
-    (
-      prepare('SELECT COUNT(*) FROM statusRoles').get() as {
-        'COUNT(*)': number;
-      }
-    )['COUNT(*)']
+  return getActivityRoleCount() + getStatusRoleCount()
 }
diff --git a/src/modules/metrics.ts b/src/modules/metrics.ts
@@ -6,7 +6,7 @@ import config from './config';
 import { log } from './messages';
 
 import { stats as botStats, resetStats as resetBotStats } from './bot';
-import { getDBUserCount, getRolesCount, stats as dbStats, resetStats as resetDBStats } from './db';
+import { getUserCount, getRolesCount, stats as dbStats, resetStats as resetDBStats, getTempRoleCount, getPermRoleCount, getStatusRoleCount } from './db';
 
 export let client: InfluxDB;
 export let writeApi: WriteApi;
@@ -31,10 +31,13 @@ export async function configureInfluxDB() {
       writeIntPoint('web_socket_errors', 'web_socket_errors', botStats.webSocketErrors);
       writeIntPoint('guilds', 'guilds_total', discordClient.guilds.cache.size);
       writeIntPoint('roles', 'roles_count', getRolesCount());
+      writeIntPoint('roles', 'temporary_roles_count', getTempRoleCount());
+      writeIntPoint('roles', 'permanent_roles_count', getPermRoleCount());
+      writeIntPoint('roles', 'status_roles_count', getStatusRoleCount());
       writeApi.writePoint(
         new Point('users')
           .intField('users_cache_total', discordClient.users.cache.size)
-          .intField('users_db_total', getDBUserCount())
+          .intField('users_db_total', getUserCount())
       );
       writeIntPoint('db', 'calls', dbStats.dbCalls);
       const ram = process.memoryUsage();