iridium/neko-custom
Archived
2
0
Fork 0
Code Pull Requests Activity

fix locked room bug

Browse Source
This commit is contained in:
m1k1o 2021-01-14 21:41:00 +01:00
parent 9e5019be7d
commit f093ef762b
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/locale/en-us.ts
View File

@ -48,10 +48,10 @@ export const controls = {
} }
export const room = { export const room = {
lock: 'Lock Room', lock: 'Lock Room (for users)',
unlock: 'Unlock Room', unlock: 'Unlock Room (for users)',
locked: 'Room Locked', locked: 'Room Locked (for users)',
unlocked: 'Room Unlocked', unlocked: 'Room Unlocked (for users)',
} }
export const setting = { export const setting = {

15
server/internal/websocket/handler.go
View File

@ -22,7 +22,7 @@ type MessageHandler struct {
locked bool locked bool
} }
func (h *MessageHandler) Connected(id string, socket *WebSocket) (bool, string, error) { func (h *MessageHandler) Connected(admin bool, socket *WebSocket) (bool, string, error) {
address := socket.Address() address := socket.Address()
if address == "" { if address == "" {
h.logger.Debug().Msg("no remote address") h.logger.Debug().Msg("no remote address")
@ -34,22 +34,15 @@ func (h *MessageHandler) Connected(id string, socket *WebSocket) (bool, string,
} }
} }
if h.locked { if h.locked && !admin {
session, ok := h.sessions.Get(id) h.logger.Debug().Msg("server locked")
if !ok || !session.Admin() { return false, "locked", nil
h.logger.Debug().Msg("server locked")
return false, "locked", nil
}
} }
return true, "", nil return true, "", nil
} }
func (h *MessageHandler) Disconnected(id string) error { func (h *MessageHandler) Disconnected(id string) error {
if h.locked && len(h.sessions.Admins()) == 0 {
h.locked = false
}
return h.sessions.Destroy(id) return h.sessions.Destroy(id)
} }

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

@ -150,7 +150,7 @@ func (ws *WebSocketHandler) Upgrade(w http.ResponseWriter, r *http.Request) erro
connection: connection, connection: connection,
} }
ok, reason, err := ws.handler.Connected(id, socket) ok, reason, err := ws.handler.Connected(admin, socket)
if err != nil { if err != nil {
ws.logger.Error().Err(err).Msg("connection failed") ws.logger.Error().Err(err).Msg("connection failed")
return err return err