From fd9ad05159c84ba804b126d2a959963d82578b22 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 29 Dec 2019 03:25:00 +0100 Subject: [PATCH 1/8] remove since it is there for 3years --- routers/routes/routes.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index c434c42263557..c8351f312bb3f 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -385,24 +385,6 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/keys/delete", userSetting.DeleteKey) m.Get("/organization", userSetting.Organization) m.Get("/repos", userSetting.Repos) - - // redirects from old settings urls to new ones - // TODO: can be removed on next major version - m.Get("/avatar", func(ctx *context.Context) { - ctx.Redirect(setting.AppSubURL+"/user/settings", http.StatusMovedPermanently) - }) - m.Get("/email", func(ctx *context.Context) { - ctx.Redirect(setting.AppSubURL+"/user/settings/account", http.StatusMovedPermanently) - }) - m.Get("/delete", func(ctx *context.Context) { - ctx.Redirect(setting.AppSubURL+"/user/settings/account", http.StatusMovedPermanently) - }) - m.Get("/openid", func(ctx *context.Context) { - ctx.Redirect(setting.AppSubURL+"/user/settings/security", http.StatusMovedPermanently) - }) - m.Get("/account_link", func(ctx *context.Context) { - ctx.Redirect(setting.AppSubURL+"/user/settings/security", http.StatusMovedPermanently) - }) }, reqSignIn, func(ctx *context.Context) { ctx.Data["PageIsUserSettings"] = true ctx.Data["AllThemes"] = setting.UI.Themes From 408b52263453d392849a5bdbed00c886e1338655 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 29 Dec 2019 03:34:45 +0100 Subject: [PATCH 2/8] fix 500 error for ghost avatar --- routers/user/avatar.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/routers/user/avatar.go b/routers/user/avatar.go index 20597c72ffa3b..8f4658905b359 100644 --- a/routers/user/avatar.go +++ b/routers/user/avatar.go @@ -6,6 +6,7 @@ package user import ( "strconv" + "strings" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" @@ -23,14 +24,19 @@ func Avatar(ctx *context.Context) { log.Debug("Asked avatar for user %v and size %v", userName, size) - user, err := models.GetUserByName(userName) - if err != nil { - if models.IsErrUserNotExist(err) { - ctx.ServerError("Requested avatar for invalid user", err) - } else { - ctx.ServerError("Retrieving user by name", err) + user := new(models.User) + if strings.ToLower(userName) != "ghost" { + user, err = models.GetUserByName(userName) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.ServerError("Requested avatar for invalid user", err) + } else { + ctx.ServerError("Retrieving user by name", err) + } + return } - return + } else { + user = models.NewGhostUser() } ctx.Redirect(user.RealSizedAvatarLink(size)) From 05469ab6d815a6cc6478a256018b9ed1a12749e0 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 29 Dec 2019 03:49:26 +0100 Subject: [PATCH 3/8] dont insert "-1" in any case to issue.poster_id --- models/issue.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/models/issue.go b/models/issue.go index 75f7bd818aa6e..b6f542f77117f 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1569,6 +1569,12 @@ func SearchIssueIDsByKeyword(kw string, repoIDs []int64, limit, start int) (int6 } func updateIssue(e Engine, issue *Issue) error { + if issue.PosterID <= 0 { + _, err := e.Table("`issue`").Where("id = ?", issue.ID).Select("poster_id").Get(&issue.PosterID) + if err != nil { + return err + } + } _, err := e.ID(issue.ID).AllCols().Update(issue) if err != nil { return err From 68a688927beb50a993075c31a4563f495be426fc Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 29 Dec 2019 04:13:43 +0100 Subject: [PATCH 4/8] fix lint --- routers/user/avatar.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/user/avatar.go b/routers/user/avatar.go index 8f4658905b359..045206c50afc3 100644 --- a/routers/user/avatar.go +++ b/routers/user/avatar.go @@ -24,7 +24,7 @@ func Avatar(ctx *context.Context) { log.Debug("Asked avatar for user %v and size %v", userName, size) - user := new(models.User) + var user *models.User if strings.ToLower(userName) != "ghost" { user, err = models.GetUserByName(userName) if err != nil { From 59345c19933e5bbb81970a83206be04925b2b657 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 29 Dec 2019 04:44:21 +0100 Subject: [PATCH 5/8] Test: ghost avatar link --- integrations/links_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/integrations/links_test.go b/integrations/links_test.go index 329e54528a7d4..8250215d026cb 100644 --- a/integrations/links_test.go +++ b/integrations/links_test.go @@ -35,6 +35,7 @@ func TestLinksNoLogin(t *testing.T) { "/api/v1/swagger", // TODO: follow this page and test every link "/vendor/librejs.html", + "/user/avatar/Ghost/-1", } for _, link := range links { From 8994ac778a98d22efe65e482bfde84562c895950 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 29 Dec 2019 04:50:00 +0100 Subject: [PATCH 6/8] fix test --- integrations/links_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/links_test.go b/integrations/links_test.go index 8250215d026cb..e69d9306edd83 100644 --- a/integrations/links_test.go +++ b/integrations/links_test.go @@ -35,7 +35,6 @@ func TestLinksNoLogin(t *testing.T) { "/api/v1/swagger", // TODO: follow this page and test every link "/vendor/librejs.html", - "/user/avatar/Ghost/-1", } for _, link := range links { @@ -52,6 +51,7 @@ func TestRedirectsNoLogin(t *testing.T) { "/user2/repo1/src/master": "/user2/repo1/src/branch/master", "/user2/repo1/src/master/file.txt": "/user2/repo1/src/branch/master/file.txt", "/user2/repo1/src/master/directory/file.txt": "/user2/repo1/src/branch/master/directory/file.txt", + "/user/avatar/Ghost/-1": "/img/avatar_default.png", } for link, redirectLink := range redirects { req := NewRequest(t, "GET", link) From 2e43607fea372196a895eafcc123f3d7eb586bf8 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 29 Dec 2019 12:01:08 +0100 Subject: [PATCH 7/8] Revert "remove since it is there for 3years" This reverts commit fd9ad05159c84ba804b126d2a959963d82578b22. --- routers/routes/routes.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index c8351f312bb3f..c434c42263557 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -385,6 +385,24 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/keys/delete", userSetting.DeleteKey) m.Get("/organization", userSetting.Organization) m.Get("/repos", userSetting.Repos) + + // redirects from old settings urls to new ones + // TODO: can be removed on next major version + m.Get("/avatar", func(ctx *context.Context) { + ctx.Redirect(setting.AppSubURL+"/user/settings", http.StatusMovedPermanently) + }) + m.Get("/email", func(ctx *context.Context) { + ctx.Redirect(setting.AppSubURL+"/user/settings/account", http.StatusMovedPermanently) + }) + m.Get("/delete", func(ctx *context.Context) { + ctx.Redirect(setting.AppSubURL+"/user/settings/account", http.StatusMovedPermanently) + }) + m.Get("/openid", func(ctx *context.Context) { + ctx.Redirect(setting.AppSubURL+"/user/settings/security", http.StatusMovedPermanently) + }) + m.Get("/account_link", func(ctx *context.Context) { + ctx.Redirect(setting.AppSubURL+"/user/settings/security", http.StatusMovedPermanently) + }) }, reqSignIn, func(ctx *context.Context) { ctx.Data["PageIsUserSettings"] = true ctx.Data["AllThemes"] = setting.UI.Themes From 881354127f82114abaf597130c1d0c9996b18468 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 29 Dec 2019 12:04:44 +0100 Subject: [PATCH 8/8] Revert "dont insert "-1" in any case to issue.poster_id" This reverts commit 05469ab6d815a6cc6478a256018b9ed1a12749e0. --- models/issue.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/models/issue.go b/models/issue.go index b6f542f77117f..75f7bd818aa6e 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1569,12 +1569,6 @@ func SearchIssueIDsByKeyword(kw string, repoIDs []int64, limit, start int) (int6 } func updateIssue(e Engine, issue *Issue) error { - if issue.PosterID <= 0 { - _, err := e.Table("`issue`").Where("id = ?", issue.ID).Select("poster_id").Get(&issue.PosterID) - if err != nil { - return err - } - } _, err := e.ID(issue.ID).AllCols().Update(issue) if err != nil { return err