Make storage stats consistent

src/commands/stats.rs

@@ -12,7 +12,7 @@ pub async fn stats(ctx: Context<'_>) -> Result<(), Error> {
     );
     let stats = web::archive_stats(&ctx.data().pool).await?;
     let msg = format!(
-        "# Archive Statistics\n## Messages\nArchived messages: {}\nArchived users: {}\nChannels: {}\nServers: {}\n## Storage usage\nTotal archive: {}\nMessages and metadata: {}\nAttachments: {}",
+        "# Archive Statistics\n## Messages\nArchived messages: {}\nArchived users: {}\nChannels: {}\nServers: {}\n## Storage usage\nArchived data: {}\nMessage content: {}\nAttachments: {}",
         stats.messages,
         stats.users,
         stats.channels,

src/web.rs

@@ -1072,32 +1072,14 @@ pub async fn archive_stats(pool: &PgPool) -> Result<ArchiveStats, sqlx::Error> {
              (SELECT COUNT(*) FROM discord_users),
              (SELECT COUNT(*) FROM guilds),
              (SELECT COUNT(*) FROM channels),
-             pg_total_relation_size('guilds')
-                 + pg_total_relation_size('channels')
-                 + pg_total_relation_size('discord_users')
-                 + pg_total_relation_size('discord_roles')
-                 + pg_total_relation_size('messages')
-                 + pg_total_relation_size('message_versions')
-                 + pg_total_relation_size('attachments')
-                 + pg_total_relation_size('embeds')
-                 + pg_total_relation_size('embed_fields')
-                 + pg_total_relation_size('guild_history')
-                 + pg_total_relation_size('channel_history')
-                 + pg_total_relation_size('discord_user_history')
-                 + pg_total_relation_size('guild_users'),
-             pg_total_relation_size('messages')
-                 + pg_total_relation_size('message_versions')
-                 + pg_total_relation_size('guilds')
-                 + pg_total_relation_size('channels')
-                 + pg_total_relation_size('discord_users')
-                 + pg_total_relation_size('discord_roles')
-                 + pg_total_relation_size('embeds')
-                 + pg_total_relation_size('embed_fields')
-                 + pg_total_relation_size('guild_history')
-                 + pg_total_relation_size('channel_history')
-                 + pg_total_relation_size('discord_user_history')
-                 + pg_total_relation_size('guild_users'),
-             pg_total_relation_size('attachments');",
+             (SELECT COALESCE(SUM(OCTET_LENGTH(content)), 0)
+              FROM message_versions)
+                 + (SELECT COALESCE(SUM(OCTET_LENGTH(data)), 0)
+                    FROM attachments),
+             (SELECT COALESCE(SUM(OCTET_LENGTH(content)), 0)
+              FROM message_versions),
+             (SELECT COALESCE(SUM(OCTET_LENGTH(data)), 0)
+              FROM attachments);",
     )
     .fetch_one(pool)
     .await?;

static/index.html

@@ -2,8 +2,8 @@
 <p>Archived {{message_count}} messages from {{user_count}} users across {{channel_count}} channels on {{server_count}} servers.</p>
 <h3>Storage usage</h3>
 <dl>
-    <dt>Total archive</dt><dd>{{total_storage}}</dd>
-    <dt>Messages and metadata</dt><dd>{{message_storage}}</dd>
+    <dt>Archived data</dt><dd>{{total_storage}}</dd>
+    <dt>Message content</dt><dd>{{message_storage}}</dd>
     <dt>Attachments</dt><dd>{{attachment_storage}}</dd>
 </dl>