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

✨ Basic realtime text command

Browse Source
This commit is contained in:
LittleSheep
2024-03-30 17:10:36 +08:00
parent 23989f98b6
commit d5093d7b9c
15 changed files with 304 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/channel_members_api.go
View File

@ -44,7 +44,7 @@ func inviteChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
if err := services.InviteChannelMember(account, channel); err != nil {
if err := services.AddChannelMember(account, channel); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else {
return c.SendStatus(fiber.StatusOK)
@ -78,7 +78,7 @@ func kickChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
if err := services.KickChannelMember(account, channel); err != nil {
if err := services.RemoveChannelMember(account, channel); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else {
return c.SendStatus(fiber.StatusOK)

9
pkg/server/channels_api.go
View File

@ -53,11 +53,9 @@ func listAvailableChannel(c *fiber.Ctx) error {
func createChannel(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
if user.PowerLevel < 10 {
return fiber.NewError(fiber.StatusForbidden, "require power level 10 to create channels")
}
var data struct {
Alias string `json:"alias" validate:"required,min=4,max=32"`
Name string `json:"name" validate:"required"`
Description string `json:"description"`
}
@ -66,7 +64,7 @@ func createChannel(c *fiber.Ctx) error {
return err
}
channel, err := services.NewChannel(user, data.Name, data.Description)
channel, err := services.NewChannel(user, data.Alias, data.Name, data.Description)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
@ -79,6 +77,7 @@ func editChannel(c *fiber.Ctx) error {
id, _ := c.ParamsInt("channelId", 0)
var data struct {
Alias string `json:"alias" validate:"required,min=4,max=32"`
Name string `json:"name" validate:"required"`
Description string `json:"description"`
}
@ -95,7 +94,7 @@ func editChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
channel, err := services.EditChannel(channel, data.Name, data.Description)
channel, err := services.EditChannel(channel, data.Alias, data.Name, data.Description)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}

3
pkg/server/startup.go
View File

@ -2,6 +2,7 @@ package server
import (
"git.solsynth.dev/hydrogen/messaging/pkg"
"github.com/gofiber/contrib/websocket"
"github.com/gofiber/fiber/v2/middleware/favicon"
"net/http"
"strings"
@ -86,6 +87,8 @@ func NewServer() {
channels.Put("/:channelId", authMiddleware, editChannel)
channels.Delete("/:channelId", authMiddleware, deleteChannel)
}
api.Get("/unified", authMiddleware, websocket.New(unifiedGateway))
}
A.Use(favicon.New(favicon.Config{

49
pkg/server/unified_ws.go Normal file
View File

@ -0,0 +1,49 @@
package server
import (
"git.solsynth.dev/hydrogen/messaging/pkg/models"
"git.solsynth.dev/hydrogen/messaging/pkg/services"
"github.com/gofiber/contrib/websocket"
jsoniter "github.com/json-iterator/go"
)
func unifiedGateway(c *websocket.Conn) {
user := c.Locals("principal").(models.Account)
// Push connection
connectionIdx := len(services.WsConn)
services.WsConn[user.ID] = append(services.WsConn[user.ID], c)
// Event loop
var task models.UnifiedCommand
var messageType int
var packet []byte
var err error
for {
if messageType, packet, err = c.ReadMessage(); err != nil {
break
} else if err := jsoniter.Unmarshal(packet, &task); err != nil {
_ = c.WriteMessage(messageType, models.UnifiedCommand{
Action: "error",
Message: "unable to unmarshal your command, requires json request",
}.Marshal())
continue
}
message := services.DealCommand(task, user)
if message != nil {
if err = c.WriteMessage(messageType, message.Marshal()); err != nil {
break
}
}
}
// Pop connection
services.WsConn[user.ID] = append(
services.WsConn[user.ID][:connectionIdx],
services.WsConn[user.ID][connectionIdx+1:]...,
)
}