this repo has no description
lexgen update (#495)
As a temporary hack, just skip the `com.atproto.temp.importRepo`
endpoint which uses Lexicon features that lexgen does not support.
There are a small number of actual lexicon updates, but the main
motivation here is to handle *all* of the `didDoc` and `plcOp` fields.
That is also a hack for now, but this resolves a number of regressions,
eg with refreshSession.
+46
-42
+2
api/atproto/admindefs.go
+2
api/atproto/admindefs.go
···
105
105
// RECORDTYPE: AdminDefs_ModEventEmail
106
106
type AdminDefs_ModEventEmail struct {
107
107
LexiconTypeID string `json:"$type,const=com.atproto.admin.defs#modEventEmail" cborgen:"$type,const=com.atproto.admin.defs#modEventEmail"`
108
+
// comment: Additional comment about the outgoing comm.
109
+
Comment *string `json:"comment,omitempty" cborgen:"comment,omitempty"`
108
110
// subjectLine: The subject line of the email sent to the user.
109
111
SubjectLine string `json:"subjectLine" cborgen:"subjectLine"`
110
112
}
+2
api/atproto/adminsendEmail.go
+2
api/atproto/adminsendEmail.go
···
12
12
13
13
// AdminSendEmail_Input is the input argument to a com.atproto.admin.sendEmail call.
14
14
type AdminSendEmail_Input struct {
15
+
// comment: Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers
16
+
Comment *string `json:"comment,omitempty" cborgen:"comment,omitempty"`
15
17
Content string `json:"content" cborgen:"content"`
16
18
RecipientDid string `json:"recipientDid" cborgen:"recipientDid"`
17
19
SenderDid string `json:"senderDid" cborgen:"senderDid"`
+5
-6
api/atproto/repodescribeRepo.go
+5
-6
api/atproto/repodescribeRepo.go
···
7
7
import (
8
8
"context"
9
9
10
-
//"github.com/bluesky-social/indigo/lex/util"
11
10
"github.com/bluesky-social/indigo/xrpc"
12
11
)
13
12
14
13
// RepoDescribeRepo_Output is the output of a com.atproto.repo.describeRepo call.
15
14
type RepoDescribeRepo_Output struct {
16
-
Collections []string `json:"collections" cborgen:"collections"`
17
-
Did string `json:"did" cborgen:"did"`
18
-
//DidDoc *util.LexiconTypeDecoder `json:"didDoc" cborgen:"didDoc"`
19
-
Handle string `json:"handle" cborgen:"handle"`
20
-
HandleIsCorrect bool `json:"handleIsCorrect" cborgen:"handleIsCorrect"`
15
+
Collections []string `json:"collections" cborgen:"collections"`
16
+
Did string `json:"did" cborgen:"did"`
17
+
DidDoc interface{} `json:"didDoc" cborgen:"didDoc"`
18
+
Handle string `json:"handle" cborgen:"handle"`
19
+
HandleIsCorrect bool `json:"handleIsCorrect" cborgen:"handleIsCorrect"`
21
20
}
22
21
23
22
// RepoDescribeRepo calls the XRPC method "com.atproto.repo.describeRepo".
+12
-13
api/atproto/servercreateAccount.go
+12
-13
api/atproto/servercreateAccount.go
···
7
7
import (
8
8
"context"
9
9
10
-
//"github.com/bluesky-social/indigo/lex/util"
11
10
"github.com/bluesky-social/indigo/xrpc"
12
11
)
13
12
14
13
// ServerCreateAccount_Input is the input argument to a com.atproto.server.createAccount call.
15
14
type ServerCreateAccount_Input struct {
16
-
Did *string `json:"did,omitempty" cborgen:"did,omitempty"`
17
-
Email *string `json:"email,omitempty" cborgen:"email,omitempty"`
18
-
Handle string `json:"handle" cborgen:"handle"`
19
-
InviteCode *string `json:"inviteCode,omitempty" cborgen:"inviteCode,omitempty"`
20
-
Password *string `json:"password,omitempty" cborgen:"password,omitempty"`
21
-
//PlcOp *util.LexiconTypeDecoder `json:"plcOp,omitempty" cborgen:"plcOp,omitempty"`
22
-
RecoveryKey *string `json:"recoveryKey,omitempty" cborgen:"recoveryKey,omitempty"`
15
+
Did *string `json:"did,omitempty" cborgen:"did,omitempty"`
16
+
Email *string `json:"email,omitempty" cborgen:"email,omitempty"`
17
+
Handle string `json:"handle" cborgen:"handle"`
18
+
InviteCode *string `json:"inviteCode,omitempty" cborgen:"inviteCode,omitempty"`
19
+
Password *string `json:"password,omitempty" cborgen:"password,omitempty"`
20
+
PlcOp *interface{} `json:"plcOp,omitempty" cborgen:"plcOp,omitempty"`
21
+
RecoveryKey *string `json:"recoveryKey,omitempty" cborgen:"recoveryKey,omitempty"`
23
22
}
24
23
25
24
// ServerCreateAccount_Output is the output of a com.atproto.server.createAccount call.
26
25
type ServerCreateAccount_Output struct {
27
-
AccessJwt string `json:"accessJwt" cborgen:"accessJwt"`
28
-
Did string `json:"did" cborgen:"did"`
29
-
//DidDoc *util.LexiconTypeDecoder `json:"didDoc,omitempty" cborgen:"didDoc,omitempty"`
30
-
Handle string `json:"handle" cborgen:"handle"`
31
-
RefreshJwt string `json:"refreshJwt" cborgen:"refreshJwt"`
26
+
AccessJwt string `json:"accessJwt" cborgen:"accessJwt"`
27
+
Did string `json:"did" cborgen:"did"`
28
+
DidDoc *interface{} `json:"didDoc,omitempty" cborgen:"didDoc,omitempty"`
29
+
Handle string `json:"handle" cborgen:"handle"`
30
+
RefreshJwt string `json:"refreshJwt" cborgen:"refreshJwt"`
32
31
}
33
32
34
33
// ServerCreateAccount calls the XRPC method "com.atproto.server.createAccount".
+7
-7
api/atproto/servercreateSession.go
+7
-7
api/atproto/servercreateSession.go
···
19
19
20
20
// ServerCreateSession_Output is the output of a com.atproto.server.createSession call.
21
21
type ServerCreateSession_Output struct {
22
-
AccessJwt string `json:"accessJwt" cborgen:"accessJwt"`
23
-
Did string `json:"did" cborgen:"did"`
24
-
//DidDoc *util.LexiconTypeDecoder `json:"didDoc,omitempty" cborgen:"didDoc,omitempty"`
25
-
Email *string `json:"email,omitempty" cborgen:"email,omitempty"`
26
-
EmailConfirmed *bool `json:"emailConfirmed,omitempty" cborgen:"emailConfirmed,omitempty"`
27
-
Handle string `json:"handle" cborgen:"handle"`
28
-
RefreshJwt string `json:"refreshJwt" cborgen:"refreshJwt"`
22
+
AccessJwt string `json:"accessJwt" cborgen:"accessJwt"`
23
+
Did string `json:"did" cborgen:"did"`
24
+
DidDoc *interface{} `json:"didDoc,omitempty" cborgen:"didDoc,omitempty"`
25
+
Email *string `json:"email,omitempty" cborgen:"email,omitempty"`
26
+
EmailConfirmed *bool `json:"emailConfirmed,omitempty" cborgen:"emailConfirmed,omitempty"`
27
+
Handle string `json:"handle" cborgen:"handle"`
28
+
RefreshJwt string `json:"refreshJwt" cborgen:"refreshJwt"`
29
29
}
30
30
31
31
// ServerCreateSession calls the XRPC method "com.atproto.server.createSession".
+5
-6
api/atproto/servergetSession.go
+5
-6
api/atproto/servergetSession.go
···
7
7
import (
8
8
"context"
9
9
10
-
//"github.com/bluesky-social/indigo/lex/util"
11
10
"github.com/bluesky-social/indigo/xrpc"
12
11
)
13
12
14
13
// ServerGetSession_Output is the output of a com.atproto.server.getSession call.
15
14
type ServerGetSession_Output struct {
16
-
Did string `json:"did" cborgen:"did"`
17
-
//DidDoc *util.LexiconTypeDecoder `json:"didDoc,omitempty" cborgen:"didDoc,omitempty"`
18
-
Email *string `json:"email,omitempty" cborgen:"email,omitempty"`
19
-
EmailConfirmed *bool `json:"emailConfirmed,omitempty" cborgen:"emailConfirmed,omitempty"`
20
-
Handle string `json:"handle" cborgen:"handle"`
15
+
Did string `json:"did" cborgen:"did"`
16
+
DidDoc *interface{} `json:"didDoc,omitempty" cborgen:"didDoc,omitempty"`
17
+
Email *string `json:"email,omitempty" cborgen:"email,omitempty"`
18
+
EmailConfirmed *bool `json:"emailConfirmed,omitempty" cborgen:"emailConfirmed,omitempty"`
19
+
Handle string `json:"handle" cborgen:"handle"`
21
20
}
22
21
23
22
// ServerGetSession calls the XRPC method "com.atproto.server.getSession".
+5
-6
api/atproto/serverrefreshSession.go
+5
-6
api/atproto/serverrefreshSession.go
···
7
7
import (
8
8
"context"
9
9
10
-
//"github.com/bluesky-social/indigo/lex/util"
11
10
"github.com/bluesky-social/indigo/xrpc"
12
11
)
13
12
14
13
// ServerRefreshSession_Output is the output of a com.atproto.server.refreshSession call.
15
14
type ServerRefreshSession_Output struct {
16
-
AccessJwt string `json:"accessJwt" cborgen:"accessJwt"`
17
-
Did string `json:"did" cborgen:"did"`
18
-
//DidDoc *util.LexiconTypeDecoder `json:"didDoc,omitempty" cborgen:"didDoc,omitempty"`
19
-
Handle string `json:"handle" cborgen:"handle"`
20
-
RefreshJwt string `json:"refreshJwt" cborgen:"refreshJwt"`
15
+
AccessJwt string `json:"accessJwt" cborgen:"accessJwt"`
16
+
Did string `json:"did" cborgen:"did"`
17
+
DidDoc *interface{} `json:"didDoc,omitempty" cborgen:"didDoc,omitempty"`
18
+
Handle string `json:"handle" cborgen:"handle"`
19
+
RefreshJwt string `json:"refreshJwt" cborgen:"refreshJwt"`
21
20
}
22
21
23
22
// ServerRefreshSession calls the XRPC method "com.atproto.server.refreshSession".
+3
-4
api/atproto/temptransferAccount.go
+3
-4
api/atproto/temptransferAccount.go
···
7
7
import (
8
8
"context"
9
9
10
-
//"github.com/bluesky-social/indigo/lex/util"
11
10
"github.com/bluesky-social/indigo/xrpc"
12
11
)
13
12
14
13
// TempTransferAccount_Input is the input argument to a com.atproto.temp.transferAccount call.
15
14
type TempTransferAccount_Input struct {
16
-
Did string `json:"did" cborgen:"did"`
17
-
Handle string `json:"handle" cborgen:"handle"`
18
-
//PlcOp *util.LexiconTypeDecoder `json:"plcOp" cborgen:"plcOp"`
15
+
Did string `json:"did" cborgen:"did"`
16
+
Handle string `json:"handle" cborgen:"handle"`
17
+
PlcOp interface{} `json:"plcOp" cborgen:"plcOp"`
19
18
}
20
19
21
20
// TempTransferAccount_Output is the output of a com.atproto.temp.transferAccount call.
+1
api/bsky/notificationlistNotifications.go
+1
api/bsky/notificationlistNotifications.go
···
30
30
type NotificationListNotifications_Output struct {
31
31
Cursor *string `json:"cursor,omitempty" cborgen:"cursor,omitempty"`
32
32
Notifications []*NotificationListNotifications_Notification `json:"notifications" cborgen:"notifications"`
33
+
SeenAt *string `json:"seenAt,omitempty" cborgen:"seenAt,omitempty"`
33
34
}
34
35
35
36
// NotificationListNotifications calls the XRPC method "app.bsky.notification.listNotifications".
+4
cmd/lexgen/main.go
+4
cmd/lexgen/main.go
···
96
96
97
97
var schemas []*lex.Schema
98
98
for _, arg := range paths {
99
+
if strings.HasSuffix(arg, "com/atproto/temp/importRepo.json") {
100
+
fmt.Printf("skipping schema: %s\n", arg)
101
+
continue
102
+
}
99
103
s, err := lex.ReadSchema(arg)
100
104
if err != nil {
101
105
return fmt.Errorf("failed to read file %q: %w", arg, err)