Merge with upstream

pkg/signalmeow/client.go

@@ -42,9 +42,10 @@ type Client struct {
 
 	encryptionLock sync.Mutex
 
-	AuthedWS   *web.SignalWebsocket
-	UnauthedWS *web.SignalWebsocket
-	WSCancel   context.CancelFunc
+	AuthedWS             *web.SignalWebsocket
+	UnauthedWS           *web.SignalWebsocket
+	WSCancel             context.CancelFunc
+	lastConnectionStatus SignalConnectionStatus
 
 	EventHandler func(events.SignalEvent)
 

pkg/signalmeow/receiving.go

@@ -93,7 +93,6 @@ func (cli *Client) StartReceiveLoops(ctx context.Context) (chan SignalConnection
 		defer close(statusChan)
 		defer cancel()
 		var currentStatus, lastAuthStatus, lastUnauthStatus web.SignalWebsocketConnectionStatus
-		var lastSentStatus SignalConnectionStatus
 		for {
 			select {
 			case <-ctx.Done():
@@ -172,10 +171,10 @@ func (cli *Client) StartReceiveLoops(ctx context.Context) (chan SignalConnection
 					Event: SignalConnectionCleanShutdown,
 				}
 			}
-			if statusToSend.Event != 0 && statusToSend.Event != lastSentStatus.Event {
+			if statusToSend.Event != 0 && statusToSend.Event != cli.lastConnectionStatus.Event {
 				log.Info().Any("status_to_send", statusToSend).Msg("Sending connection status")
 				statusChan <- statusToSend
-				lastSentStatus = statusToSend
+				cli.lastConnectionStatus = statusToSend
 			}
 		}
 	}()
@@ -220,6 +219,10 @@ func (cli *Client) StopReceiveLoops() error {
 	return nil
 }
 
+func (cli *Client) LastConnectionStatus() SignalConnectionStatus {
+	return cli.lastConnectionStatus
+}
+
 func (cli *Client) ClearKeysAndDisconnect(ctx context.Context) error {
 	// Essentially logout, clearing sessions and keys, and disconnecting websockets
 	// but don't clear ACI UUID or profile keys or contacts, or anything else that