streaming working

internal/processing/synchronous/streaming/streamstatus.go

@@ -1,14 +1,16 @@
 package streaming
 
 import (
+	"encoding/json"
 	"errors"
+	"fmt"
 
 	"github.com/sirupsen/logrus"
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 )
 
-func (p *processor) StreamStatusForAccount(s *apimodel.Status, account *gtsmodel.Account) error {
+func (p *processor) StreamStatusToAccount(s *apimodel.Status, account *gtsmodel.Account) error {
 	l := p.log.WithFields(logrus.Fields{
 		"func":    "StreamStatusForAccount",
 		"account": account.ID,
@@ -19,17 +21,28 @@ func (p *processor) StreamStatusForAccount(s *apimodel.Status, account *gtsmodel
 		return nil
 	}
 
-	streams, ok := v.(*streamsForAccount)
+	streamsForAccount, ok := v.(*gtsmodel.StreamsForAccount)
 	if !ok {
 		return errors.New("stream map error")
 	}
 
-	streams.Lock()
-	defer streams.Unlock()
-	for _, stream := range streams.s {
-		l.Debugf("streaming status to stream id %s", stream.streamID)
-		if err := stream.conn.WriteJSON(s); err != nil {
-			return err
+	statusBytes, err := json.Marshal(s)
+	if err != nil {
+		return fmt.Errorf("error marshalling status to json: %s", err)
+	}
+
+	streamsForAccount.Lock()
+	defer streamsForAccount.Unlock()
+	for _, stream := range streamsForAccount.Streams {
+		stream.Lock()
+		defer stream.Unlock()
+		if stream.Connected {
+			l.Debugf("streaming status to stream id %s", stream.ID)
+			stream.Messages <- &gtsmodel.Message{
+				Stream:  []string{stream.Type},
+				Event:   "update",
+				Payload: string(statusBytes),
+			}
 		}
 	}