summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-03-27 19:42:10 -0400
committerUnknown <joe2010xtmf@163.com>2014-03-27 19:42:10 -0400
commiteb6021f73f270b6fad937432964ab15f42e8f0d9 (patch)
tree4b6d560c60e41cfec3a20a9ecf6144c27a3353df /modules
parent34f4af9ebf179dbb24a7da6091b4259d66a3c426 (diff)
downloadgitea-eb6021f73f270b6fad937432964ab15f42e8f0d9.tar.gz
gitea-eb6021f73f270b6fad937432964ab15f42e8f0d9.zip
Fix issue pages URL params
Diffstat (limited to 'modules')
-rw-r--r--modules/avatar/avatar.go19
-rw-r--r--modules/base/tool.go17
2 files changed, 17 insertions, 19 deletions
diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go
index 06e2c1385b..edeb256ffe 100644
--- a/modules/avatar/avatar.go
+++ b/modules/avatar/avatar.go
@@ -47,6 +47,7 @@ func HashEmail(email string) string {
return hex.EncodeToString(h.Sum(nil))
}
+// Avatar represents the avatar object.
type Avatar struct {
Hash string
AlterImage string // image path
@@ -96,8 +97,8 @@ func (this *Avatar) Encode(wr io.Writer, size int) (err error) {
return
}
defer fd.Close()
- img, err = jpeg.Decode(fd)
- if err != nil {
+
+ if img, err = jpeg.Decode(fd); err != nil {
fd.Seek(0, os.SEEK_SET)
img, err = png.Decode(fd)
}
@@ -110,8 +111,8 @@ func (this *Avatar) Encode(wr io.Writer, size int) (err error) {
}
imgPath = this.AlterImage
}
- img, err = decodeImageFile(imgPath)
- if err != nil {
+
+ if img, err = decodeImageFile(imgPath); err != nil {
return
}
m := resize.Resize(uint(size), 0, img, resize.Lanczos3)
@@ -124,8 +125,7 @@ func (this *Avatar) Update() {
this.imagePath)
}
-func (this *Avatar) UpdateTimeout(timeout time.Duration) error {
- var err error
+func (this *Avatar) UpdateTimeout(timeout time.Duration) (err error) {
select {
case <-time.After(timeout):
err = fmt.Errorf("get gravatar image %s timeout", this.Hash)
@@ -140,8 +140,7 @@ type service struct {
altImage string
}
-func (this *service) mustInt(r *http.Request, defaultValue int, keys ...string) int {
- var v int
+func (this *service) mustInt(r *http.Request, defaultValue int, keys ...string) (v int) {
for _, k := range keys {
if _, err := fmt.Sscanf(r.FormValue(k), "%d", &v); err == nil {
defaultValue = v
@@ -176,8 +175,8 @@ func (this *service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.Header().Set("ETag", etag)
}
w.Header().Set("Content-Type", "image/jpeg")
- err := avatar.Encode(w, size)
- if err != nil {
+
+ if err := avatar.Encode(w, size); err != nil {
log.Warn("avatar encode error: %v", err)
w.WriteHeader(500)
}
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 6f4fbe8366..9ddb90f721 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -412,6 +412,11 @@ func (f StrTo) Int() (int, error) {
return int(v), err
}
+func (f StrTo) Int64() (int64, error) {
+ v, err := strconv.ParseInt(f.String(), 10, 64)
+ return int64(v), err
+}
+
func (f StrTo) String() string {
if f.Exist() {
return string(f)
@@ -541,16 +546,10 @@ func ActionDesc(act Actioner, avatarLink string) string {
}
func DiffTypeToStr(diffType int) string {
- switch diffType {
- case 1:
- return "add"
- case 2:
- return "modify"
- case 3:
- return "del"
- default:
- return "unknown"
+ diffTypes := map[int]string{
+ 1: "add", 2: "modify", 3: "del",
}
+ return diffTypes[diffType]
}
func DiffLineTypeToStr(diffType int) string {