From 93668403433cbfc22fe9c38ebbd6ef67af625ad2 Mon Sep 17 00:00:00 2001 From: xengineering Date: Mon, 4 Sep 2023 22:18:53 +0200 Subject: xmpp: Add type SessionFrontend Some parts of the `xmpp` module functionality should be written for the using application software. To reference a running session more easily it is an advantage to have an opaque struct for this instead of decoupled channels. --- limox.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'limox.go') diff --git a/limox.go b/limox.go index 0b5c2ac..6c83e45 100644 --- a/limox.go +++ b/limox.go @@ -25,8 +25,7 @@ type Limox struct { JidEditor widget.Editor PwdEditor widget.Editor MainButton widget.Clickable - sessionIn chan<- any - sessionOut chan any + frontend xmpp.SessionFrontend State LimoxState Window *app.Window Operations op.Ops @@ -41,7 +40,6 @@ func NewLimox() Limox { ), Operations: op.Ops{}, Theme: material.NewTheme(), - sessionOut: make(chan any), State: Disconnected, } @@ -64,7 +62,7 @@ func (l *Limox) run() error { } l.draw(e) } - case data := <-l.sessionOut: + case data := <-l.frontend.In: switch data.(type) { case xmpp.SessionDisconnect: l.State = Disconnected @@ -79,20 +77,19 @@ func (l *Limox) run() error { } func (l *Limox) buttonCallback() { - c := l.sessionIn switch l.State { case Disconnected: jid := l.JidEditor.Text() pwd := l.PwdEditor.Text() setLastJid(jid) setLastPwd(pwd) - l.sessionIn = xmpp.StartSession(l.sessionOut, jid, pwd) + l.frontend = xmpp.StartSession(jid, pwd) l.State = Connecting case Connecting: - go func() { c <- xmpp.SessionShouldDisconnect{} }() + go func() { l.frontend.Out <- xmpp.SessionShouldDisconnect{} }() l.State = Disconnected case Connected: - go func() { c <- xmpp.SessionShouldDisconnect{} }() + go func() { l.frontend.Out <- xmpp.SessionShouldDisconnect{} }() l.State = Disconnected } } -- cgit v1.2.3-70-g09d2