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

🐛 Fix user cannot end own call

Browse Source 
🐛 Fix get realm member issue
This commit is contained in:
LittleSheep 2024-06-23 01:10:39 +08:00
parent 6e2d0b11d9
commit f4a29faadf
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/internal/server/api/channel_members_api.go
View File

@ -213,7 +213,7 @@ func joinChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusBadRequest, "you was impossible to join a channel without related realm") return fiber.NewError(fiber.StatusBadRequest, "you was impossible to join a channel without related realm")
} }
if realm, err := services.GetRealm(channel.Realm.ExternalID); err != nil { if realm, err := services.GetRealmWithExtID(channel.Realm.ExternalID); err != nil {
return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("invalid channel, related realm was not found: %v", err)) return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("invalid channel, related realm was not found: %v", err))
} else if _, err := services.GetRealmMember(realm.ExternalID, 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)) return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("you are not a part of the realm: %v", err))

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

@ -69,7 +69,7 @@ func GetOngoingCall(channel models.Channel) (models.Call, error) {
func NewCall(channel models.Channel, founder models.ChannelMember) (models.Call, error) { func NewCall(channel models.Channel, founder models.ChannelMember) (models.Call, error) {
call := models.Call{ call := models.Call{
ExternalID: channel.Alias, ExternalID: channel.Alias,
FounderID: founder.ID, FounderID: founder.AccountID,
ChannelID: channel.ID, ChannelID: channel.ID,
Founder: founder, Founder: founder,
Channel: channel, Channel: channel,

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

@ -13,7 +13,7 @@ import (
"reflect" "reflect"
) )
func GetRealm(id uint) (models.Realm, error) { func GetRealmWithExtID(id uint) (models.Realm, error) {
var realm models.Realm var realm models.Realm
pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport") pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
if err != nil { if err != nil {
@ -44,12 +44,16 @@ func GetRealmWithAlias(alias string) (models.Realm, error) {
} }
func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberResponse, error) { func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberResponse, error) {
var realm models.Realm
if err := database.C.Where("id = ?", realmId).First(&realm).Error; err != nil {
return nil, err
}
pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport") pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
if err != nil { if err != nil {
return nil, err return nil, err
} }
response, err := proto.NewRealmsClient(pc).GetRealmMember(context.Background(), &proto.RealmMemberLookupRequest{ response, err := proto.NewRealmsClient(pc).GetRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
RealmId: uint64(realmId), RealmId: uint64(realm.ExternalID),
UserId: lo.ToPtr(uint64(userId)), UserId: lo.ToPtr(uint64(userId)),
}) })
if err != nil { if err != nil {