ami/tl-vikunja
1
0
Fork 0
Code Activity

chore(web): remove unused echo context

Browse Source 
(cherry picked from commit 329de3aab3cf0f15759ef1e20e865d3ad801d56e)
This commit is contained in:
kolaente
2024-08-29 16:20:39 +02:00
parent be8ecb6d36
commit 198b2e3b70
29 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/modules/background/handler/background.go
View File

@ -129,7 +129,7 @@ func (bp *BackgroundProvider) SetBackground(c echo.Context) error {
project, auth, err := bp.setBackgroundPreparations(s, c)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
p := bp.Provider()
@ -144,13 +144,13 @@ func (bp *BackgroundProvider) SetBackground(c echo.Context) error {
err = p.Set(s, image, project, auth)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
err = project.ReadOne(s, auth)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
return c.JSON(http.StatusOK, project)
@ -176,7 +176,7 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
project, auth, err := bp.setBackgroundPreparations(s, c)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Get + upload the image
@ -196,7 +196,7 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
mime, err := mimetype.DetectReader(srcf)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
if !strings.HasPrefix(mime.String(), "image") {
_ = s.Rollback()
@ -210,18 +210,18 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
return echo.ErrBadRequest
}
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
err = project.ReadOne(s, auth)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
if err := s.Commit(); err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
return c.JSON(http.StatusOK, project)
@ -287,7 +287,7 @@ func checkProjectBackgroundRights(s *xorm.Session, c echo.Context) (project *mod
can, _, err := project.CanRead(s, auth)
if err != nil {
_ = s.Rollback()
return nil, auth, handler.HandleHTTPError(err, c)
return nil, auth, handler.HandleHTTPError(err)
}
if !can {
_ = s.Rollback()
@ -332,12 +332,12 @@ func GetProjectBackground(c echo.Context) error {
}
if err := bgFile.LoadFileByID(); err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
stat, err := bgFile.File.Stat()
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Unsplash requires pingbacks as per their api usage guidelines.
@ -347,7 +347,7 @@ func GetProjectBackground(c echo.Context) error {
if err := s.Commit(); err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Set Last-Modified header if we have the file stat, so clients can decide whether to use cached files

4
pkg/modules/background/unsplash/proxy.go
View File

@ -56,7 +56,7 @@ func unsplashImage(url string, c echo.Context) error {
func ProxyUnsplashImage(c echo.Context) error {
photo, err := getUnsplashPhotoInfoByID(c.Param("image"))
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
pingbackByPhotoID(photo.ID)
return unsplashImage(photo.Urls.Raw, c)
@ -76,7 +76,7 @@ func ProxyUnsplashImage(c echo.Context) error {
func ProxyUnsplashThumb(c echo.Context) error {
photo, err := getUnsplashPhotoInfoByID(c.Param("image"))
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
pingbackByPhotoID(photo.ID)
return unsplashImage("https://images.unsplash.com/"+getImageID(photo.Urls.Raw)+"?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjcyODAwfQ", c)