✨ Basic realtime text command
This commit is contained in:
@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"reflect"
|
||||
"time"
|
||||
|
||||
"git.solsynth.dev/hydrogen/identity/pkg/grpc/proto"
|
||||
@ -37,6 +38,7 @@ func LinkAccount(userinfo *proto.Userinfo) (models.Account, error) {
|
||||
return account, err
|
||||
}
|
||||
|
||||
prev := account
|
||||
account.Name = userinfo.Name
|
||||
account.Nick = userinfo.Nick
|
||||
account.Avatar = userinfo.Avatar
|
||||
@ -44,7 +46,10 @@ func LinkAccount(userinfo *proto.Userinfo) (models.Account, error) {
|
||||
account.Description = userinfo.GetDescription()
|
||||
account.EmailAddress = userinfo.Email
|
||||
|
||||
err := database.C.Save(&account).Error
|
||||
var err error
|
||||
if !reflect.DeepEqual(account, prev) {
|
||||
err = database.C.Save(&account).Error
|
||||
}
|
||||
|
||||
return account, err
|
||||
}
|
||||
|
@ -1,11 +1,29 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"git.solsynth.dev/hydrogen/messaging/pkg/database"
|
||||
"git.solsynth.dev/hydrogen/messaging/pkg/models"
|
||||
"github.com/samber/lo"
|
||||
)
|
||||
|
||||
func GetAvailableChannel(id uint, user models.Account) (models.Channel, models.ChannelMember, error) {
|
||||
var member models.ChannelMember
|
||||
var channel models.Channel
|
||||
if err := database.C.Where("id = ?", id).First(&channel).Error; err != nil {
|
||||
return channel, member, err
|
||||
}
|
||||
|
||||
if err := database.C.Where(models.ChannelMember{
|
||||
AccountID: user.ID,
|
||||
ChannelID: channel.ID,
|
||||
}).First(&member).Error; err != nil {
|
||||
return channel, member, fmt.Errorf("channel principal not found: %v", err.Error())
|
||||
}
|
||||
|
||||
return channel, member, nil
|
||||
}
|
||||
|
||||
func ListChannel() ([]models.Channel, error) {
|
||||
var channels []models.Channel
|
||||
if err := database.C.Find(&channels).Error; err != nil {
|
||||
@ -44,8 +62,9 @@ func ListChannelIsAvailable(user models.Account) ([]models.Channel, error) {
|
||||
return channels, nil
|
||||
}
|
||||
|
||||
func NewChannel(user models.Account, name, description string) (models.Channel, error) {
|
||||
func NewChannel(user models.Account, alias, name, description string) (models.Channel, error) {
|
||||
channel := models.Channel{
|
||||
Alias: alias,
|
||||
Name: name,
|
||||
Description: description,
|
||||
AccountID: user.ID,
|
||||
@ -72,7 +91,7 @@ func ListChannelMember(channelId uint) ([]models.ChannelMember, error) {
|
||||
return members, nil
|
||||
}
|
||||
|
||||
func InviteChannelMember(user models.Account, target models.Channel) error {
|
||||
func AddChannelMember(user models.Account, target models.Channel) error {
|
||||
member := models.ChannelMember{
|
||||
ChannelID: target.ID,
|
||||
AccountID: user.ID,
|
||||
@ -83,7 +102,7 @@ func InviteChannelMember(user models.Account, target models.Channel) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func KickChannelMember(user models.Account, target models.Channel) error {
|
||||
func RemoveChannelMember(user models.Account, target models.Channel) error {
|
||||
var member models.ChannelMember
|
||||
|
||||
if err := database.C.Where(&models.ChannelMember{
|
||||
@ -96,7 +115,8 @@ func KickChannelMember(user models.Account, target models.Channel) error {
|
||||
return database.C.Delete(&member).Error
|
||||
}
|
||||
|
||||
func EditChannel(channel models.Channel, name, description string) (models.Channel, error) {
|
||||
func EditChannel(channel models.Channel, alias, name, description string) (models.Channel, error) {
|
||||
channel.Alias = alias
|
||||
channel.Name = name
|
||||
channel.Description = description
|
||||
|
||||
|
43
pkg/services/connections.go
Normal file
43
pkg/services/connections.go
Normal file
@ -0,0 +1,43 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"git.solsynth.dev/hydrogen/messaging/pkg/models"
|
||||
"github.com/gofiber/contrib/websocket"
|
||||
"github.com/samber/lo"
|
||||
)
|
||||
|
||||
var WsConn = make(map[uint][]*websocket.Conn)
|
||||
|
||||
func CheckOnline(user models.Account) bool {
|
||||
return len(WsConn[user.ID]) > 0
|
||||
}
|
||||
|
||||
func PushCommand(userId uint, task models.UnifiedCommand) {
|
||||
for _, conn := range WsConn[userId] {
|
||||
_ = conn.WriteMessage(1, task.Marshal())
|
||||
}
|
||||
}
|
||||
|
||||
func DealCommand(task models.UnifiedCommand, user models.Account) *models.UnifiedCommand {
|
||||
switch task.Action {
|
||||
case "messages.send.text":
|
||||
var req struct {
|
||||
ChannelID uint `json:"channel_id"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
models.FitStruct(task.Payload, &req)
|
||||
|
||||
if channel, member, err := GetAvailableChannel(req.ChannelID, user); err != nil {
|
||||
return lo.ToPtr(models.UnifiedCommandFromError(err))
|
||||
} else if _, err = NewTextMessage(req.Content, member, channel); err != nil {
|
||||
return lo.ToPtr(models.UnifiedCommandFromError(err))
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
default:
|
||||
return &models.UnifiedCommand{
|
||||
Action: "error",
|
||||
Message: "command not found",
|
||||
}
|
||||
}
|
||||
}
|
32
pkg/services/messages.go
Normal file
32
pkg/services/messages.go
Normal file
@ -0,0 +1,32 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"git.solsynth.dev/hydrogen/messaging/pkg/database"
|
||||
"git.solsynth.dev/hydrogen/messaging/pkg/models"
|
||||
)
|
||||
|
||||
func NewTextMessage(content string, sender models.ChannelMember, channel models.Channel) (models.Message, error) {
|
||||
message := models.Message{
|
||||
Content: content,
|
||||
Metadata: nil,
|
||||
ChannelID: channel.ID,
|
||||
SenderID: sender.ID,
|
||||
Type: models.MessageTypeText,
|
||||
}
|
||||
|
||||
var members []models.ChannelMember
|
||||
if err := database.C.Save(&message).Error; err != nil {
|
||||
return message, err
|
||||
} else if err = database.C.Where(models.ChannelMember{
|
||||
ChannelID: channel.ID,
|
||||
}).Find(&members).Error; err == nil {
|
||||
for _, member := range members {
|
||||
PushCommand(member.ID, models.UnifiedCommand{
|
||||
Action: "messages.new",
|
||||
Payload: message,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return message, nil
|
||||
}
|
Reference in New Issue
Block a user