diff options
Diffstat (limited to 'internal/api/client/media')
| -rw-r--r-- | internal/api/client/media/media.go | 5 | ||||
| -rw-r--r-- | internal/api/client/media/mediacreate.go | 3 | ||||
| -rw-r--r-- | internal/api/client/media/mediacreate_test.go | 5 | ||||
| -rw-r--r-- | internal/api/client/media/mediaget.go | 3 | ||||
| -rw-r--r-- | internal/api/client/media/mediaupdate.go | 3 | 
5 files changed, 9 insertions, 10 deletions
diff --git a/internal/api/client/media/media.go b/internal/api/client/media/media.go index 1e9e8fdaa..a051dea48 100644 --- a/internal/api/client/media/media.go +++ b/internal/api/client/media/media.go @@ -21,7 +21,6 @@ package media  import (  	"net/http" -	"github.com/sirupsen/logrus"  	"github.com/superseriousbusiness/gotosocial/internal/api"  	"github.com/superseriousbusiness/gotosocial/internal/config"  	"github.com/superseriousbusiness/gotosocial/internal/processing" @@ -41,15 +40,13 @@ const BasePathWithID = BasePath + "/:" + IDKey  type Module struct {  	config    *config.Config  	processor processing.Processor -	log       *logrus.Logger  }  // New returns a new auth module -func New(config *config.Config, processor processing.Processor, log *logrus.Logger) api.ClientModule { +func New(config *config.Config, processor processing.Processor) api.ClientModule {  	return &Module{  		config:    config,  		processor: processor, -		log:       log,  	}  } diff --git a/internal/api/client/media/mediacreate.go b/internal/api/client/media/mediacreate.go index 68b25039c..5b7a2dea7 100644 --- a/internal/api/client/media/mediacreate.go +++ b/internal/api/client/media/mediacreate.go @@ -21,6 +21,7 @@ package media  import (  	"errors"  	"fmt" +	"github.com/sirupsen/logrus"  	"net/http"  	"github.com/gin-gonic/gin" @@ -82,7 +83,7 @@ import (  //   '422':  //      description: unprocessable  func (m *Module) MediaCreatePOSTHandler(c *gin.Context) { -	l := m.log.WithField("func", "statusCreatePOSTHandler") +	l := logrus.WithField("func", "statusCreatePOSTHandler")  	authed, err := oauth.Authed(c, true, true, true, true) // posting new media is serious business so we want *everything*  	if err != nil {  		l.Debugf("couldn't auth: %s", err) diff --git a/internal/api/client/media/mediacreate_test.go b/internal/api/client/media/mediacreate_test.go index 9ba059841..1ee58e798 100644 --- a/internal/api/client/media/mediacreate_test.go +++ b/internal/api/client/media/mediacreate_test.go @@ -51,7 +51,6 @@ type MediaCreateTestSuite struct {  	suite.Suite  	config       *config.Config  	db           db.DB -	log          *logrus.Logger  	storage      *kv.KVStore  	federator    federation.Federator  	tc           typeutils.TypeConverter @@ -79,7 +78,7 @@ func (suite *MediaCreateTestSuite) SetupSuite() {  	// setup standard items  	suite.config = testrig.NewTestConfig()  	suite.db = testrig.NewTestDB() -	suite.log = testrig.NewTestLog() +	testrig.InitTestLog()  	suite.storage = testrig.NewTestStorage()  	suite.tc = testrig.NewTestTypeConverter(suite.db)  	suite.mediaHandler = testrig.NewTestMediaHandler(suite.db, suite.storage) @@ -88,7 +87,7 @@ func (suite *MediaCreateTestSuite) SetupSuite() {  	suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator)  	// setup module being tested -	suite.mediaModule = mediamodule.New(suite.config, suite.processor, suite.log).(*mediamodule.Module) +	suite.mediaModule = mediamodule.New(suite.config, suite.processor).(*mediamodule.Module)  }  func (suite *MediaCreateTestSuite) TearDownSuite() { diff --git a/internal/api/client/media/mediaget.go b/internal/api/client/media/mediaget.go index 5fd7856e9..0ddccc4e4 100644 --- a/internal/api/client/media/mediaget.go +++ b/internal/api/client/media/mediaget.go @@ -19,6 +19,7 @@  package media  import ( +	"github.com/sirupsen/logrus"  	"net/http"  	"github.com/gin-gonic/gin" @@ -61,7 +62,7 @@ import (  //   '422':  //      description: unprocessable  func (m *Module) MediaGETHandler(c *gin.Context) { -	l := m.log.WithField("func", "MediaGETHandler") +	l := logrus.WithField("func", "MediaGETHandler")  	authed, err := oauth.Authed(c, true, true, true, true)  	if err != nil {  		l.Debugf("couldn't auth: %s", err) diff --git a/internal/api/client/media/mediaupdate.go b/internal/api/client/media/mediaupdate.go index 3af19297f..2a6d056bb 100644 --- a/internal/api/client/media/mediaupdate.go +++ b/internal/api/client/media/mediaupdate.go @@ -21,6 +21,7 @@ package media  import (  	"errors"  	"fmt" +	"github.com/sirupsen/logrus"  	"net/http"  	"github.com/gin-gonic/gin" @@ -91,7 +92,7 @@ import (  //   '422':  //      description: unprocessable  func (m *Module) MediaPUTHandler(c *gin.Context) { -	l := m.log.WithField("func", "MediaGETHandler") +	l := logrus.WithField("func", "MediaGETHandler")  	authed, err := oauth.Authed(c, true, true, true, true)  	if err != nil {  		l.Debugf("couldn't auth: %s", err)  | 
