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

🐛 Fix empty message... again

Browse Source
This commit is contained in:
LittleSheep 2024-08-07 18:39:38 +08:00
parent 54739cd11e
commit 1bc687eba6
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/internal/server/api/events_message_api.go
View File

@ -30,8 +30,9 @@ func newMessageEvent(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusBadRequest, "message uuid was not valid") return fiber.NewError(fiber.StatusBadRequest, "message uuid was not valid")
} }
data.Body.Text = strings.TrimSpace(data.Body.Text)
if len(data.Body.Text) == 0 && len(data.Body.Attachments) == 0 { if len(data.Body.Text) == 0 && len(data.Body.Attachments) == 0 {
return fiber.NewError(fiber.StatusBadRequest, "cannot send an empty message") return fiber.NewError(fiber.StatusBadRequest, "empty message was not allowed")
} }
var err error var err error
@ -52,13 +53,6 @@ func newMessageEvent(c *fiber.Ctx) error {
raw, _ := jsoniter.Marshal(data.Body) raw, _ := jsoniter.Marshal(data.Body)
_ = jsoniter.Unmarshal(raw, &parsed) _ = jsoniter.Unmarshal(raw, &parsed)
if val, ok := parsed["text"].(string); ok {
val = strings.TrimSpace(val)
parsed["text"] = val
} else if files, ok := parsed["attachments"].([]any); (!ok || len(files) == 0) && len(val) == 0 {
return fiber.NewError(fiber.StatusBadRequest, "empty message was not allowed")
}
event := models.Event{ event := models.Event{
Uuid: data.Uuid, Uuid: data.Uuid,
Body: parsed, Body: parsed,