iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

refactor progress

Browse Source
This commit is contained in:
Craig
2020-01-22 17:16:40 +00:00
parent d497806443
commit 8ba1b68a21
55 changed files with 4899 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/internal/event/events.go
View File

@ -26,5 +26,5 @@ const ADMIN_LOCK = "admin/lock"
const ADMIN_MUTE = "admin/mute"
const ADMIN_UNLOCK = "admin/unlock"
const ADMIN_UNMUTE = "admin/unmute"
const ADMIN_FORCE_CONTROL = "admin/force/control"
const ADMIN_FORCE_RELEASE = "admin/force/release"
const ADMIN_CONTROL = "admin/control"
const ADMIN_RELEASE = "admin/release"

8
server/internal/message/messages.go
View File

@ -72,8 +72,8 @@ type Admin struct {
ID string `json:"id"`
}
type AdminSubject struct {
Event string `json:"event"`
Subject string `json:"subject"`
ID string `json:"id"`
type AdminTarget struct {
Event string `json:"event"`
Target string `json:"target"`
ID string `json:"id"`
}

2
server/internal/session/session.go
View File

@ -11,7 +11,7 @@ type Session struct {
ID string `json:"id"`
Name string `json:"username"`
Admin bool `json:"admin"`
Muted bool `json:"-"`
Muted bool `json:"muted"`
connected bool
socket *websocket.Conn
peer *webrtc.PeerConnection

127
server/internal/websocket/admin.go
View File

@ -49,15 +49,29 @@ func (h *MessageHandler) adminControl(id string, session *session.Session) error
return nil
}
host, ok := h.sessions.GetHost()
h.sessions.SetHost(id)
if err := h.sessions.Brodcast(
message.Admin{
Event: event.ADMIN_FORCE_CONTROL,
ID: id,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_FORCE_CONTROL)
return err
if ok {
if err := h.sessions.Brodcast(
message.AdminTarget{
Event: event.ADMIN_CONTROL,
ID: id,
Target: host.ID,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_CONTROL)
return err
}
} else {
if err := h.sessions.Brodcast(
message.Admin{
Event: event.ADMIN_CONTROL,
ID: id,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_CONTROL)
return err
}
}
return nil
@ -68,15 +82,29 @@ func (h *MessageHandler) adminRelease(id string, session *session.Session) error
return nil
}
host, ok := h.sessions.GetHost()
h.sessions.ClearHost()
if err := h.sessions.Brodcast(
message.Admin{
Event: event.ADMIN_FORCE_RELEASE,
ID: id,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_FORCE_RELEASE)
return err
if ok {
if err := h.sessions.Brodcast(
message.AdminTarget{
Event: event.ADMIN_RELEASE,
ID: id,
Target: host.ID,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_RELEASE)
return err
}
} else {
if err := h.sessions.Brodcast(
message.Admin{
Event: event.ADMIN_RELEASE,
ID: id,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_RELEASE)
return err
}
}
return nil
@ -87,12 +115,16 @@ func (h *MessageHandler) adminBan(id string, session *session.Session, payload *
return nil
}
session, ok := h.sessions.Get(id)
target, ok := h.sessions.Get(id)
if !ok {
return nil
}
address := session.RemoteAddr()
if target.Admin {
return nil
}
address := target.RemoteAddr()
if address == nil {
return nil
}
@ -107,10 +139,10 @@ func (h *MessageHandler) adminBan(id string, session *session.Session, payload *
}
if err := h.sessions.Brodcast(
message.AdminSubject{
Event: event.ADMIN_BAN,
Subject: payload.ID,
ID: id,
message.AdminTarget{
Event: event.ADMIN_BAN,
Target: target.ID,
ID: id,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_BAN)
return err
@ -124,18 +156,27 @@ func (h *MessageHandler) adminKick(id string, session *session.Session, payload
return nil
}
if err := h.sessions.Kick(payload.ID, message.Disconnect{
target, ok := h.sessions.Get(payload.ID)
if !ok {
return nil
}
if target.Admin {
return nil
}
if err := target.Kick(message.Disconnect{
Event: event.SYSTEM_DISCONNECT,
Message: "You have been banned",
Message: "You have been kicked",
}); err != nil {
return err
}
if err := h.sessions.Brodcast(
message.AdminSubject{
Event: event.ADMIN_KICK,
Subject: payload.ID,
ID: id,
message.AdminTarget{
Event: event.ADMIN_KICK,
Target: target.ID,
ID: id,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_KICK)
return err
@ -149,15 +190,22 @@ func (h *MessageHandler) adminMute(id string, session *session.Session, payload
return nil
}
if err := h.sessions.Mute(payload.ID); err != nil {
return err
target, ok := h.sessions.Get(payload.ID)
if !ok {
return nil
}
if target.Admin {
return nil
}
target.Muted = true
if err := h.sessions.Brodcast(
message.AdminSubject{
Event: event.ADMIN_MUTE,
Subject: payload.ID,
ID: id,
message.AdminTarget{
Event: event.ADMIN_MUTE,
Target: target.ID,
ID: id,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_UNMUTE)
return err
@ -171,15 +219,18 @@ func (h *MessageHandler) adminUnmute(id string, session *session.Session, payloa
return nil
}
if err := h.sessions.Unmute(payload.ID); err != nil {
return err
target, ok := h.sessions.Get(payload.ID)
if !ok {
return nil
}
target.Muted = false
if err := h.sessions.Brodcast(
message.AdminSubject{
Event: event.ADMIN_UNMUTE,
Subject: payload.ID,
ID: id,
message.AdminTarget{
Event: event.ADMIN_UNMUTE,
Target: target.ID,
ID: id,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_UNMUTE)
return err

8
server/internal/websocket/chat.go
View File

@ -7,6 +7,10 @@ import (
)
func (h *MessageHandler) chat(id string, session *session.Session, payload *message.ChatRecieve) error {
if session.Muted {
return nil
}
if err := h.sessions.Brodcast(
message.ChatSend{
Event: event.CHAT_MESSAGE,
@ -20,6 +24,10 @@ func (h *MessageHandler) chat(id string, session *session.Session, payload *mess
}
func (h *MessageHandler) chatEmoji(id string, session *session.Session, payload *message.EmojiRecieve) error {
if session.Muted {
return nil
}
if err := h.sessions.Brodcast(
message.EmojiSend{
Event: event.CHAT_MESSAGE,

10
server/internal/websocket/messages.go
View File

@ -57,6 +57,7 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
utils.Unmarshal(&payload, raw, func() error {
return h.webrtc.CreatePeer(id, payload.SDP)
}), "%s failed", header.Event)
// Identity Events
case event.IDENTITY_DETAILS:
payload := &message.IdentityDetails{}
@ -64,11 +65,13 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
utils.Unmarshal(payload, raw, func() error {
return h.identityDetails(id, session, payload)
}), "%s failed", header.Event)
// Control Events
case event.CONTROL_RELEASE:
return errors.Wrapf(h.controlRelease(id, session), "%s failed", header.Event)
case event.CONTROL_REQUEST:
return errors.Wrapf(h.controlRequest(id, session), "%s failed", header.Event)
// Chat Events
case event.CHAT_MESSAGE:
payload := &message.ChatRecieve{}
@ -82,12 +85,15 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
utils.Unmarshal(payload, raw, func() error {
return h.chatEmoji(id, session, payload)
}), "%s failed", header.Event)
// Admin Events
case event.ADMIN_LOCK:
return errors.Wrapf(h.adminLock(id, session), "%s failed", header.Event)
case event.ADMIN_FORCE_CONTROL:
case event.ADMIN_UNLOCK:
return errors.Wrapf(h.adminUnlock(id, session), "%s failed", header.Event)
case event.ADMIN_CONTROL:
return errors.Wrapf(h.adminControl(id, session), "%s failed", header.Event)
case event.ADMIN_FORCE_RELEASE:
case event.ADMIN_RELEASE:
return errors.Wrapf(h.adminRelease(id, session), "%s failed", header.Event)
case event.ADMIN_BAN:
payload := &message.Admin{}