✨ Account page (aka detailed version description)

💥 Move description from account to profile

pkg/authkit/models/accounts.go

@@ -17,7 +17,6 @@ type Account struct {
 
 	Name        string            `json:"name" gorm:"uniqueIndex"`
 	Nick        string            `json:"nick"`
-	Description string            `json:"description"`
 	Avatar      *string           `json:"avatar"`
 	Banner      *string           `json:"banner"`
 	ConfirmedAt *time.Time        `json:"confirmed_at"`
@@ -39,6 +38,9 @@ type Account struct {
 	Factors []AuthFactor `json:"factors,omitempty"`
 
 	Relations []AccountRelationship `json:"relations,omitempty" gorm:"foreignKey:AccountID"`
+
+	// Keep this for backward compability
+	Description string `json:"description" gorm:"-"`
 }
 
 func (v Account) GetAvatar() *string {

pkg/authkit/models/auth.go

@@ -8,7 +8,8 @@ import (
 )
 
 type AuthConfig struct {
-	MaximumAuthSteps int `json:"maximum_auth_steps" validate:"required,min=1,max=99"`
+	AlwaysRisky      bool `json:"always_risky"`
+	MaximumAuthSteps int  `json:"maximum_auth_steps" validate:"required,min=1,max=99"`
 }
 
 type AuthFactorType = int8

pkg/authkit/models/badges.go

@@ -7,5 +7,6 @@ type Badge struct {
 
 	Type      string            `json:"type"`
 	Metadata  datatypes.JSONMap `json:"metadata"`
+	IsActive  bool              `json:"is_active"`
 	AccountID uint              `json:"account_id"`
 }

pkg/authkit/models/profiles.go

@@ -2,15 +2,30 @@ package models
 
 import (
 	"time"
+
+	"gorm.io/datatypes"
 )
 
 type AccountProfile struct {
 	BaseModel
 
-	FirstName  string     `json:"first_name"`
-	LastName   string     `json:"last_name"`
-	Experience uint64     `json:"experience"`
-	LastSeenAt *time.Time `json:"last_seen_at"`
-	Birthday   *time.Time `json:"birthday"`
-	AccountID  uint       `json:"account_id"`
+	FirstName   string            `json:"first_name"`
+	LastName    string            `json:"last_name"`
+	Description string            `json:"description"`
+	TimeZone    string            `json:"time_zone"`
+	Location    string            `json:"location"`
+	Pronouns    string            `json:"pronouns"`
+	Gender      string            `json:"gender"`
+	Links       datatypes.JSONMap `json:"links"`
+	Experience  uint64            `json:"experience"`
+	LastSeenAt  *time.Time        `json:"last_seen_at"`
+	Birthday    *time.Time        `json:"birthday"`
+	AccountID   uint              `json:"account_id"`
+}
+
+type AccountPage struct {
+	BaseModel
+
+	Content   string `json:"content"`
+	AccountID uint   `json:"account_id"`
 }

pkg/internal/services/badges.go

@@ -13,3 +13,23 @@ func GrantBadge(user models.Account, badge models.Badge) error {
 func RevokeBadge(badge models.Badge) error {
 	return database.C.Delete(&badge).Error
 }
+
+func ActiveBadge(badge models.Badge) error {
+	accountId := badge.AccountID
+	tx := database.C.Begin()
+
+	if err := tx.Model(&badge).Where("account_id = ?", accountId).Update("is_active", false).Error; err != nil {
+		tx.Rollback()
+		return err
+	}
+	if err := tx.Model(&badge).Where("id = ?", badge.ID).Update("is_active", true).Error; err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	if err := tx.Commit().Error; err != nil {
+		return err
+	}
+
+	return nil
+}

pkg/internal/web/api/accounts_api.go

@@ -119,11 +119,16 @@ func updateUserinfo(c *fiber.Ctx) error {
 	user := c.Locals("user").(models.Account)
 
 	var data struct {
-		Nick        string    `json:"nick" validate:"required"`
-		Description string    `json:"description"`
-		FirstName   string    `json:"first_name"`
-		LastName    string    `json:"last_name"`
-		Birthday    time.Time `json:"birthday"`
+		Nick        string            `json:"nick" validate:"required"`
+		Description string            `json:"description"`
+		FirstName   string            `json:"first_name"`
+		LastName    string            `json:"last_name"`
+		Location    string            `json:"location"`
+		TimeZone    string            `json:"time_zone"`
+		Gender      string            `json:"gender"`
+		Pronouns    string            `json:"pronouns"`
+		Links       map[string]string `json:"links"`
+		Birthday    time.Time         `json:"birthday"`
 	}
 
 	if err := exts.BindAndValidate(c, &data); err != nil {
@@ -143,8 +148,18 @@ func updateUserinfo(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}
 
+	var links = make(map[string]any)
+	for k, v := range data.Links {
+		links[k] = v
+	}
+
 	account.Nick = data.Nick
-	account.Description = data.Description
+	account.Profile.Gender = data.Gender
+	account.Profile.Pronouns = data.Pronouns
+	account.Profile.Location = data.Location
+	account.Profile.TimeZone = data.TimeZone
+	account.Profile.Links = links
+	account.Profile.Description = data.Description
 	account.Profile.FirstName = data.FirstName
 	account.Profile.LastName = data.LastName
 	account.Profile.Birthday = &data.Birthday

pkg/internal/web/api/badges_api.go

@@ -0,0 +1,42 @@
+package api
+
+import (
+	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
+	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"github.com/gofiber/fiber/v2"
+)
+
+func listUserBadge(c *fiber.Ctx) error {
+	if err := sec.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
+
+	var badges []models.Badge
+	if err := database.C.Where("account_id = ?", user.ID).Find(&badges).Error; err != nil {
+		return err
+	}
+
+	return c.JSON(badges)
+}
+
+func activeUserBadge(c *fiber.Ctx) error {
+	if err := sec.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
+
+	badgeId, _ := c.ParamsInt("badgeId", 0)
+
+	var badge models.Badge
+	if err := database.C.Where("id = ? AND account_id = ?", badgeId, user.ID).First(&badge).Error; err != nil {
+		return err
+	}
+
+	if err := services.ActiveBadge(badge); err != nil {
+		return err
+	}
+	return c.SendStatus(fiber.StatusOK)
+}

pkg/internal/web/api/index.go

@@ -37,6 +37,12 @@ func MapControllers(app *fiber.App, baseURL string) {
 			preferences.Put("/notifications", updateNotificationPreference)
 		}
 
+		badges := api.Group("/badges").Name("Badges")
+		{
+			badges.Get("/me", listUserBadge)
+			badges.Post("/:badgeId/active", activeUserBadge)
+		}
+
 		reports := api.Group("/reports").Name("Reports API")
 		{
 			abuse := reports.Group("/abuse").Name("Abuse Reports")
@@ -74,6 +80,9 @@ func MapControllers(app *fiber.App, baseURL string) {
 			me.Put("/status", editStatus)
 			me.Delete("/status", clearStatus)
 
+			me.Get("/pages", getOwnAccountPage)
+			me.Put("/pages", updateAccountPage)
+
 			contacts := me.Group("/contacts").Name("Contacts")
 			{
 				contacts.Get("/", listContact)
@@ -117,6 +126,7 @@ func MapControllers(app *fiber.App, baseURL string) {
 		{
 			directory.Get("/", getOtherUserinfo)
 			directory.Get("/status", getStatus)
+			directory.Get("/pages", getAccountPage)
 
 			directory.Get("/check-in", listOtherUserCheckInRecord)
 		}

pkg/internal/web/api/pages_api.go

@@ -0,0 +1,78 @@
+package api
+
+import (
+	"strconv"
+
+	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
+	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
+	"github.com/gofiber/fiber/v2"
+)
+
+func getAccountPage(c *fiber.Ctx) error {
+	alias := c.Params("alias")
+
+	tx := database.C.Where("name = ?", alias)
+
+	numericId, err := strconv.Atoi(alias)
+	if err == nil {
+		tx = tx.Or("id = ?", numericId)
+	}
+
+	var account models.Account
+	if err := tx.First(&account).Error; err != nil {
+		return fiber.NewError(fiber.StatusNotFound, err.Error())
+	}
+
+	var page models.AccountPage
+	if err := database.C.Where("account_id = ?", account.ID).First(&page).Error; err != nil {
+		return fiber.NewError(fiber.StatusNotFound, err.Error())
+	}
+
+	return c.JSON(page)
+}
+
+func getOwnAccountPage(c *fiber.Ctx) error {
+	if err := sec.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
+
+	var page models.AccountPage
+	if err := database.C.Where("account_id = ?", user.ID).First(&page).Error; err != nil {
+		return fiber.NewError(fiber.StatusNotFound, err.Error())
+	}
+
+	return c.JSON(page)
+}
+
+func updateAccountPage(c *fiber.Ctx) error {
+	if err := sec.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
+
+	var data struct {
+		Content string `json:"content" validate:"required"`
+	}
+
+	if err := exts.BindAndValidate(c, &data); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, err.Error())
+	}
+
+	var page models.AccountPage
+	if err := database.C.Where("account_id = ?", user.ID).First(&page).Error; err != nil {
+		page = models.AccountPage{
+			AccountID: user.ID,
+		}
+	}
+
+	page.Content = data.Content
+
+	if err := database.C.Save(&page).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return c.JSON(page)
+}