From dd39eb547d4e4c77916241ada04df0cc418e16f1 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Thu, 4 Jan 2024 12:50:56 -0800 Subject: [PATCH 1/3] limit nil preservation to just label values field --- api/atproto/admindefs.go | 27 ++++- api/atproto/adminqueryModerationStatuses.go | 4 +- api/atproto/cbor_gen.go | 112 ++++++++++++-------- api/atproto/labeldefs.go | 2 +- api/bsky/cbor_gen.go | 23 +++- cmd/gosky/admin.go | 2 +- go.mod | 2 +- go.sum | 2 + lex/gen.go | 4 + mst/cbor_gen.go | 4 +- repo/cbor_gen.go | 1 + 11 files changed, 129 insertions(+), 54 deletions(-) diff --git a/api/atproto/admindefs.go b/api/atproto/admindefs.go index e07728715..b573a08b5 100644 --- a/api/atproto/admindefs.go +++ b/api/atproto/admindefs.go @@ -154,6 +154,17 @@ type AdminDefs_ModEventReport struct { ReportType *string `json:"reportType" cborgen:"reportType"` } +// AdminDefs_ModEventResolveAppeal is a "modEventResolveAppeal" in the com.atproto.admin.defs schema. +// +// # Resolve appeal on a subject +// +// RECORDTYPE: AdminDefs_ModEventResolveAppeal +type AdminDefs_ModEventResolveAppeal struct { + LexiconTypeID string `json:"$type,const=com.atproto.admin.defs#modEventResolveAppeal" cborgen:"$type,const=com.atproto.admin.defs#modEventResolveAppeal"` + // comment: Describe resolution. + Comment *string `json:"comment,omitempty" cborgen:"comment,omitempty"` +} + // AdminDefs_ModEventReverseTakedown is a "modEventReverseTakedown" in the com.atproto.admin.defs schema. // // # Revert take down action on a subject @@ -219,6 +230,7 @@ type AdminDefs_ModEventViewDetail_Event struct { AdminDefs_ModEventAcknowledge *AdminDefs_ModEventAcknowledge AdminDefs_ModEventEscalate *AdminDefs_ModEventEscalate AdminDefs_ModEventMute *AdminDefs_ModEventMute + AdminDefs_ModEventResolveAppeal *AdminDefs_ModEventResolveAppeal } func (t *AdminDefs_ModEventViewDetail_Event) MarshalJSON() ([]byte, error) { @@ -254,6 +266,10 @@ func (t *AdminDefs_ModEventViewDetail_Event) MarshalJSON() ([]byte, error) { t.AdminDefs_ModEventMute.LexiconTypeID = "com.atproto.admin.defs#modEventMute" return json.Marshal(t.AdminDefs_ModEventMute) } + if t.AdminDefs_ModEventResolveAppeal != nil { + t.AdminDefs_ModEventResolveAppeal.LexiconTypeID = "com.atproto.admin.defs#modEventResolveAppeal" + return json.Marshal(t.AdminDefs_ModEventResolveAppeal) + } return nil, fmt.Errorf("cannot marshal empty enum") } func (t *AdminDefs_ModEventViewDetail_Event) UnmarshalJSON(b []byte) error { @@ -287,6 +303,9 @@ func (t *AdminDefs_ModEventViewDetail_Event) UnmarshalJSON(b []byte) error { case "com.atproto.admin.defs#modEventMute": t.AdminDefs_ModEventMute = new(AdminDefs_ModEventMute) return json.Unmarshal(b, t.AdminDefs_ModEventMute) + case "com.atproto.admin.defs#modEventResolveAppeal": + t.AdminDefs_ModEventResolveAppeal = new(AdminDefs_ModEventResolveAppeal) + return json.Unmarshal(b, t.AdminDefs_ModEventResolveAppeal) default: return nil @@ -690,11 +709,15 @@ type AdminDefs_StatusAttr struct { // AdminDefs_SubjectStatusView is a "subjectStatusView" in the com.atproto.admin.defs schema. type AdminDefs_SubjectStatusView struct { + // appealed: True indicates that the a previously taken moderator action was appealed against, by the author of the content. False indicates last appeal was resolved by moderators. + Appealed *bool `json:"appealed,omitempty" cborgen:"appealed,omitempty"` // comment: Sticky comment on the subject. Comment *string `json:"comment,omitempty" cborgen:"comment,omitempty"` // createdAt: Timestamp referencing the first moderation status impacting event was emitted on the subject - CreatedAt string `json:"createdAt" cborgen:"createdAt"` - Id int64 `json:"id" cborgen:"id"` + CreatedAt string `json:"createdAt" cborgen:"createdAt"` + Id int64 `json:"id" cborgen:"id"` + // lastAppealedAt: Timestamp referencing when the author of the subject appealed a moderation action + LastAppealedAt *string `json:"lastAppealedAt,omitempty" cborgen:"lastAppealedAt,omitempty"` LastReportedAt *string `json:"lastReportedAt,omitempty" cborgen:"lastReportedAt,omitempty"` LastReviewedAt *string `json:"lastReviewedAt,omitempty" cborgen:"lastReviewedAt,omitempty"` LastReviewedBy *string `json:"lastReviewedBy,omitempty" cborgen:"lastReviewedBy,omitempty"` diff --git a/api/atproto/adminqueryModerationStatuses.go b/api/atproto/adminqueryModerationStatuses.go index 41b38990b..78885c226 100644 --- a/api/atproto/adminqueryModerationStatuses.go +++ b/api/atproto/adminqueryModerationStatuses.go @@ -18,6 +18,7 @@ type AdminQueryModerationStatuses_Output struct { // AdminQueryModerationStatuses calls the XRPC method "com.atproto.admin.queryModerationStatuses". // +// appealed: Get subjects in unresolved appealed status // comment: Search subjects by keyword from comments // includeMuted: By default, we don't include muted subjects in the results. Set this to true to include them. // lastReviewedBy: Get all subject statuses that were reviewed by a specific moderator @@ -27,10 +28,11 @@ type AdminQueryModerationStatuses_Output struct { // reviewedAfter: Search subjects reviewed after a given timestamp // reviewedBefore: Search subjects reviewed before a given timestamp // takendown: Get subjects that were taken down -func AdminQueryModerationStatuses(ctx context.Context, c *xrpc.Client, comment string, cursor string, ignoreSubjects []string, includeMuted bool, lastReviewedBy string, limit int64, reportedAfter string, reportedBefore string, reviewState string, reviewedAfter string, reviewedBefore string, sortDirection string, sortField string, subject string, takendown bool) (*AdminQueryModerationStatuses_Output, error) { +func AdminQueryModerationStatuses(ctx context.Context, c *xrpc.Client, appealed bool, comment string, cursor string, ignoreSubjects []string, includeMuted bool, lastReviewedBy string, limit int64, reportedAfter string, reportedBefore string, reviewState string, reviewedAfter string, reviewedBefore string, sortDirection string, sortField string, subject string, takendown bool) (*AdminQueryModerationStatuses_Output, error) { var out AdminQueryModerationStatuses_Output params := map[string]interface{}{ + "appealed": appealed, "comment": comment, "cursor": cursor, "ignoreSubjects": ignoreSubjects, diff --git a/api/atproto/cbor_gen.go b/api/atproto/cbor_gen.go index 7253bf261..6c6eec93e 100644 --- a/api/atproto/cbor_gen.go +++ b/api/atproto/cbor_gen.go @@ -226,6 +226,7 @@ func (t *SyncSubscribeRepos_Commit) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } // t.Rev (string) (string) @@ -358,6 +359,7 @@ func (t *SyncSubscribeRepos_Commit) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } // t.Since (string) (string) @@ -414,6 +416,7 @@ func (t *SyncSubscribeRepos_Commit) MarshalCBOR(w io.Writer) error { if _, err := cw.Write(t.Blocks[:]); err != nil { return err } + } // t.Commit (util.LexLink) (struct) @@ -550,9 +553,9 @@ func (t *SyncSubscribeRepos_Commit) UnmarshalCBOR(r io.Reader) (err error) { } } + } } - // t.Rev (string) (string) case "rev": @@ -668,9 +671,9 @@ func (t *SyncSubscribeRepos_Commit) UnmarshalCBOR(r io.Reader) (err error) { } } + } } - // t.Since (string) (string) case "since": @@ -714,6 +717,7 @@ func (t *SyncSubscribeRepos_Commit) UnmarshalCBOR(r io.Reader) (err error) { if _, err := io.ReadFull(cr, t.Blocks[:]); err != nil { return err } + // t.Commit (util.LexLink) (struct) case "commit": @@ -1749,13 +1753,23 @@ func (t *LabelDefs_SelfLabels) MarshalCBOR(w io.Writer) error { return xerrors.Errorf("Slice value in field t.Values was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Values))); err != nil { - return err - } - for _, v := range t.Values { - if err := v.MarshalCBOR(cw); err != nil { + if t.Values == nil { + _, err := w.Write(cbg.CborNull) + if err != nil { return err } + } else { + + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Values))); err != nil { + return err + } + for _, v := range t.Values { + if err := v.MarshalCBOR(cw); err != nil { + return err + } + + } + } return nil } @@ -1812,49 +1826,61 @@ func (t *LabelDefs_SelfLabels) UnmarshalCBOR(r io.Reader) (err error) { // t.Values ([]*atproto.LabelDefs_SelfLabel) (slice) case "values": - maj, extra, err = cr.ReadHeader() - if err != nil { - return err - } - - if extra > cbg.MaxLength { - return fmt.Errorf("t.Values: array too large (%d)", extra) - } + { + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } - if maj != cbg.MajArray { - return fmt.Errorf("expected cbor array") - } + maj, extra, err = cr.ReadHeader() + if err != nil { + return err + } - if extra > 0 { - t.Values = make([]*LabelDefs_SelfLabel, extra) - } + if extra > cbg.MaxLength { + return fmt.Errorf("t.Values: array too large (%d)", extra) + } - for i := 0; i < int(extra); i++ { - { - var maj byte - var extra uint64 - var err error - _ = maj - _ = extra - _ = err + if maj != cbg.MajArray { + return fmt.Errorf("expected cbor array") + } - { + t.Values = make([]*LabelDefs_SelfLabel, extra) + + for i := 0; i < int(extra); i++ { + { + var maj byte + var extra uint64 + var err error + _ = maj + _ = extra + _ = err + + { + + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.Values[i] = new(LabelDefs_SelfLabel) + if err := t.Values[i].UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.Values[i] pointer: %w", err) + } + } - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err } - t.Values[i] = new(LabelDefs_SelfLabel) - if err := t.Values[i].UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.Values[i] pointer: %w", err) - } - } + } } + } } @@ -2335,6 +2361,7 @@ func (t *LabelSubscribeLabels_Labels) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } return nil } @@ -2449,6 +2476,7 @@ func (t *LabelSubscribeLabels_Labels) UnmarshalCBOR(r io.Reader) (err error) { } } + } } diff --git a/api/atproto/labeldefs.go b/api/atproto/labeldefs.go index 7c8a77dcb..23b04b7f3 100644 --- a/api/atproto/labeldefs.go +++ b/api/atproto/labeldefs.go @@ -37,5 +37,5 @@ type LabelDefs_SelfLabel struct { // RECORDTYPE: LabelDefs_SelfLabels type LabelDefs_SelfLabels struct { LexiconTypeID string `json:"$type,const=com.atproto.label.defs#selfLabels" cborgen:"$type,const=com.atproto.label.defs#selfLabels"` - Values []*LabelDefs_SelfLabel `json:"values" cborgen:"values"` + Values []*LabelDefs_SelfLabel `json:"values" cborgen:"values,preservenil"` } diff --git a/api/bsky/cbor_gen.go b/api/bsky/cbor_gen.go index 1de8fc5ce..8698c4250 100644 --- a/api/bsky/cbor_gen.go +++ b/api/bsky/cbor_gen.go @@ -93,6 +93,7 @@ func (t *FeedPost) MarshalCBOR(w io.Writer) error { if _, err := cw.WriteString(string(v)); err != nil { return err } + } } @@ -189,6 +190,7 @@ func (t *FeedPost) MarshalCBOR(w io.Writer) error { if _, err := cw.WriteString(string(v)); err != nil { return err } + } } @@ -236,6 +238,7 @@ func (t *FeedPost) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } } @@ -283,6 +286,7 @@ func (t *FeedPost) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } } @@ -386,9 +390,9 @@ func (t *FeedPost) UnmarshalCBOR(r io.Reader) (err error) { t.Tags[i] = string(sval) } + } } - // t.Text (string) (string) case "text": @@ -468,9 +472,9 @@ func (t *FeedPost) UnmarshalCBOR(r io.Reader) (err error) { t.Langs[i] = string(sval) } + } } - // t.Reply (bsky.FeedPost_ReplyRef) (struct) case "reply": @@ -537,9 +541,9 @@ func (t *FeedPost) UnmarshalCBOR(r io.Reader) (err error) { } } + } } - // t.Labels (bsky.FeedPost_Labels) (struct) case "labels": @@ -606,9 +610,9 @@ func (t *FeedPost) UnmarshalCBOR(r io.Reader) (err error) { } } + } } - // t.CreatedAt (string) (string) case "createdAt": @@ -1299,6 +1303,7 @@ func (t *EmbedImages) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } return nil } @@ -1398,6 +1403,7 @@ func (t *EmbedImages) UnmarshalCBOR(r io.Reader) (err error) { } } + } } @@ -2751,6 +2757,7 @@ func (t *RichtextFacet) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } return nil } @@ -2859,6 +2866,7 @@ func (t *RichtextFacet) UnmarshalCBOR(r io.Reader) (err error) { } } + } } @@ -4101,6 +4109,7 @@ func (t *GraphList) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } } return nil @@ -4305,6 +4314,7 @@ func (t *GraphList) UnmarshalCBOR(r io.Reader) (err error) { } } + } } @@ -4721,6 +4731,7 @@ func (t *FeedGenerator) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } } return nil @@ -4915,6 +4926,7 @@ func (t *FeedGenerator) UnmarshalCBOR(r io.Reader) (err error) { } } + } } @@ -5326,6 +5338,7 @@ func (t *FeedThreadgate) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } } @@ -5460,9 +5473,9 @@ func (t *FeedThreadgate) UnmarshalCBOR(r io.Reader) (err error) { } } + } } - // t.CreatedAt (string) (string) case "createdAt": diff --git a/cmd/gosky/admin.go b/cmd/gosky/admin.go index 63c25bacf..bcb8d7f7f 100644 --- a/cmd/gosky/admin.go +++ b/cmd/gosky/admin.go @@ -675,7 +675,7 @@ var queryModerationStatusesCmd = &cli.Command{ did = resp } - resp, err := atproto.AdminQueryModerationStatuses(ctx, xrpcc, "", "", nil, true, "", 100, "", "", "", "", "", "", "", "", false) + resp, err := atproto.AdminQueryModerationStatuses(ctx, xrpcc, false, "", "", nil, true, "", 100, "", "", "", "", "", "", "", "", false) if err != nil { return err } diff --git a/go.mod b/go.mod index 2f5f191af..d1f32f9ca 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/scylladb/gocqlx/v2 v2.8.1-0.20230309105046-dec046bd85e6 github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.25.7 - github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f + github.com/whyrusleeping/cbor-gen v0.0.0-20240104201801-075d1573fac9 github.com/whyrusleeping/go-did v0.0.0-20230824162731-404d1707d5d6 gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 diff --git a/go.sum b/go.sum index 562a66ded..406736ea6 100644 --- a/go.sum +++ b/go.sum @@ -636,6 +636,8 @@ github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 h1:5HZfQkwe0mIf github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11/go.mod h1:Wlo/SzPmxVp6vXpGt/zaXhHH0fn4IxgqZc82aKg6bpQ= github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f h1:SBuSxXJL0/ZJMtTxbXZgHZkThl9dNrzyaNhlyaqscRo= github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= +github.com/whyrusleeping/cbor-gen v0.0.0-20240104201801-075d1573fac9 h1:973JQTSOMo66VlNZ2+tMQYruE0Yny9DrKvIkr/ybRJg= +github.com/whyrusleeping/cbor-gen v0.0.0-20240104201801-075d1573fac9/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8= github.com/whyrusleeping/go-did v0.0.0-20230824162731-404d1707d5d6 h1:yJ9/LwIGIk/c0CdoavpC9RNSGSruIspSZtxG3Nnldic= diff --git a/lex/gen.go b/lex/gen.go index e36e50521..52ae1e629 100644 --- a/lex/gen.go +++ b/lex/gen.go @@ -1261,6 +1261,10 @@ func (ts *TypeSchema) writeTypeDefinition(name string, w io.Writer) error { cborOmit = ",omitempty" } + if name == "LabelDefs_SelfLabels" && k == "values" { + cborOmit += ",preservenil" + } + if v.Description != "" { pf("\t// %s: %s\n", k, v.Description) } diff --git a/mst/cbor_gen.go b/mst/cbor_gen.go index cf1983c86..a2e83927c 100644 --- a/mst/cbor_gen.go +++ b/mst/cbor_gen.go @@ -53,6 +53,7 @@ func (t *nodeData) MarshalCBOR(w io.Writer) error { if err := v.MarshalCBOR(cw); err != nil { return err } + } // t.Left (cid.Cid) (struct) @@ -154,9 +155,9 @@ func (t *nodeData) UnmarshalCBOR(r io.Reader) (err error) { } } + } } - // t.Left (cid.Cid) (struct) case "l": @@ -348,6 +349,7 @@ func (t *treeEntry) UnmarshalCBOR(r io.Reader) (err error) { if _, err := io.ReadFull(cr, t.KeySuffix[:]); err != nil { return err } + // t.PrefixLen (int64) (int64) case "p": { diff --git a/repo/cbor_gen.go b/repo/cbor_gen.go index f2629fd93..dc189b4b0 100644 --- a/repo/cbor_gen.go +++ b/repo/cbor_gen.go @@ -252,6 +252,7 @@ func (t *SignedCommit) UnmarshalCBOR(r io.Reader) (err error) { if _, err := io.ReadFull(cr, t.Sig[:]); err != nil { return err } + // t.Data (cid.Cid) (struct) case "data": From bab67c837b603297e7fc7eaf5d256187fd2d1776 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Thu, 4 Jan 2024 12:58:15 -0800 Subject: [PATCH 2/3] add test file that updates itself --- lex/util/cbor_gen_test.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lex/util/cbor_gen_test.go b/lex/util/cbor_gen_test.go index 630d983e2..3f592cab7 100644 --- a/lex/util/cbor_gen_test.go +++ b/lex/util/cbor_gen_test.go @@ -110,6 +110,7 @@ func (t *basicSchema) MarshalCBOR(w io.Writer) error { if _, err := cw.WriteString(string(v)); err != nil { return err } + } // t.Absent (string) (string) @@ -344,9 +345,9 @@ func (t *basicSchema) UnmarshalCBOR(r io.Reader) (err error) { t.Array[i] = string(sval) } + } } - // t.Absent (string) (string) case "absent": @@ -477,6 +478,7 @@ func (t *basicSchemaInner) MarshalCBOR(w io.Writer) error { if _, err := cw.WriteString(string(v)); err != nil { return err } + } // t.Bool (bool) (bool) @@ -617,9 +619,9 @@ func (t *basicSchemaInner) UnmarshalCBOR(r io.Reader) (err error) { t.Arr[i] = string(sval) } + } } - // t.Bool (bool) (bool) case "bool": @@ -824,6 +826,7 @@ func (t *ipldSchema) UnmarshalCBOR(r io.Reader) (err error) { if _, err := io.ReadFull(cr, t.B[:]); err != nil { return err } + // t.C (util.LexBlob) (struct) case "c": @@ -1012,6 +1015,7 @@ func (t *basicOldSchema) MarshalCBOR(w io.Writer) error { if _, err := cw.WriteString(string(v)); err != nil { return err } + } // t.G (util.basicOldSchemaInner) (struct) @@ -1204,9 +1208,9 @@ func (t *basicOldSchema) UnmarshalCBOR(r io.Reader) (err error) { t.F[i] = string(sval) } + } } - // t.G (util.basicOldSchemaInner) (struct) case "g": @@ -1329,6 +1333,7 @@ func (t *basicOldSchemaInner) MarshalCBOR(w io.Writer) error { if _, err := cw.WriteString(string(v)); err != nil { return err } + } return nil } @@ -1463,6 +1468,7 @@ func (t *basicOldSchemaInner) UnmarshalCBOR(r io.Reader) (err error) { t.K[i] = string(sval) } + } } @@ -1525,6 +1531,7 @@ func (t *ipldOldSchema) MarshalCBOR(w io.Writer) error { if _, err := cw.Write(t.B[:]); err != nil { return err } + return nil } From 9ad7e4eb8194bd89790b251ce9267b0175d6f469 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Fri, 5 Jan 2024 10:26:08 -0800 Subject: [PATCH 3/3] tidy --- gen/main.go | 2 +- go.sum | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gen/main.go b/gen/main.go index 95e889c10..7e1ef65e1 100644 --- a/gen/main.go +++ b/gen/main.go @@ -6,11 +6,11 @@ import ( "github.com/bluesky-social/indigo/api" atproto "github.com/bluesky-social/indigo/api/atproto" bsky "github.com/bluesky-social/indigo/api/bsky" + "github.com/bluesky-social/indigo/atproto/data" "github.com/bluesky-social/indigo/events" lexutil "github.com/bluesky-social/indigo/lex/util" "github.com/bluesky-social/indigo/mst" "github.com/bluesky-social/indigo/repo" - "github.com/bluesky-social/indigo/atproto/data" cbg "github.com/whyrusleeping/cbor-gen" ) diff --git a/go.sum b/go.sum index 406736ea6..2f9648d46 100644 --- a/go.sum +++ b/go.sum @@ -634,8 +634,6 @@ github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSD github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 h1:5HZfQkwe0mIfyDmc1Em5GqlNRzcdtlv4HTNmdpt7XH0= github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11/go.mod h1:Wlo/SzPmxVp6vXpGt/zaXhHH0fn4IxgqZc82aKg6bpQ= -github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f h1:SBuSxXJL0/ZJMtTxbXZgHZkThl9dNrzyaNhlyaqscRo= -github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= github.com/whyrusleeping/cbor-gen v0.0.0-20240104201801-075d1573fac9 h1:973JQTSOMo66VlNZ2+tMQYruE0Yny9DrKvIkr/ybRJg= github.com/whyrusleeping/cbor-gen v0.0.0-20240104201801-075d1573fac9/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=