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

Go generics and changes in v1.18 (#5)

Browse Source 
* ArrayIn to use generics.

* interface{} -> any.
This commit is contained in:
Miroslav Šedivý
2022-07-28 12:20:20 +02:00
committed by GitHub
parent c725e96c90
commit babddacbf3
26 changed files with 100 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/websocket/filechooserdialog.go
View File

@ -26,7 +26,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {
event.FILE_CHOOSER_DIALOG_OPENED,
message.SessionID{
ID: host.ID(),
}, nil)
})
})
// when dialog closes, everyone should be notified.
@ -37,7 +37,7 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {
go manager.sessions.Broadcast(
event.FILE_CHOOSER_DIALOG_CLOSED,
message.SessionID{}, nil)
message.SessionID{})
})
// when new user joins, and someone holds dialog, he shouldd be notified about it.

2
internal/websocket/handler/screen.go
View File

@ -18,6 +18,6 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc
return err
}
h.sessions.Broadcast(event.SCREEN_UPDATED, payload, nil)
h.sessions.Broadcast(event.SCREEN_UPDATED, payload)
return nil
}

2
internal/websocket/handler/send.go
View File

@ -33,7 +33,7 @@ func (h *MessageHandlerCtx) sendBroadcast(session types.Session, payload *messag
Sender: session.ID(),
Subject: payload.Subject,
Body: payload.Body,
}, []string{session.ID()})
}, session.ID())
return nil
}

8
internal/websocket/handler/session.go
View File

@ -13,7 +13,7 @@ func (h *MessageHandlerCtx) SessionCreated(session types.Session) error {
ID: session.ID(),
Profile: session.Profile(),
State: session.State(),
}, nil)
})
return nil
}
@ -23,7 +23,7 @@ func (h *MessageHandlerCtx) SessionDeleted(session types.Session) error {
event.SESSION_DELETED,
message.SessionID{
ID: session.ID(),
}, nil)
})
return nil
}
@ -58,7 +58,7 @@ func (h *MessageHandlerCtx) SessionProfileChanged(session types.Session) error {
message.MemberProfile{
ID: session.ID(),
MemberProfile: session.Profile(),
}, nil)
})
return nil
}
@ -69,7 +69,7 @@ func (h *MessageHandlerCtx) SessionStateChanged(session types.Session) error {
message.SessionState{
ID: session.ID(),
SessionState: session.State(),
}, nil)
})
return nil
}

8
internal/websocket/manager.go
View File

@ -105,7 +105,7 @@ func (manager *WebSocketManagerCtx) Start() {
payload.HostID = session.ID()
}
manager.sessions.Broadcast(event.CONTROL_HOST, payload, nil)
manager.sessions.Broadcast(event.CONTROL_HOST, payload)
manager.logger.Info().
Bool("has_host", payload.HasHost).
@ -124,7 +124,7 @@ func (manager *WebSocketManagerCtx) Start() {
manager.stopInactiveCursors()
}
manager.sessions.Broadcast(event.SYSTEM_SETTINGS, new, nil)
manager.sessions.Broadcast(event.SYSTEM_SETTINGS, new)
manager.logger.Info().
Interface("new", new).
Interface("old", old).
@ -347,7 +347,7 @@ func (manager *WebSocketManagerCtx) startInactiveCursors() {
// remove last cursor entries and send empty message
_ = manager.sessions.PopCursors()
manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, []message.SessionCursors{}, nil)
manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, []message.SessionCursors{})
return
case <-ticker.C:
cursorsMap := manager.sessions.PopCursors()
@ -369,7 +369,7 @@ func (manager *WebSocketManagerCtx) startInactiveCursors() {
)
}
manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, sessionCursors, nil)
manager.sessions.InactiveCursorsBroadcast(event.SESSION_CURSORS, sessionCursors)
}
}
}()

2
internal/websocket/peer.go
View File

@ -36,7 +36,7 @@ func (peer *WebSocketPeerCtx) setSessionID(sessionId string) {
peer.logger = peer.logger.With().Str("session_id", sessionId).Logger()
}
func (peer *WebSocketPeerCtx) Send(event string, payload interface{}) {
func (peer *WebSocketPeerCtx) Send(event string, payload any) {
peer.mu.Lock()
defer peer.mu.Unlock()