From 2514831a3beb362a8a37d17a6ee79169550675cc Mon Sep 17 00:00:00 2001 From: Till JS Date: Wed, 8 Apr 2026 16:37:40 +0200 Subject: [PATCH] chore(matrix): scrub final matrix references after subsystem removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The matrix subsystem was removed in a prior commit. This commit cleans up the small leftovers that grep found: - docker-compose.macmini.yml: dropped the "Matrix Stack" port-range comment, the "matrix" category from the naming convention, and a stale watchtower comment about Matrix notifications. - packages/credits/src/operations.ts: removed AI_BOT_CHAT credit operation type and its definition. It was the billing entry for "Chat with AI via Matrix bot" — no callers left. - services/mana-credits gifts schema + service + validation: removed the targetMatrixId column / param / Zod field. The corresponding PostgreSQL column was dropped manually with `ALTER TABLE gifts.gift_codes DROP COLUMN target_matrix_id` on prod. - docker/grafana/dashboards/{master,system}-overview.json: removed the `up{job="synapse"}` panel queries — they would have shown No Data forever now that Synapse is gone. Production-side cleanup performed in parallel (not in this commit): - Stopped + removed mana-matrix-{synapse,element,web,bot} containers - Removed mana-matrix-bot:local, matrix-web:latest, matrixdotorg/synapse:latest, vectorim/element-web:latest images (~3 GB) - Removed mana-matrix-bots-data Docker volume - Removed /Volumes/ManaData/matrix/ media store (4.3 MB) - DROP DATABASE matrix; DROP DATABASE synapse; on Postgres Cosmetic leftovers intentionally untouched: - Eisenhower matrix in todo (LayoutMode 'matrix') — productivity concept - ${{ matrix.service }} in .github/workflows — GitHub Actions strategy - services/mana-media/apps/api/dist/.../matrix/* — stale build output (not in git, regenerated next mana-media build) --- docker-compose.macmini.yml | 4 +--- docker/grafana/dashboards/master-overview.json | 6 ------ docker/grafana/dashboards/system-overview.json | 6 ------ packages/credits/src/operations.ts | 12 ------------ services/mana-credits/src/db/schema/gifts.ts | 1 - services/mana-credits/src/lib/validation.ts | 1 - services/mana-credits/src/services/gift-code.ts | 2 -- 7 files changed, 1 insertion(+), 31 deletions(-) diff --git a/docker-compose.macmini.yml b/docker-compose.macmini.yml index 41d8192db..c7a0b689f 100644 --- a/docker-compose.macmini.yml +++ b/docker-compose.macmini.yml @@ -3,14 +3,13 @@ # # Port Schema: # 3000-3099: Core Services & Backends -# 4000-4099: Matrix Stack # 5000-5099: Web Frontends # 5100-5199: Games # 8000-8099: Monitoring Dashboards # 9000-9199: Infrastructure & Exporters # # Naming Convention: mana-{category}-{service} -# Categories: infra, core, app, matrix, mon, auto +# Categories: infra, core, app, mon, auto # # Memory Limits: # All containers have explicit mem_limit to prevent unbounded growth. @@ -1352,7 +1351,6 @@ services: WATCHTOWER_POLL_INTERVAL: 300 WATCHTOWER_CLEANUP: "true" WATCHTOWER_INCLUDE_STOPPED: "false" - # Notifications disabled - configure Matrix if needed # ============================================ # Volumes (Naming: mana-{service}-data) diff --git a/docker/grafana/dashboards/master-overview.json b/docker/grafana/dashboards/master-overview.json index a65c7c96b..0d51bb3ca 100644 --- a/docker/grafana/dashboards/master-overview.json +++ b/docker/grafana/dashboards/master-overview.json @@ -510,12 +510,6 @@ "legendFormat": "Media", "refId": "T" }, - { - "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "up{job=\"synapse\"}", - "legendFormat": "Synapse", - "refId": "U" - }, { "datasource": { "type": "prometheus", "uid": "${datasource}" }, "expr": "pg_up", diff --git a/docker/grafana/dashboards/system-overview.json b/docker/grafana/dashboards/system-overview.json index b629e2edb..4465ea5f8 100644 --- a/docker/grafana/dashboards/system-overview.json +++ b/docker/grafana/dashboards/system-overview.json @@ -637,12 +637,6 @@ "legendFormat": "Media", "refId": "T" }, - { - "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "up{job=\"synapse\"}", - "legendFormat": "Synapse", - "refId": "U" - }, { "datasource": { "type": "prometheus", "uid": "${datasource}" }, "expr": "pg_up", diff --git a/packages/credits/src/operations.ts b/packages/credits/src/operations.ts index 7ac502abc..523534245 100644 --- a/packages/credits/src/operations.ts +++ b/packages/credits/src/operations.ts @@ -53,9 +53,6 @@ export enum CreditOperationType { // Context - AI text generation AI_CONTEXT_GENERATION = 'ai_context_generation', - // Matrix Bots - Bot chat - AI_BOT_CHAT = 'ai_bot_chat', - // General AI features AI_SMART_SCHEDULING = 'ai_smart_scheduling', AI_SUGGESTIONS = 'ai_suggestions', @@ -132,7 +129,6 @@ export const CREDIT_COSTS: Record = { [CreditOperationType.AI_PLANT_ANALYSIS]: 2, [CreditOperationType.AI_GUIDE_GENERATION]: 5, [CreditOperationType.AI_CONTEXT_GENERATION]: 2, - [CreditOperationType.AI_BOT_CHAT]: 0.1, [CreditOperationType.AI_SMART_SCHEDULING]: 2, [CreditOperationType.AI_SUGGESTIONS]: 2, @@ -312,14 +308,6 @@ export const OPERATION_METADATA: Record app: 'context', }, - // Matrix Bots - [CreditOperationType.AI_BOT_CHAT]: { - name: 'Bot Chat Message', - description: 'Chat with AI via Matrix bot', - category: CreditCategory.AI, - app: 'matrix', - }, - // General AI [CreditOperationType.AI_SMART_SCHEDULING]: { name: 'Smart Scheduling', diff --git a/services/mana-credits/src/db/schema/gifts.ts b/services/mana-credits/src/db/schema/gifts.ts index feeabe453..423a2a28e 100644 --- a/services/mana-credits/src/db/schema/gifts.ts +++ b/services/mana-credits/src/db/schema/gifts.ts @@ -61,7 +61,6 @@ export const giftCodes = giftsSchema.table( // Personalization targetEmail: text('target_email'), - targetMatrixId: text('target_matrix_id'), // Riddle riddleQuestion: text('riddle_question'), diff --git a/services/mana-credits/src/lib/validation.ts b/services/mana-credits/src/lib/validation.ts index 20b3ffef8..4c9779048 100644 --- a/services/mana-credits/src/lib/validation.ts +++ b/services/mana-credits/src/lib/validation.ts @@ -48,7 +48,6 @@ export const createGiftSchema = z.object({ type: z.enum(['simple', 'personalized', 'split', 'first_come', 'riddle']).default('simple'), totalPortions: z.number().int().positive().max(100).default(1), targetEmail: z.string().email().optional(), - targetMatrixId: z.string().optional(), riddleQuestion: z.string().max(200).optional(), riddleAnswer: z.string().optional(), message: z.string().max(500).optional(), diff --git a/services/mana-credits/src/services/gift-code.ts b/services/mana-credits/src/services/gift-code.ts index 41868d4c0..662b0e03b 100644 --- a/services/mana-credits/src/services/gift-code.ts +++ b/services/mana-credits/src/services/gift-code.ts @@ -22,7 +22,6 @@ interface CreateGiftParams { type?: 'simple' | 'personalized' | 'split' | 'first_come' | 'riddle'; totalPortions?: number; targetEmail?: string; - targetMatrixId?: string; riddleQuestion?: string; riddleAnswer?: string; message?: string; @@ -118,7 +117,6 @@ export class GiftCodeService { totalPortions, type, targetEmail: params.targetEmail, - targetMatrixId: params.targetMatrixId, riddleQuestion: params.riddleQuestion, riddleAnswerHash, message: params.message,