From ac74066f0e4f3d62f2d4645c3fa34b88c13958d1 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 19 Sep 2017 18:31:35 -0500 Subject: remove einterface gets (#7455) --- app/brand.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'app/brand.go') diff --git a/app/brand.go b/app/brand.go index dab69abd8..b108a7b32 100644 --- a/app/brand.go +++ b/app/brand.go @@ -7,39 +7,36 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/einterfaces" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) -func SaveBrandImage(imageData *multipart.FileHeader) *model.AppError { +func (a *App) SaveBrandImage(imageData *multipart.FileHeader) *model.AppError { if len(*utils.Cfg.FileSettings.DriverName) == 0 { return model.NewAppError("SaveBrandImage", "api.admin.upload_brand_image.storage.app_error", nil, "", http.StatusNotImplemented) } - brandInterface := einterfaces.GetBrandInterface() - if brandInterface == nil { + if a.Brand == nil { return model.NewAppError("SaveBrandImage", "api.admin.upload_brand_image.not_available.app_error", nil, "", http.StatusNotImplemented) } - if err := brandInterface.SaveBrandImage(imageData); err != nil { + if err := a.Brand.SaveBrandImage(imageData); err != nil { return err } return nil } -func GetBrandImage() ([]byte, *model.AppError) { +func (a *App) GetBrandImage() ([]byte, *model.AppError) { if len(*utils.Cfg.FileSettings.DriverName) == 0 { return nil, model.NewAppError("GetBrandImage", "api.admin.get_brand_image.storage.app_error", nil, "", http.StatusNotImplemented) } - brandInterface := einterfaces.GetBrandInterface() - if brandInterface == nil { + if a.Brand == nil { return nil, model.NewAppError("GetBrandImage", "api.admin.get_brand_image.not_available.app_error", nil, "", http.StatusNotImplemented) } - if img, err := brandInterface.GetBrandImage(); err != nil { + if img, err := a.Brand.GetBrandImage(); err != nil { return nil, err } else { return img, nil -- cgit v1.2.3-1-g7c22