add emoji + tags

internal/distributor/distributor.go

@@ -21,6 +21,7 @@ package distributor
 import (
 	"github.com/go-fed/activity/pub"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/gotosocial/internal/db/model"
 )
 
 // Distributor should be passed to api modules (see internal/apimodule/...). It is used for
@@ -30,10 +31,10 @@ import (
 // fire messages into the distributor and not wait for a reply before proceeding with other work. This allows
 // for clean distribution of messages without slowing down the client API and harming the user experience.
 type Distributor interface {
-	// ClientAPIIn returns a channel for accepting messages that come from the gts client API.
-	ClientAPIIn() chan interface{}
+	// FromClientAPI returns a channel for accepting messages that come from the gts client API.
+	FromClientAPI() chan FromClientAPI
 	// ClientAPIOut returns a channel for putting in messages that need to go to the gts client API.
-	ClientAPIOut() chan interface{}
+	ToClientAPI() chan ToClientAPI
 	// Start starts the Distributor, reading from its channels and passing messages back and forth.
 	Start() error
 	// Stop stops the distributor cleanly, finishing handling any remaining messages before closing down.
@@ -42,32 +43,32 @@ type Distributor interface {
 
 // distributor just implements the Distributor interface
 type distributor struct {
-	federator    pub.FederatingActor
-	clientAPIIn  chan interface{}
-	clientAPIOut chan interface{}
-	stop         chan interface{}
-	log          *logrus.Logger
+	federator     pub.FederatingActor
+	fromClientAPI chan FromClientAPI
+	toClientAPI   chan ToClientAPI
+	stop          chan interface{}
+	log           *logrus.Logger
 }
 
 // New returns a new Distributor that uses the given federator and logger
 func New(federator pub.FederatingActor, log *logrus.Logger) Distributor {
 	return &distributor{
-		federator:    federator,
-		clientAPIIn:  make(chan interface{}, 100),
-		clientAPIOut: make(chan interface{}, 100),
-		stop:         make(chan interface{}),
-		log:          log,
+		federator:     federator,
+		fromClientAPI: make(chan FromClientAPI, 100),
+		toClientAPI:   make(chan ToClientAPI, 100),
+		stop:          make(chan interface{}),
+		log:           log,
 	}
 }
 
 // ClientAPIIn returns a channel for accepting messages that come from the gts client API.
-func (d *distributor) ClientAPIIn() chan interface{} {
-	return d.clientAPIIn
+func (d *distributor) FromClientAPI() chan FromClientAPI {
+	return d.fromClientAPI
 }
 
 // ClientAPIOut returns a channel for putting in messages that need to go to the gts client API.
-func (d *distributor) ClientAPIOut() chan interface{} {
-	return d.clientAPIOut
+func (d *distributor) ToClientAPI() chan ToClientAPI {
+	return d.toClientAPI
 }
 
 // Start starts the Distributor, reading from its channels and passing messages back and forth.
@@ -76,10 +77,10 @@ func (d *distributor) Start() error {
 	DistLoop:
 		for {
 			select {
-			case clientMsgIn := <-d.clientAPIIn:
-				d.log.Infof("received clientMsgIn: %+v", clientMsgIn)
-			case clientMsgOut := <-d.clientAPIOut:
-				d.log.Infof("received clientMsgOut: %+v", clientMsgOut)
+			case clientMsg := <-d.fromClientAPI:
+				d.log.Infof("received message FROM client API: %+v", clientMsg)
+			case clientMsg := <-d.toClientAPI:
+				d.log.Infof("received message TO client API: %+v", clientMsg)
 			case <-d.stop:
 				break DistLoop
 			}
@@ -94,3 +95,15 @@ func (d *distributor) Stop() error {
 	close(d.stop)
 	return nil
 }
+
+type FromClientAPI struct {
+	APObjectType   model.ActivityStreamsObject
+	APActivityType model.ActivityStreamsActivity
+	Activity       interface{}
+}
+
+type ToClientAPI struct {
+	APObjectType   model.ActivityStreamsObject
+	APActivityType model.ActivityStreamsActivity
+	Activity       interface{}
+}