diff --git a/ent/schema/attachment.go b/ent/schema/attachment.go index 395c9ad..6ed5386 100644 --- a/ent/schema/attachment.go +++ b/ent/schema/attachment.go @@ -38,5 +38,5 @@ func (Attachment) Edges() []ent.Edge { } func (Attachment) Mixin() []ent.Mixin { - return []ent.Mixin{LysandEntityMixin{}} + return []ent.Mixin{VersiaEntityMixin{}} } diff --git a/ent/schema/follow.go b/ent/schema/follow.go index d317abc..ce4334b 100644 --- a/ent/schema/follow.go +++ b/ent/schema/follow.go @@ -31,5 +31,5 @@ func (Follow) Indexes() []ent.Index { } func (Follow) Mixin() []ent.Mixin { - return []ent.Mixin{LysandEntityMixin{}} + return []ent.Mixin{VersiaEntityMixin{}} } diff --git a/ent/schema/instance_metadata.go b/ent/schema/instance_metadata.go index 57b9a63..e487a05 100644 --- a/ent/schema/instance_metadata.go +++ b/ent/schema/instance_metadata.go @@ -67,5 +67,5 @@ func (InstanceMetadata) Edges() []ent.Edge { } func (InstanceMetadata) Mixin() []ent.Mixin { - return []ent.Mixin{LysandEntityMixin{}} + return []ent.Mixin{VersiaEntityMixin{}} } diff --git a/ent/schema/lysand_entity.go b/ent/schema/lysand_entity.go index 2678954..9be1d17 100644 --- a/ent/schema/lysand_entity.go +++ b/ent/schema/lysand_entity.go @@ -10,11 +10,11 @@ import ( "time" ) -type LysandEntityMixin struct{ mixin.Schema } +type VersiaEntityMixin struct{ mixin.Schema } -var _ ent.Mixin = (*LysandEntityMixin)(nil) +var _ ent.Mixin = (*VersiaEntityMixin)(nil) -func (LysandEntityMixin) Fields() []ent.Field { +func (VersiaEntityMixin) Fields() []ent.Field { return []ent.Field{ field.UUID("id", uuid.UUID{}). Default(uuid.New). diff --git a/ent/schema/note.go b/ent/schema/note.go index 418e91b..6f47477 100644 --- a/ent/schema/note.go +++ b/ent/schema/note.go @@ -28,5 +28,5 @@ func (Note) Edges() []ent.Edge { } func (Note) Mixin() []ent.Mixin { - return []ent.Mixin{LysandEntityMixin{}} + return []ent.Mixin{VersiaEntityMixin{}} } diff --git a/ent/schema/user.go b/ent/schema/user.go index e68d8cd..baa5352 100644 --- a/ent/schema/user.go +++ b/ent/schema/user.go @@ -70,7 +70,7 @@ func (User) Edges() []ent.Edge { } } -func (User) Mixin() []ent.Mixin { return []ent.Mixin{LysandEntityMixin{}} } +func (User) Mixin() []ent.Mixin { return []ent.Mixin{VersiaEntityMixin{}} } func ValidateUsername(username string) error { if !usernameRegex.MatchString(username) { diff --git a/internal/api_schema/users.go b/internal/api_schema/users.go index 06eeece..651c718 100644 --- a/internal/api_schema/users.go +++ b/internal/api_schema/users.go @@ -10,7 +10,7 @@ type User struct { Username string `json:"username"` } -type LysandUser versia.User +type VersiaUser versia.User type FetchUserResponse = APIResponse[User] diff --git a/internal/handlers/user_handler/app_user_search.go b/internal/handlers/user_handler/app_user_search.go index fc64570..299489c 100644 --- a/internal/handlers/user_handler/app_user_search.go +++ b/internal/handlers/user_handler/app_user_search.go @@ -47,5 +47,5 @@ func (i *Handler) SearchUser(c *fiber.Ctx) error { return api_schema.ErrInternalServerError(nil) } - return c.JSON((*api_schema.LysandUser)(u.ToLysand())) + return c.JSON((*api_schema.VersiaUser)(u.ToLysand())) }