From 7c5c9d03d1945d69b8bf3c5f52b335b6deb385ee Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Mon, 6 May 2024 23:28:15 +0800 Subject: [PATCH] :bug: Fix cannot join realm related channel --- pkg/models/channels.go | 4 +++- pkg/server/channel_members_api.go | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/models/channels.go b/pkg/models/channels.go index 400af2d..cda9f0d 100644 --- a/pkg/models/channels.go +++ b/pkg/models/channels.go @@ -19,7 +19,9 @@ type Channel struct { Type ChannelType `json:"type"` Account Account `json:"account"` AccountID uint `json:"account_id"` - RealmID *uint `json:"realm_id"` + + Realm Realm `json:"realm"` + RealmID *uint `json:"realm_id"` } type NotifyLevel = int8 diff --git a/pkg/server/channel_members_api.go b/pkg/server/channel_members_api.go index 3d377a2..512329f 100644 --- a/pkg/server/channel_members_api.go +++ b/pkg/server/channel_members_api.go @@ -132,7 +132,7 @@ func joinChannel(c *fiber.Ctx) error { var channel models.Channel if err := database.C.Where(&models.Channel{ Alias: alias, - }).First(&channel).Error; err != nil { + }).Preload("Realm").First(&channel).Error; err != nil { return fiber.NewError(fiber.StatusNotFound, err.Error()) } else if _, _, err := services.GetAvailableChannel(channel.ID, user); err == nil { return fiber.NewError(fiber.StatusBadRequest, "you already joined the channel") @@ -140,9 +140,9 @@ func joinChannel(c *fiber.Ctx) error { return fiber.NewError(fiber.StatusBadRequest, "you was impossible to join a channel without related realm") } - if realm, err := services.GetRealm(channel.ID); err != nil { + if realm, err := services.GetRealm(channel.Realm.ExternalID); err != nil { return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("invalid channel, related realm was not found: %v", err)) - } else if _, err := services.GetRealmMember(realm.ID, user.ExternalID); err != nil { + } else if _, err := services.GetRealmMember(realm.ExternalID, user.ExternalID); err != nil { return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("you are not a part of the realm: %v", err)) }