3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-05-28 00:17:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix logs, unified session_id.

Browse source
This commit is contained in:
Miroslav Šedivý 2021-03-13 23:27:28 +01:00
parent cacdd9e20a
commit d83e04e7ec
10 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/websocket/filechooserdialog.go
View file

@ -7,7 +7,7 @@ import (
)
func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {
var file_chooser_dialog_member types.Session
var activeSession types.Session
// when dialog opens, everyone should be notified.
manager.desktop.OnFileChooserDialogOpened(func() {
@ -20,7 +20,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {
return
}
file_chooser_dialog_member = host
activeSession = host
go manager.sessions.Broadcast(message.MemberID{
Event: event.FILE_CHOOSER_DIALOG_OPENED,
@ -32,7 +32,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {
manager.desktop.OnFileChooserDialogClosed(func() {
manager.logger.Info().Msg("FileChooserDialog closed")
file_chooser_dialog_member = nil
activeSession = nil
go manager.sessions.Broadcast(message.MemberID{
Event: event.FILE_CHOOSER_DIALOG_CLOSED,
@ -41,16 +41,16 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {
// when new user joins, and someone holds dialog, he shouldd be notified about it.
manager.sessions.OnConnected(func(session types.Session) {
if file_chooser_dialog_member == nil {
if activeSession == nil {
return
}
if err := session.Send(message.MemberID{
Event: event.FILE_CHOOSER_DIALOG_OPENED,
ID: file_chooser_dialog_member.ID(),
ID: activeSession.ID(),
}); err != nil {
manager.logger.Warn().
Str("id", session.ID()).
Str("session_id", session.ID()).
Err(err).
Msgf("could not send event `%s` to session", event.FILE_CHOOSER_DIALOG_OPENED)
}
@ -58,11 +58,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {
// when user, that holds dialog, disconnects, it should be closed.
manager.sessions.OnDisconnected(func(session types.Session) {
if file_chooser_dialog_member == nil {
return
}
if session.ID() != file_chooser_dialog_member.ID() {
if activeSession == nil || activeSession != session {
return
}