♻️ Refactored relation system

⬆️ Support new realm & relation api

pkg/internal/models/accounts.go

@@ -21,12 +21,12 @@ type Account struct {
 	SuspendedAt *time.Time        `json:"suspended_at"`
 	PermNodes   datatypes.JSONMap `json:"perm_nodes"`
 
-	Profile  AccountProfile `json:"profile,omitempty"`
-	Statuses []Status       `json:"statuses,omitempty"`
-	Badges   []Badge        `json:"badges,omitempty"`
+	Profile  AccountProfile   `json:"profile,omitempty"`
+	Contacts []AccountContact `json:"contacts,omitempty"`
+	Statuses []Status         `json:"statuses,omitempty"`
+	Badges   []Badge          `json:"badges,omitempty"`
 
-	Contacts        []AccountContact `json:"contacts,omitempty"`
-	RealmIdentities []RealmMember    `json:"realm_identities,omitempty"`
+	Identities []RealmMember `json:"identities,omitempty"`
 
 	Tickets []AuthTicket `json:"tickets,omitempty"`
 	Factors []AuthFactor `json:"factors,omitempty"`
@@ -36,11 +36,10 @@ type Account struct {
 
 	ThirdClients []ThirdClient `json:"clients,omitempty"`
 
-	Notifications     []Notification           `json:"notifications,omitempty" gorm:"foreignKey:RecipientID"`
+	Notifications     []Notification           `json:"notifications,omitempty"`
 	NotifySubscribers []NotificationSubscriber `json:"notify_subscribers,omitempty"`
 
-	Friendships        []AccountFriendship `json:"friendships,omitempty" gorm:"foreignKey:AccountID"`
-	RelatedFriendships []AccountFriendship `json:"related_friendships,omitempty" gorm:"foreignKey:RelatedID"`
+	Relations []AccountRelationship `json:"relations,omitempty" gorm:"foreignKey:AccountID"`
 }
 
 func (v Account) GetAvatar() *string {

pkg/internal/models/clients.go

@@ -5,14 +5,12 @@ import "gorm.io/datatypes"
 type ThirdClient struct {
 	BaseModel
 
-	Alias         string                      `json:"alias" gorm:"uniqueIndex"`
-	Name          string                      `json:"name"`
-	Description   string                      `json:"description"`
-	Secret        string                      `json:"secret"`
-	Urls          datatypes.JSONSlice[string] `json:"urls"`
-	Callbacks     datatypes.JSONSlice[string] `json:"callbacks"`
-	Sessions      []AuthTicket                `json:"tickets" gorm:"foreignKey:ClientID"`
-	Notifications []Notification              `json:"notifications" gorm:"foreignKey:SenderID"`
-	IsDraft       bool                        `json:"is_draft"`
-	AccountID     *uint                       `json:"account_id"`
+	Alias       string                      `json:"alias" gorm:"uniqueIndex"`
+	Name        string                      `json:"name"`
+	Description string                      `json:"description"`
+	Secret      string                      `json:"secret"`
+	Urls        datatypes.JSONSlice[string] `json:"urls"`
+	Callbacks   datatypes.JSONSlice[string] `json:"callbacks"`
+	IsDraft     bool                        `json:"is_draft"`
+	AccountID   *uint                       `json:"account_id"`
 }

pkg/internal/models/friendships.go

@@ -1,20 +0,0 @@
-package models
-
-type FriendshipStatus = int8
-
-const (
-	FriendshipPending = FriendshipStatus(iota)
-	FriendshipActive
-	FriendshipBlocked
-)
-
-type AccountFriendship struct {
-	BaseModel
-
-	AccountID uint             `json:"account_id"`
-	RelatedID uint             `json:"related_id"`
-	BlockedBy *uint            `json:"blocked_by"`
-	Account   Account          `json:"account"`
-	Related   Account          `json:"related"`
-	Status    FriendshipStatus `json:"status"`
-}

pkg/internal/models/notifications.go

@@ -7,15 +7,16 @@ import (
 type Notification struct {
 	BaseModel
 
-	Type        string                                `json:"type"`
-	Subject     string                                `json:"subject"`
-	Content     string                                `json:"content"`
-	Metadata    datatypes.JSONMap                     `json:"metadata"`
-	Links       datatypes.JSONSlice[NotificationLink] `json:"links"`
-	IsRealtime  bool                                  `json:"is_realtime" gorm:"-"`
-	IsForcePush bool                                  `json:"is_force_push" gorm:"-"`
-	SenderID    *uint                                 `json:"sender_id"`
-	RecipientID uint                                  `json:"recipient_id"`
+	Topic    string            `json:"topic"`
+	Title    string            `json:"title"`
+	Subtitle *string           `json:"subtitle"`
+	Body     string            `json:"body"`
+	Metadata datatypes.JSONMap `json:"metadata"`
+	UserID   uint              `json:"user_id"`
+	SenderID *uint             `json:"sender_id"`
+
+	IsRealtime  bool `json:"is_realtime" gorm:"-"`
+	IsForcePush bool `json:"is_force_push" gorm:"-"`
 }
 
 // NotificationLink Used to embed into notify and render actions

pkg/internal/models/relationships.go

@@ -0,0 +1,22 @@
+package models
+
+import "gorm.io/datatypes"
+
+type RelationshipStatus = int8
+
+const (
+	RelationshipPending = RelationshipStatus(iota)
+	RelationshipFriend
+	RelationshipBlocked
+)
+
+type AccountRelationship struct {
+	BaseModel
+
+	AccountID uint               `json:"account_id"`
+	RelatedID uint               `json:"related_id"`
+	Account   Account            `json:"account"`
+	Related   Account            `json:"related"`
+	Status    RelationshipStatus `json:"status"`
+	PermNodes datatypes.JSONMap  `json:"perm_nodes"`
+}