From 6ee65eeeff7e3914626d865127dd9157901bd3ba Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Mon, 3 Aug 2026 11:25:33 +0300 Subject: [PATCH] appview/xrpc,deliberi: `api/tangled` -> `api/org_tangled` Signed-off-by: Seongmin Lee Signed-off-by: dawn --- appview/repo/webhooks.go | 42 +++++++++++++++++----------------- deliberi/bobbin.go | 5 ++-- deliberi/xrpc/account.go | 2 +- deliberi/xrpc/notifications.go | 2 +- deliberi/xrpc/signup.go | 2 +- deliberi/xrpc/xrpc.go | 2 +- deliberi/xrpc/xrpc_test.go | 2 +- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/appview/repo/webhooks.go b/appview/repo/webhooks.go index 677224a1b..7f49a6b81 100644 --- a/appview/repo/webhooks.go +++ b/appview/repo/webhooks.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-chi/chi/v5" - "tangled.org/core/api/tangled" + "tangled.org/core/api/org_tangled" "tangled.org/core/appview/models" "tangled.org/core/appview/pages" ) @@ -38,7 +38,7 @@ func webhookEventsFromForm(r *http.Request) []string { // webhookFromXrpc adapts a spindle listWebhooks item into the view model the // settings templates render. -func webhookFromXrpc(wh *tangled.TempWebhookListWebhooks_Webhook) models.Webhook { +func webhookFromXrpc(wh *org_tangled.TempWebhookListWebhooks_Webhook) models.Webhook { m := models.Webhook{ Id: wh.Id, Url: wh.Url, @@ -56,7 +56,7 @@ func webhookFromXrpc(wh *tangled.TempWebhookListWebhooks_Webhook) models.Webhook return m } -func deliveryFromXrpc(d *tangled.TempWebhookGetDeliveriesForWebhooks_Delivery) models.WebhookDelivery { +func deliveryFromXrpc(d *org_tangled.TempWebhookGetDeliveriesForWebhooks_Delivery) models.WebhookDelivery { m := models.WebhookDelivery{ Id: d.Id, DeliveryId: d.DeliveryId, @@ -102,14 +102,14 @@ func (rp *Repo) Webhooks(w http.ResponseWriter, r *http.Request) { return } - client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, tangled.TempWebhookListWebhooksNSID) + client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, org_tangled.TempWebhookListWebhooksNSID) if err != nil { l.Error("failed to build spindle client", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to authorize with spindle") return } - out, err := tangled.TempWebhookListWebhooks(r.Context(), client, f.RepoDid) + out, err := org_tangled.TempWebhookListWebhooks(r.Context(), client, f.RepoDid) if err != nil { l.Error("failed to list webhooks", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to load webhooks") @@ -128,8 +128,8 @@ func (rp *Repo) Webhooks(w http.ResponseWriter, r *http.Request) { ids = append(ids, webhook.Id) } if len(ids) > 0 { - if dclient, err := rp.oauth.SpindleServiceClient(r, f.Spindle, tangled.TempWebhookGetDeliveriesForWebhooksNSID); err == nil { - dout, err := tangled.TempWebhookGetDeliveriesForWebhooks(r.Context(), dclient, ids, deliveriesPerWebhook, f.RepoDid) + if dclient, err := rp.oauth.SpindleServiceClient(r, f.Spindle, org_tangled.TempWebhookGetDeliveriesForWebhooksNSID); err == nil { + dout, err := org_tangled.TempWebhookGetDeliveriesForWebhooks(r.Context(), dclient, ids, deliveriesPerWebhook, f.RepoDid) if err != nil { l.Error("failed to get webhook deliveries", "err", err) } else { @@ -180,7 +180,7 @@ func (rp *Repo) AddWebhook(w http.ResponseWriter, r *http.Request) { } active := r.FormValue("active") == "on" - input := &tangled.TempWebhookCreateWebhook_Input{ + input := &org_tangled.TempWebhookCreateWebhook_Input{ RepoDid: f.RepoDid, Url: url, Events: events, @@ -190,13 +190,13 @@ func (rp *Repo) AddWebhook(w http.ResponseWriter, r *http.Request) { input.Secret = &secret } - client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, tangled.TempWebhookCreateWebhookNSID) + client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, org_tangled.TempWebhookCreateWebhookNSID) if err != nil { l.Error("failed to build spindle client", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to authorize with spindle") return } - if _, err := tangled.TempWebhookCreateWebhook(r.Context(), client, input); err != nil { + if _, err := org_tangled.TempWebhookCreateWebhook(r.Context(), client, input); err != nil { l.Error("failed to add webhook", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to create webhook") return @@ -228,7 +228,7 @@ func (rp *Repo) UpdateWebhook(w http.ResponseWriter, r *http.Request) { } active := r.FormValue("active") == "on" - input := &tangled.TempWebhookUpdateWebhook_Input{ + input := &org_tangled.TempWebhookUpdateWebhook_Input{ Id: id, RepoDid: f.RepoDid, Active: &active, @@ -248,13 +248,13 @@ func (rp *Repo) UpdateWebhook(w http.ResponseWriter, r *http.Request) { input.Events = events } - client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, tangled.TempWebhookUpdateWebhookNSID) + client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, org_tangled.TempWebhookUpdateWebhookNSID) if err != nil { l.Error("failed to build spindle client", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to authorize with spindle") return } - if err := tangled.TempWebhookUpdateWebhook(r.Context(), client, input); err != nil { + if err := org_tangled.TempWebhookUpdateWebhook(r.Context(), client, input); err != nil { l.Error("failed to update webhook", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to update webhook") return @@ -285,13 +285,13 @@ func (rp *Repo) DeleteWebhook(w http.ResponseWriter, r *http.Request) { return } - client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, tangled.TempWebhookDeleteWebhookNSID) + client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, org_tangled.TempWebhookDeleteWebhookNSID) if err != nil { l.Error("failed to build spindle client", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to authorize with spindle") return } - if err := tangled.TempWebhookDeleteWebhook(r.Context(), client, &tangled.TempWebhookDeleteWebhook_Input{ + if err := org_tangled.TempWebhookDeleteWebhook(r.Context(), client, &org_tangled.TempWebhookDeleteWebhook_Input{ Id: id, RepoDid: f.RepoDid, }); err != nil { @@ -325,13 +325,13 @@ func (rp *Repo) ToggleWebhook(w http.ResponseWriter, r *http.Request) { return } - client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, tangled.TempWebhookToggleWebhookNSID) + client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, org_tangled.TempWebhookToggleWebhookNSID) if err != nil { l.Error("failed to build spindle client", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to authorize with spindle") return } - if _, err := tangled.TempWebhookToggleWebhook(r.Context(), client, &tangled.TempWebhookToggleWebhook_Input{ + if _, err := org_tangled.TempWebhookToggleWebhook(r.Context(), client, &org_tangled.TempWebhookToggleWebhook_Input{ Id: id, RepoDid: f.RepoDid, }); err != nil { @@ -368,13 +368,13 @@ func (rp *Repo) WebhookDeliveries(w http.ResponseWriter, r *http.Request) { user := rp.oauth.GetMultiAccountUser(r) // look up the webhook (for its URL header) and its deliveries - listClient, err := rp.oauth.SpindleServiceClient(r, f.Spindle, tangled.TempWebhookListWebhooksNSID) + listClient, err := rp.oauth.SpindleServiceClient(r, f.Spindle, org_tangled.TempWebhookListWebhooksNSID) if err != nil { l.Error("failed to build spindle client", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to authorize with spindle") return } - listOut, err := tangled.TempWebhookListWebhooks(r.Context(), listClient, f.RepoDid) + listOut, err := org_tangled.TempWebhookListWebhooks(r.Context(), listClient, f.RepoDid) if err != nil { l.Error("failed to list webhooks", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to load deliveries") @@ -393,13 +393,13 @@ func (rp *Repo) WebhookDeliveries(w http.ResponseWriter, r *http.Request) { return } - client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, tangled.TempWebhookGetDeliveriesForWebhooksNSID) + client, err := rp.oauth.SpindleServiceClient(r, f.Spindle, org_tangled.TempWebhookGetDeliveriesForWebhooksNSID) if err != nil { l.Error("failed to build spindle client", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to authorize with spindle") return } - dout, err := tangled.TempWebhookGetDeliveriesForWebhooks(r.Context(), client, []int64{id}, 100, f.RepoDid) + dout, err := org_tangled.TempWebhookGetDeliveriesForWebhooks(r.Context(), client, []int64{id}, 100, f.RepoDid) if err != nil { l.Error("failed to get webhook deliveries", "err", err) rp.pages.Notice(w, "webhooks-error", "Failed to load deliveries") diff --git a/deliberi/bobbin.go b/deliberi/bobbin.go index 1aa5db560..8736132e0 100644 --- a/deliberi/bobbin.go +++ b/deliberi/bobbin.go @@ -11,6 +11,7 @@ import ( "github.com/bluesky-social/indigo/atproto/syntax" indigoxrpc "github.com/bluesky-social/indigo/xrpc" "tangled.org/core/api/tangled" + "tangled.org/core/api/org_tangled" ) type recipientResolver interface { @@ -32,9 +33,9 @@ func newBobbinClient(apiUrl string) *bobbinClient { } func (c *bobbinClient) ListRecipients(ctx context.Context, uri string, collection string) ([]string, error) { - out, err := tangled.TempNotificationListRecipients(ctx, c.xc, collection, uri) + out, err := org_tangled.TempNotificationListRecipients(ctx, c.xc, collection, uri) if err != nil { - return nil, fmt.Errorf("calling %s: %w", tangled.TempNotificationListRecipientsNSID, err) + return nil, fmt.Errorf("calling %s: %w", org_tangled.TempNotificationListRecipientsNSID, err) } return out.Dids, nil } diff --git a/deliberi/xrpc/account.go b/deliberi/xrpc/account.go index 172a054f9..27ccffefb 100644 --- a/deliberi/xrpc/account.go +++ b/deliberi/xrpc/account.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "tangled.org/core/api/tangled" + tangled "tangled.org/core/api/org_tangled" db "tangled.org/core/deliberi/db" xrpcerr "tangled.org/core/xrpc/errors" ) diff --git a/deliberi/xrpc/notifications.go b/deliberi/xrpc/notifications.go index 6152ad832..8caffee67 100644 --- a/deliberi/xrpc/notifications.go +++ b/deliberi/xrpc/notifications.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/bluesky-social/indigo/atproto/syntax" - "tangled.org/core/api/tangled" + tangled "tangled.org/core/api/org_tangled" db "tangled.org/core/deliberi/db" "tangled.org/core/deliberi/models" "tangled.org/core/orm" diff --git a/deliberi/xrpc/signup.go b/deliberi/xrpc/signup.go index 98ac41c9d..408af8699 100644 --- a/deliberi/xrpc/signup.go +++ b/deliberi/xrpc/signup.go @@ -9,7 +9,7 @@ import ( "net/url" "regexp" - "tangled.org/core/api/tangled" + tangled "tangled.org/core/api/org_tangled" appviewemail "tangled.org/core/appview/email" db "tangled.org/core/deliberi/db" "tangled.org/core/deliberi/models" diff --git a/deliberi/xrpc/xrpc.go b/deliberi/xrpc/xrpc.go index 5911e64f0..80b1ac63f 100644 --- a/deliberi/xrpc/xrpc.go +++ b/deliberi/xrpc/xrpc.go @@ -8,7 +8,7 @@ import ( "github.com/bluesky-social/indigo/atproto/syntax" "github.com/go-chi/chi/v5" - "tangled.org/core/api/tangled" + tangled "tangled.org/core/api/org_tangled" config "tangled.org/core/deliberi/config" db "tangled.org/core/deliberi/db" "tangled.org/core/deliberi/mailer" diff --git a/deliberi/xrpc/xrpc_test.go b/deliberi/xrpc/xrpc_test.go index 244778ac9..5738311ce 100644 --- a/deliberi/xrpc/xrpc_test.go +++ b/deliberi/xrpc/xrpc_test.go @@ -16,7 +16,7 @@ import ( "github.com/bluesky-social/indigo/atproto/auth" "github.com/bluesky-social/indigo/atproto/identity" "github.com/bluesky-social/indigo/atproto/syntax" - "tangled.org/core/api/tangled" + tangled "tangled.org/core/api/org_tangled" config "tangled.org/core/deliberi/config" db "tangled.org/core/deliberi/db" "tangled.org/core/deliberi/models" -- 2.51.2