diff --git a/internal/services/gateway/admin.go b/internal/services/gateway/admin.go index 86ca7d2..a1bc601 100644 --- a/internal/services/gateway/admin.go +++ b/internal/services/gateway/admin.go @@ -161,7 +161,13 @@ func (s *Server) adminListChannels(w http.ResponseWriter, r *http.Request) { continue } } - sum := ChannelSummary{Name: ch.Name(), Connected: ch.IsConnected()} + // Aggregate by platform: a bare adapter ("kook") and the multi-account + // ones ("kook:fc2048", "kook:conf1") are ONE platform row, so the account + // list is not duplicated into a separate row per in-registry adapter. + if s.hasChannelSummary(out, platform) { + continue + } + sum := ChannelSummary{Name: platform, Connected: ch.IsConnected()} if accts, ok := accountsByPlatform[platform]; ok && len(accts) > 0 { sum.Accounts = enrichAccountsWithBot(accts, botByPlatform[platform]) } diff --git a/internal/services/gateway/admin_write_channel_config_test.go b/internal/services/gateway/admin_write_channel_config_test.go index 08ec2d9..b4d881a 100644 --- a/internal/services/gateway/admin_write_channel_config_test.go +++ b/internal/services/gateway/admin_write_channel_config_test.go @@ -202,10 +202,10 @@ func TestAdminDeleteChannelAccountRemovesFromList(t *testing.T) { _, ts, jwt := buildEnv(t, cfgDefault(), Deps{Registry: caps, Channels: store}) tok := signAny(t, jwt, "acct", auth.RoleOwner) - // Before the delete the account shows up. + // Before the delete the account shows up (aggregated into a single "kook" row). items, _ := adminChannelsList(t, ts, tok) - if len(items) != 1 || items[0].Name != "kook:3fc8" { - t.Fatalf("before delete items = %+v, want [kook:3fc8]", items) + if len(items) != 1 || items[0].Name != "kook" || len(items[0].Accounts) != 1 || items[0].Accounts[0].ID != "3fc8" { + t.Fatalf("before delete items = %+v, want one kook row with account 3fc8", items) } resp, body := doReq(t, http.MethodDelete, ts.URL+"/api/v1/admin/channels/kook/config?id=3fc8", nil, tok) @@ -252,8 +252,8 @@ func TestAdminDeleteChannelAccountKeepsSibling(t *testing.T) { } items, _ := adminChannelsList(t, ts, tok) - if len(items) != 1 || items[0].Name != "kook:conf1" { - t.Fatalf("items = %+v, want only kook:conf1 (deleted 3fc8 must vanish)", items) + if len(items) != 1 || items[0].Name != "kook" { + t.Fatalf("items = %+v, want one kook row (deleted 3fc8 must vanish)", items) } if len(items[0].Accounts) != 1 || items[0].Accounts[0].ID != "conf1" { t.Fatalf("accounts = %+v, want only conf1", items[0].Accounts) diff --git a/internal/services/gateway/extra_test.go b/internal/services/gateway/extra_test.go index 649a9c2..95c9091 100644 --- a/internal/services/gateway/extra_test.go +++ b/internal/services/gateway/extra_test.go @@ -597,8 +597,8 @@ func TestAdminChannels_SurfacesBotIdentity(t *testing.T) { if err := json.Unmarshal(decodeBody(t, body)["data"], &items); err != nil { t.Fatalf("decode: %v", err) } - if len(items) != 1 || items[0].Name != "kook:conf0" { - t.Fatalf("items = %+v, want single kook:conf0", items) + if len(items) != 1 || items[0].Name != "kook" { + t.Fatalf("items = %+v, want single kook row", items) } if len(items[0].Accounts) != 1 { t.Fatalf("accounts = %+v, want one", items[0].Accounts)