From 0d8521855f04cd983b961be573851e5e33871bcc Mon Sep 17 00:00:00 2001 From: vegard Date: Mon, 16 Mar 2026 02:26:02 +0100 Subject: [PATCH] Admin: per-kanal warmup-konfigurasjon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - channels.config får warmup_mode (all/messages/days/none) og warmup_value - Migrasjon setter default til "all" for eksisterende kanaler - Admin-side /admin/channels med oversikt og inline-redigering - API PATCH /api/channels/:id/config for å oppdatere konfig - Worker respekterer per-kanal konfig ved warmup - Sidebar-lenke til kanaler-admin Co-Authored-By: Claude Opus 4.6 --- migrations/0006_warmup_config.sql | 8 + web/src/lib/components/Sidebar.svelte | 1 + web/src/routes/admin/channels/+page.server.ts | 33 ++ web/src/routes/admin/channels/+page.svelte | 348 ++++++++++++++++++ .../api/channels/[id]/config/+server.ts | 30 ++ worker/src/warmup.rs | 115 ++++-- 6 files changed, 508 insertions(+), 27 deletions(-) create mode 100644 migrations/0006_warmup_config.sql create mode 100644 web/src/routes/admin/channels/+page.server.ts create mode 100644 web/src/routes/admin/channels/+page.svelte create mode 100644 web/src/routes/api/channels/[id]/config/+server.ts diff --git a/migrations/0006_warmup_config.sql b/migrations/0006_warmup_config.sql new file mode 100644 index 0000000..33f0a90 --- /dev/null +++ b/migrations/0006_warmup_config.sql @@ -0,0 +1,8 @@ +-- Legg til warmup-innstillinger i channels.config +-- Default: warmup_mode = "all", warmup_value = null (last alt) +-- Andre moduser: "messages" (siste N), "days" (siste N dager), "none" (ikke last) + +UPDATE channels +SET config = config + || '{"warmup_mode": "all", "warmup_value": null}'::jsonb +WHERE NOT (config ? 'warmup_mode'); diff --git a/web/src/lib/components/Sidebar.svelte b/web/src/lib/components/Sidebar.svelte index 7714da0..c7dade7 100644 --- a/web/src/lib/components/Sidebar.svelte +++ b/web/src/lib/components/Sidebar.svelte @@ -145,6 +145,7 @@ {/each}
  • (open = false)}>Rediger sider
    • +
  • (open = false)}>Kanaler
    • diff --git a/web/src/routes/admin/channels/+page.server.ts b/web/src/routes/admin/channels/+page.server.ts new file mode 100644 index 0000000..082a3ab --- /dev/null +++ b/web/src/routes/admin/channels/+page.server.ts @@ -0,0 +1,33 @@ +import { error } from '@sveltejs/kit'; +import type { PageServerLoad } from './$types'; +import { sql } from '$lib/server/db'; + +export const load: PageServerLoad = async ({ locals }) => { + if (!locals.workspace) error(404); + + const channels = await sql` + SELECT + c.id, + c.name, + c.config, + n.workspace_id, + p.name AS parent_name, + (SELECT count(*)::int FROM messages m WHERE m.channel_id = c.id) AS message_count, + (SELECT max(m.created_at) FROM messages m WHERE m.channel_id = c.id) AS last_message_at + FROM channels c + JOIN nodes n ON n.id = c.id + LEFT JOIN nodes pn ON pn.id = c.parent_id + LEFT JOIN ( + SELECT id, COALESCE( + (SELECT name FROM channels WHERE id = pn2.id), + (SELECT title FROM factoids WHERE id = pn2.id), + pn2.node_type + ) AS name + FROM nodes pn2 + ) p ON p.id = c.parent_id + WHERE n.workspace_id = ${locals.workspace.id} + ORDER BY c.name + `; + + return { channels }; +}; diff --git a/web/src/routes/admin/channels/+page.svelte b/web/src/routes/admin/channels/+page.svelte new file mode 100644 index 0000000..756adbe --- /dev/null +++ b/web/src/routes/admin/channels/+page.svelte @@ -0,0 +1,348 @@ + + +
    +
    +

    Kanaler

    + {activeChannels} aktive / {channels.length} totalt / {totalMessages} meldinger +
    + + {#if errorMsg} +
    {errorMsg}
    + {/if} + +
    +
    + Kanal + Tilhører + Meldinger + Siste aktivitet + Warmup + Verdi + +
    + + {#each channels as channel (channel.id)} + {@const mode = getWarmupMode(channel.config)} + {@const value = getWarmupValue(channel.config)} +
    + {channel.name} + {channel.parent_name ?? '—'} + {channel.message_count} + {formatDate(channel.last_message_at)} + + + + + {#if mode === 'messages' || mode === 'days'} + setValue(channel, parseInt((e.target as HTMLInputElement).value) || 100)} + /> + {:else} + {mode === 'all' ? 'Alt' : '—'} + {/if} + + + {#if saving === channel.id} + ... + {:else if saved === channel.id} + OK + {/if} + +
    + {/each} + + {#if channels.length === 0} +

    Ingen kanaler funnet i dette workspacet.

    + {/if} +
    + +
    + Warmup-moduser +
      +
    • Alt — laster alle meldinger i kanalen inn i SpacetimeDB ved oppstart
      • +
    • Siste N meldinger — laster kun de N nyeste meldingene
      • +
    • Siste N dager — laster meldinger fra de siste N dagene
      • +
    • Ingen — kanalen lastes ikke inn (arkivert/inaktiv)
      • +
    +

    Endringer trer i kraft ved neste restart av worker.

    +
    +
    + + diff --git a/web/src/routes/api/channels/[id]/config/+server.ts b/web/src/routes/api/channels/[id]/config/+server.ts new file mode 100644 index 0000000..4bbaf0b --- /dev/null +++ b/web/src/routes/api/channels/[id]/config/+server.ts @@ -0,0 +1,30 @@ +import { json, error } from '@sveltejs/kit'; +import type { RequestHandler } from './$types'; +import { sql } from '$lib/server/db'; + +/** PATCH /api/channels/:id/config — Oppdater kanal-konfig (merge) */ +export const PATCH: RequestHandler = async ({ params, request, locals }) => { + if (!locals.workspace || !locals.user) error(401); + + const updates = await request.json(); + if (!updates || typeof updates !== 'object') error(400, 'Ugyldig config'); + + // Verifiser at kanalen tilhører workspace + const [channel] = await sql` + SELECT c.id, c.config + FROM channels c + JOIN nodes n ON n.id = c.id + WHERE c.id = ${params.id}::uuid AND n.workspace_id = ${locals.workspace.id} + `; + if (!channel) error(404, 'Kanal ikke funnet'); + + // Merge oppdateringer inn i eksisterende config + await sql` + UPDATE channels + SET config = config || ${sql.json(updates)} + WHERE id = ${params.id}::uuid + `; + + const [updated] = await sql`SELECT config FROM channels WHERE id = ${params.id}::uuid`; + return json(updated.config); +}; diff --git a/worker/src/warmup.rs b/worker/src/warmup.rs index 905b268..0b1c1d1 100644 --- a/worker/src/warmup.rs +++ b/worker/src/warmup.rs @@ -1,45 +1,92 @@ use reqwest::Client; +use serde::Deserialize; use sqlx::PgPool; use tracing::{info, warn}; -/// Oppvarming: les siste N meldinger per aktive kanal fra PG og last inn i SpacetimeDB. +#[derive(Deserialize)] +struct ChannelConfig { + #[serde(default = "default_warmup_mode")] + warmup_mode: String, + warmup_value: Option, +} + +fn default_warmup_mode() -> String { + "all".to_string() +} + +struct ChannelInfo { + id: String, + name: String, + config: ChannelConfig, +} + +/// Oppvarming: les meldinger per kanal fra PG og last inn i SpacetimeDB. +/// Respekterer per-kanal warmup-konfigurasjon. pub async fn run( pool: &PgPool, http: &Client, spacetimedb_url: &str, module: &str, - limit: i64, + default_limit: i64, ) -> anyhow::Result<()> { - info!(limit, "Starter oppvarming (PG → SpacetimeDB)"); + info!("Starter oppvarming (PG → SpacetimeDB)"); - // Finn aktive kanaler (kanaler med meldinger) - let channels: Vec<(String,)> = sqlx::query_as( - "SELECT DISTINCT channel_id::text FROM messages WHERE channel_id IS NOT NULL" + // Hent kanaler med konfig + let rows: Vec<(String, String, serde_json::Value)> = sqlx::query_as( + "SELECT c.id::text, c.name, c.config FROM channels c JOIN nodes n ON n.id = c.id" ) .fetch_all(pool) .await?; + let channels: Vec = rows.into_iter().map(|(id, name, config_val)| { + let config: ChannelConfig = serde_json::from_value(config_val) + .unwrap_or(ChannelConfig { warmup_mode: default_warmup_mode(), warmup_value: None }); + ChannelInfo { id, name, config } + }).collect(); + if channels.is_empty() { - info!("Ingen aktive kanaler funnet — oppvarming fullført"); + info!("Ingen kanaler funnet — oppvarming fullført"); return Ok(()); } - info!(channels = channels.len(), "Aktive kanaler funnet"); + let active: Vec<&ChannelInfo> = channels.iter() + .filter(|c| c.config.warmup_mode != "none") + .collect(); + + info!( + total = channels.len(), + active = active.len(), + skipped = channels.len() - active.len(), + "Kanaler funnet" + ); let mut total_messages = 0u64; let mut total_reactions = 0u64; - for (channel_id,) in &channels { - // Rydd kanalen i SpacetimeDB først for å unngå duplikater + for ch in &active { + // Rydd kanalen i SpacetimeDB først if let Err(e) = call_reducer(http, spacetimedb_url, module, "clear_channel", &serde_json::json!({ - "channel_id": channel_id + "channel_id": ch.id })).await { - warn!(channel_id, error = %e, "Kunne ikke rydde kanal — hopper over"); + warn!(channel = %ch.name, error = %e, "Kunne ikke rydde kanal — hopper over"); continue; } - // Hent meldinger med forfatterinfo - let rows: Vec<(String, String, String, String, String, String, String, Option, String)> = sqlx::query_as( + // Bygg WHERE-clause basert på warmup-modus + let (where_clause, limit) = match ch.config.warmup_mode.as_str() { + "messages" => { + let n = ch.config.warmup_value.unwrap_or(default_limit); + (String::new(), n) + }, + "days" => { + let days = ch.config.warmup_value.unwrap_or(30); + (format!("AND m.created_at >= now() - interval '{} days'", days), i64::MAX) + }, + // "all" og alt annet + _ => (String::new(), i64::MAX), + }; + + let query = format!( r#" SELECT m.id::text, @@ -54,17 +101,24 @@ pub async fn run( FROM messages m JOIN nodes n ON n.id = m.id LEFT JOIN users u ON u.authentik_id = m.author_id - WHERE m.channel_id = $1::uuid + WHERE m.channel_id = $1::uuid {} ORDER BY m.created_at DESC LIMIT $2 - "# - ) - .bind(channel_id) - .bind(limit) - .fetch_all(pool) - .await?; + "#, + where_clause + ); - if rows.is_empty() { continue; } + let rows: Vec<(String, String, String, String, String, String, String, Option, String)> = + sqlx::query_as(&query) + .bind(&ch.id) + .bind(limit) + .fetch_all(pool) + .await?; + + if rows.is_empty() { + info!(channel = %ch.name, mode = %ch.config.warmup_mode, "Ingen meldinger å laste"); + continue; + } // Bygg JSON-array let messages: Vec = rows.iter().map(|r| { @@ -87,7 +141,7 @@ pub async fn run( if let Err(e) = call_reducer(http, spacetimedb_url, module, "load_messages", &serde_json::json!({ "messages_json": json_str })).await { - warn!(channel_id, error = %e, "Feil ved lasting av meldinger"); + warn!(channel = %ch.name, error = %e, "Feil ved lasting av meldinger"); continue; } @@ -107,7 +161,7 @@ pub async fn run( WHERE m.channel_id = $1::uuid "# ) - .bind(channel_id) + .bind(&ch.id) .fetch_all(pool) .await?; @@ -125,17 +179,24 @@ pub async fn run( if let Err(e) = call_reducer(http, spacetimedb_url, module, "load_reactions", &serde_json::json!({ "reactions_json": reactions_json })).await { - warn!(channel_id, error = %e, "Feil ved lasting av reaksjoner"); + warn!(channel = %ch.name, error = %e, "Feil ved lasting av reaksjoner"); } else { total_reactions += reaction_rows.len() as u64; } } - info!(channel_id, messages = count, reactions = reaction_rows.len(), "Kanal oppvarmet"); + info!( + channel = %ch.name, + mode = %ch.config.warmup_mode, + value = ?ch.config.warmup_value, + messages = count, + reactions = reaction_rows.len(), + "Kanal oppvarmet" + ); } info!( - channels = channels.len(), + channels = active.len(), messages = total_messages, reactions = total_reactions, "Oppvarming fullført"