Merge branch 'master' of ssh://192.168.100.62:2222/Arsen6331/go-lemmy

cmd/gen/generator/routes.go

@@ -19,6 +19,8 @@ func NewRoutes(w io.Writer, pkgName string) *RoutesGenerator {
 
 func (r *RoutesGenerator) Generate(routes []parser.Route, impls map[string]string) error {
 	f := jen.NewFile(r.PkgName)
+	f.HeaderComment("Code generated by go.arsenm.dev/go-lemmy/cmd/gen (routes generator). DO NOT EDIT.")
+
 	for _, r := range routes {
 		resStruct := impls[r.Struct]
 

cmd/gen/generator/struct.go

@@ -19,6 +19,8 @@ func NewStruct(w io.Writer, pkgName string) *StructGenerator {
 
 func (s *StructGenerator) Generate(items []parser.Item) error {
 	f := jen.NewFile(s.PkgName)
+	f.HeaderComment("Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.")
+	
 	for _, item := range items {
 		if item.Struct != nil {
 			st := item.Struct

cmd/gen/parser/struct.go

@@ -242,6 +242,10 @@ func TransformNameGo(s string) string {
 			out += "URL"
 		case "nsfw":
 			out += "NSFW"
+		case "jwt":
+			out += "JWT"
+		case "crud":
+			out += "CRUD"
 		default:
 			if len(segment) == 0 {
 				continue

lemmy.go

@@ -45,7 +45,7 @@ func (c *Client) ClientLogin(ctx context.Context, l types.Login) error {
 		return err
 	}
 
-	c.Token = lr.Jwt.MustValue()
+	c.Token = lr.JWT.MustValue()
 	return nil
 }
 

routes.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (routes generator). DO NOT EDIT.
+
 package lemmy
 
 import (

types/activity.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Activity struct {

types/comment.1.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Comment struct {

types/comment.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type CreateComment struct {

types/comment_report.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type CommentReport struct {

types/community.1.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Community struct {

types/community.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type GetCommunity struct {

types/community_block.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type CommunityBlock struct {

types/email_verification.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type EmailVerification struct {

types/lib.1.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type SortType string

types/lib.2.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type UserOperation string

types/lib.gen.go

@@ -1 +1,3 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types

types/local_user.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type LocalUser struct {

types/mod.gen.go

@@ -1 +1,3 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types

types/moderator.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type ModRemovePost struct {

types/password_reset_request.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type PasswordResetRequest struct {

types/person.1.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Person struct {

types/person.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Login struct {
@@ -54,7 +56,7 @@ type ChangePassword struct {
 	Auth              string `json:"auth" url:"auth,omitempty"`
 }
 type LoginResponse struct {
-	Jwt                 Optional[string] `json:"jwt" url:"jwt,omitempty"`
+	JWT                 Optional[string] `json:"jwt" url:"jwt,omitempty"`
 	RegistrationCreated bool             `json:"registration_created" url:"registration_created,omitempty"`
 	VerifyEmailSent     bool             `json:"verify_email_sent" url:"verify_email_sent,omitempty"`
 	LemmyResponse

types/person_block.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type PersonBlock struct {

types/person_mention.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type PersonMention struct {

types/post.1.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Post struct {

types/post.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type CreatePost struct {

types/post_report.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type PostReport struct {

types/private_message.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type PrivateMessage struct {

types/registration_application.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type RegistrationApplication struct {

types/request.gen.go

@@ -1 +1,3 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types

types/secret.gen.go

@@ -1,6 +1,8 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Secret struct {
 	ID        int32  `json:"id" url:"id,omitempty"`
-	JwtSecret string `json:"jwt_secret" url:"jwt_secret,omitempty"`
+	JWTSecret string `json:"jwt_secret" url:"jwt_secret,omitempty"`
 }

types/sensitive.gen.go

@@ -1 +1,3 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types

types/site.1.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Site struct {

types/site.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type Search struct {

types/structs.1.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type CommentReportView struct {

types/structs.2.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type ModAddCommunityView struct {

types/structs.3.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type CommentAggregates struct {

types/structs.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type CommunityBlockView struct {

types/utils.gen.go

@@ -1 +1,3 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types

types/websocket.gen.go

@@ -1,3 +1,5 @@
+// Code generated by go.arsenm.dev/go-lemmy/cmd/gen (struct generator). DO NOT EDIT.
+
 package types
 
 type UserJoin struct {