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

💄 Redesigned direct messages channel

Browse Source
This commit is contained in:
LittleSheep 2024-05-28 20:24:40 +08:00
parent b3b1ec4585
commit 9aa5dec54d
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/server/channel_members_api.go
View File

@ -47,7 +47,11 @@ func addChannelMember(c *fiber.Ctx) error {
Alias: alias, Alias: alias,
}).First(&channel).Error; err != nil { }).First(&channel).Error; err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error()) return fiber.NewError(fiber.StatusNotFound, err.Error())
} else if member, err := services.GetChannelMember(user, channel.ID); err != nil { } else if channel.Type == models.ChannelTypeDirect {
return fiber.NewError(fiber.StatusBadRequest, "direct message member changes was not allowed")
}
if member, err := services.GetChannelMember(user, channel.ID); err != nil {
return fiber.NewError(fiber.StatusForbidden, err.Error()) return fiber.NewError(fiber.StatusForbidden, err.Error())
} else if member.PowerLevel < 50 { } else if member.PowerLevel < 50 {
return fiber.NewError(fiber.StatusForbidden, "you must be a moderator of a channel to add member into it") return fiber.NewError(fiber.StatusForbidden, "you must be a moderator of a channel to add member into it")
@ -85,7 +89,11 @@ func removeChannelMember(c *fiber.Ctx) error {
AccountID: user.ID, AccountID: user.ID,
}).First(&channel).Error; err != nil { }).First(&channel).Error; err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error()) return fiber.NewError(fiber.StatusNotFound, err.Error())
} else if member, err := services.GetChannelMember(user, channel.ID); err != nil { } else if channel.Type == models.ChannelTypeDirect {
return fiber.NewError(fiber.StatusBadRequest, "direct message member changes was not allowed")
}
if member, err := services.GetChannelMember(user, channel.ID); err != nil {
return fiber.NewError(fiber.StatusForbidden, err.Error()) return fiber.NewError(fiber.StatusForbidden, err.Error())
} else if member.PowerLevel < 50 { } else if member.PowerLevel < 50 {
return fiber.NewError(fiber.StatusForbidden, "you must be a moderator of a channel to remove member into it") return fiber.NewError(fiber.StatusForbidden, "you must be a moderator of a channel to remove member into it")

18
pkg/server/direct_channels_api.go
View File

@ -1,11 +1,12 @@
package server package server
import ( import (
"fmt"
"git.solsynth.dev/hydrogen/messaging/pkg/database" "git.solsynth.dev/hydrogen/messaging/pkg/database"
"git.solsynth.dev/hydrogen/messaging/pkg/models" "git.solsynth.dev/hydrogen/messaging/pkg/models"
"git.solsynth.dev/hydrogen/messaging/pkg/services" "git.solsynth.dev/hydrogen/messaging/pkg/services"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/samber/lo"
) )
func createDirectChannel(c *fiber.Ctx) error { func createDirectChannel(c *fiber.Ctx) error {
@ -15,7 +16,7 @@ func createDirectChannel(c *fiber.Ctx) error {
Alias string `json:"alias" validate:"required,lowercase,min=4,max=32"` Alias string `json:"alias" validate:"required,lowercase,min=4,max=32"`
Name string `json:"name" validate:"required"` Name string `json:"name" validate:"required"`
Description string `json:"description"` Description string `json:"description"`
Members []uint `json:"members"` RelatedUser uint `json:"related_user"`
IsEncrypted bool `json:"is_encrypted"` IsEncrypted bool `json:"is_encrypted"`
} }
@ -36,9 +37,9 @@ func createDirectChannel(c *fiber.Ctx) error {
} }
} }
var members []models.Account var relatedUser models.Account
if err := database.C.Where("id IN ?", data.Members).Find(&members).Error; err != nil { if err := database.C.Where("id = ?", data.RelatedUser).First(&relatedUser).Error; err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error()) return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("unable to find related user: %v", err))
} }
channel := models.Channel{ channel := models.Channel{
@ -48,11 +49,10 @@ func createDirectChannel(c *fiber.Ctx) error {
IsEncrypted: data.IsEncrypted, IsEncrypted: data.IsEncrypted,
AccountID: user.ID, AccountID: user.ID,
Type: models.ChannelTypeDirect, Type: models.ChannelTypeDirect,
Members: append([]models.ChannelMember{ Members: []models.ChannelMember{
{AccountID: user.ID, PowerLevel: 100}, {AccountID: user.ID, PowerLevel: 100},
}, lo.Map(members, func(item models.Account, idx int) models.ChannelMember { {AccountID: relatedUser.ID, PowerLevel: 100},
return models.ChannelMember{AccountID: item.ID, PowerLevel: 100} },
})...),
} }
if realm != nil { if realm != nil {