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

🐛 Fix cannot get channel properly

Browse Source
This commit is contained in:
LittleSheep 2024-06-08 23:59:25 +08:00
parent bfd0c5e469
commit 4da282012d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/server/channel_members_api.go
View File

@ -135,7 +135,7 @@ func removeChannelMember(c *fiber.Ctx) error {
}
}
func editChannelMembership(c *fiber.Ctx) error {
func editMyChannelMembership(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
alias := c.Params("channel")
@ -148,7 +148,13 @@ func editChannelMembership(c *fiber.Ctx) error {
return err
}
channel, err := services.GetChannelWithAlias(alias)
var err error
var channel models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
channel, err = services.GetChannelWithAlias(alias, val.ID)
} else {
channel, err = services.GetChannelWithAlias(alias)
}
if err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}

2
pkg/server/startup.go
View File

@ -80,8 +80,8 @@ func NewServer() {
channels.Delete("/:channelId", authMiddleware, deleteChannel)
channels.Get("/:channel/members", listChannelMembers)
channels.Put("/:channel/members/me", authMiddleware, editChannelMembership)
channels.Get("/:channel/members/me", authMiddleware, getMyChannelMembership)
channels.Put("/:channel/members/me", authMiddleware, editMyChannelMembership)
channels.Post("/:channel/members", authMiddleware, addChannelMember)
channels.Post("/:channel/members/me", authMiddleware, joinChannel)
channels.Delete("/:channel/members", authMiddleware, removeChannelMember)