HyperNet/Messaging
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⬆️ Upgrade dealer

Browse Source
This commit is contained in:
LittleSheep
2024-09-17 16:52:42 +08:00
parent f6482225ab
commit ee16094855
7 changed files with 20 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
pkg/internal/services/realms.go
View File

@ -2,9 +2,6 @@ package services
import (
"context"
"errors"
"fmt"
"reflect"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
@ -12,7 +9,7 @@ import (
"git.solsynth.dev/hydrogen/messaging/pkg/internal/gap"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
"github.com/samber/lo"
"gorm.io/gorm"
"github.com/spf13/viper"
)
func GetRealmWithExtID(id uint) (models.Realm, error) {
@ -27,7 +24,9 @@ func GetRealmWithExtID(id uint) (models.Realm, error) {
if err != nil {
return realm, err
}
return LinkRealm(response)
prefix := viper.GetString("database.prefix")
rm, err := hyper.LinkRealm(database.C, prefix+"realms", response)
return models.Realm{BaseRealm: rm}, err
}
func GetRealmWithAlias(alias string) (models.Realm, error) {
@ -42,7 +41,9 @@ func GetRealmWithAlias(alias string) (models.Realm, error) {
if err != nil {
return realm, err
}
return LinkRealm(response)
prefix := viper.GetString("database.prefix")
rm, err := hyper.LinkRealm(database.C, prefix+"realms", response)
return models.Realm{BaseRealm: rm}, err
}
func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberInfo, error) {
@ -51,7 +52,7 @@ func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberInfo, error) {
return nil, err
}
response, err := proto.NewRealmClient(pc).GetRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
RealmId: uint64(realmId),
RealmId: lo.ToPtr(uint64(realmId)),
UserId: lo.ToPtr(uint64(userId)),
})
if err != nil {
@ -67,7 +68,7 @@ func ListRealmMember(realmId uint) ([]*proto.RealmMemberInfo, error) {
return nil, err
}
response, err := proto.NewRealmClient(pc).ListRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
RealmId: uint64(realmId),
RealmId: lo.ToPtr(uint64(realmId)),
})
if err != nil {
return nil, err
@ -75,40 +76,3 @@ func ListRealmMember(realmId uint) ([]*proto.RealmMemberInfo, error) {
return response.Data, nil
}
}
func LinkRealm(info *proto.RealmInfo) (models.Realm, error) {
var realm models.Realm
if info == nil {
return realm, fmt.Errorf("remote realm info was not found")
}
if err := database.C.Where(&models.Realm{
ExternalID: uint(info.Id),
}).First(&realm).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
realm = models.Realm{
Alias: info.Alias,
Name: info.Name,
Description: info.Description,
IsPublic: info.IsPublic,
IsCommunity: info.IsCommunity,
ExternalID: uint(info.Id),
}
return realm, database.C.Save(&realm).Error
}
return realm, err
}
prev := realm
realm.Alias = info.Alias
realm.Name = info.Name
realm.Description = info.Description
realm.IsPublic = info.IsPublic
realm.IsCommunity = info.IsCommunity
var err error
if !reflect.DeepEqual(prev, realm) {
err = database.C.Save(&realm).Error
}
return realm, err
}