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

♻️ Use dealer's BaseModel

Browse Source
This commit is contained in:
LittleSheep
2024-09-11 23:58:02 +08:00
parent f962376f42
commit 14e3750bd9
20 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/internal/services/calls.go
View File

@ -6,6 +6,7 @@ import (
"fmt"
"time"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
@ -39,7 +40,7 @@ func GetCall(channel models.Channel, id uint) (models.Call, error) {
var call models.Call
if err := database.C.
Where(models.Call{
BaseModel: models.BaseModel{ID: id},
BaseModel: hyper.BaseModel{ID: id},
ChannelID: channel.ID,
}).
Preload("Founder").

3
pkg/internal/services/channels.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"regexp"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
"github.com/samber/lo"
@ -21,7 +22,7 @@ func GetChannelAliasAvailability(alias string) error {
func GetChannel(id uint) (models.Channel, error) {
var channel models.Channel
tx := database.C.Where(models.Channel{
BaseModel: models.BaseModel{ID: id},
BaseModel: hyper.BaseModel{ID: id},
}).Preload("Account").Preload("Realm")
tx = PreloadDirectChannelMembers(tx)
if err := tx.First(&channel).Error; err != nil {

1
pkg/internal/services/direct_channels.go
View File

@ -2,6 +2,7 @@ package services
import (
"fmt"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
"github.com/spf13/viper"

5
pkg/internal/services/events.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"strings"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
@ -47,7 +48,7 @@ func GetEvent(channel models.Channel, id uint) (models.Event, error) {
var event models.Event
if err := database.C.
Where(models.Event{
BaseModel: models.BaseModel{ID: id},
BaseModel: hyper.BaseModel{ID: id},
ChannelID: channel.ID,
}).
Preload("Sender").
@ -62,7 +63,7 @@ func GetEvent(channel models.Channel, id uint) (models.Event, error) {
func GetEventWithSender(channel models.Channel, member models.ChannelMember, id uint) (models.Event, error) {
var event models.Event
if err := database.C.Where(models.Event{
BaseModel: models.BaseModel{ID: id},
BaseModel: hyper.BaseModel{ID: id},
ChannelID: channel.ID,
SenderID: member.ID,
}).First(&event).Error; err != nil {

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

@ -4,6 +4,8 @@ import (
"context"
"errors"
"fmt"
"reflect"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
@ -11,7 +13,6 @@ import (
"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
"github.com/samber/lo"
"gorm.io/gorm"
"reflect"
)
func GetRealmWithExtID(id uint) (models.Realm, error) {

3
pkg/internal/services/websocket.go
View File

@ -2,9 +2,10 @@ package services
import (
"context"
"github.com/samber/lo"
"time"
"github.com/samber/lo"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/gap"
"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"