double the number of cached noavatars

common/site.go

@@ -268,9 +268,9 @@ func ProcessConfig() (err error) {
 	}
 
 	if !Config.DisableDefaultNoavatar {
-		noavatarCache200 = make([]string, 5)
+		noavatarCache200 = make([]string, 10)
-		noavatarCache48 = make([]string, 5)
+		noavatarCache48 = make([]string, 10)
-		for i := 0; i < 5; i++ {
+		for i := 0; i < 11; i++ {
 			noavatarCache200[i] = StaticFiles.Prefix + "n" + strconv.Itoa(i) + "-" + strconv.Itoa(200) + ".png?i=0"
 			noavatarCache48[i] = StaticFiles.Prefix + "n" + strconv.Itoa(i) + "-" + strconv.Itoa(48) + ".png?i=0"
 		}

common/user.go

@@ -235,8 +235,8 @@ func (u *User) CacheRemove() {
 	TopicListThaw.Thaw()
 }
 
-func (u *User) Ban(duration time.Duration, issuedBy int) error {
+func (u *User) Ban(dur time.Duration, issuedBy int) error {
-	return u.ScheduleGroupUpdate(BanGroup, issuedBy, duration)
+	return u.ScheduleGroupUpdate(BanGroup, issuedBy, dur)
 }
 
 func (u *User) Unban() error {
@@ -244,30 +244,30 @@ func (u *User) Unban() error {
 }
 
 func (u *User) deleteScheduleGroupTx(tx *sql.Tx) error {
-	deleteScheduleGroupStmt, err := qgen.Builder.SimpleDeleteTx(tx, "users_groups_scheduler", "uid=?")
+	deleteScheduleGroupStmt, e := qgen.Builder.SimpleDeleteTx(tx, "users_groups_scheduler", "uid=?")
-	if err != nil {
+	if e != nil {
-		return err
+		return e
 	}
-	_, err = deleteScheduleGroupStmt.Exec(u.ID)
+	_, e = deleteScheduleGroupStmt.Exec(u.ID)
-	return err
+	return e
 }
 
 func (u *User) setTempGroupTx(tx *sql.Tx, tempGroup int) error {
-	setTempGroupStmt, err := qgen.Builder.SimpleUpdateTx(tx, "users", "temp_group=?", "uid=?")
+	setTempGroupStmt, e := qgen.Builder.SimpleUpdateTx(tx, "users", "temp_group=?", "uid=?")
-	if err != nil {
+	if e != nil {
-		return err
+		return e
 	}
-	_, err = setTempGroupStmt.Exec(tempGroup, u.ID)
+	_, e = setTempGroupStmt.Exec(tempGroup, u.ID)
-	return err
+	return e
 }
 
 // Make this more stateless?
-func (u *User) ScheduleGroupUpdate(gid, issuedBy int, duration time.Duration) error {
+func (u *User) ScheduleGroupUpdate(gid, issuedBy int, dur time.Duration) error {
 	var temp bool
-	if duration.Nanoseconds() != 0 {
+	if dur.Nanoseconds() != 0 {
 		temp = true
 	}
-	revertAt := time.Now().Add(duration)
+	revertAt := time.Now().Add(dur)
 
 	tx, err := qgen.Builder.Begin()
 	if err != nil {
@@ -300,46 +300,46 @@ func (u *User) ScheduleGroupUpdate(gid, issuedBy int, duration time.Duration) er
 }
 
 func (u *User) RevertGroupUpdate() error {
-	tx, err := qgen.Builder.Begin()
+	tx, e := qgen.Builder.Begin()
-	if err != nil {
+	if e != nil {
-		return err
+		return e
 	}
 	defer tx.Rollback()
 
-	err = u.deleteScheduleGroupTx(tx)
+	e = u.deleteScheduleGroupTx(tx)
-	if err != nil {
+	if e != nil {
-		return err
+		return e
 	}
 
-	err = u.setTempGroupTx(tx, 0)
+	e = u.setTempGroupTx(tx, 0)
-	if err != nil {
+	if e != nil {
-		return err
+		return e
 	}
-	err = tx.Commit()
+	e = tx.Commit()
 
 	u.CacheRemove()
-	return err
+	return e
 }
 
 // TODO: Use a transaction here
 // ? - Add a Deactivate method? Not really needed, if someone's been bad you could do a ban, I guess it might be useful, if someone says that email x isn't actually owned by the user in question?
-func (u *User) Activate() (err error) {
+func (u *User) Activate() (e error) {
-	_, err = userStmts.activate.Exec(u.ID)
+	_, e = userStmts.activate.Exec(u.ID)
-	if err != nil {
+	if e != nil {
-		return err
+		return e
 	}
-	_, err = userStmts.changeGroup.Exec(Config.DefaultGroup, u.ID)
+	_, e = userStmts.changeGroup.Exec(Config.DefaultGroup, u.ID)
 	u.CacheRemove()
-	return err
+	return e
 }
 
 // TODO: Write tests for this
 // TODO: Delete this user's content too?
 // TODO: Expose this to the admin?
 func (u *User) Delete() error {
-	_, err := userStmts.delete.Exec(u.ID)
+	_, e := userStmts.delete.Exec(u.ID)
-	if err != nil {
+	if e != nil {
-		return err
+		return e
 	}
 	u.CacheRemove()
 	return nil
@@ -514,18 +514,18 @@ func (u *User) DeletePosts() error {
 	return rows.Err()
 }
 
-func (u *User) bindStmt(stmt *sql.Stmt, params ...interface{}) (err error) {
+func (u *User) bindStmt(stmt *sql.Stmt, params ...interface{}) (e error) {
 	params = append(params, u.ID)
-	_, err = stmt.Exec(params...)
+	_, e = stmt.Exec(params...)
 	u.CacheRemove()
-	return err
+	return e
 }
 
-func (u *User) ChangeName(name string) (err error) {
+func (u *User) ChangeName(name string) error {
 	return u.bindStmt(userStmts.setName, name)
 }
 
-func (u *User) ChangeAvatar(avatar string) (err error) {
+func (u *User) ChangeAvatar(avatar string) error {
 	return u.bindStmt(userStmts.setAvatar, avatar)
 }
 
@@ -546,7 +546,7 @@ func (u *User) ScheduleAvatarResize() (err error) {
 	return nil
 }
 
-func (u *User) ChangeGroup(group int) (err error) {
+func (u *User) ChangeGroup(group int) error {
 	return u.bindStmt(userStmts.changeGroup, group)
 }
 
@@ -623,9 +623,9 @@ func (u *User) IncreasePostStats(wcount int, topic bool) (err error) {
 }
 
 func (u *User) countf(stmt *sql.Stmt) (count int) {
-	err := stmt.QueryRow().Scan(&count)
+	e := stmt.QueryRow().Scan(&count)
-	if err != nil {
+	if e != nil {
-		LogError(err)
+		LogError(e)
 	}
 	return count
 }
@@ -684,8 +684,8 @@ func (u *User) DecreasePostStats(wcount int, topic bool) (err error) {
 	return err
 }
 
-func (u *User) ResetPostStats() (err error) {
+func (u *User) ResetPostStats() error {
-	_, err = userStmts.resetStats.Exec(u.ID)
+	_, err := userStmts.resetStats.Exec(u.ID)
 	u.CacheRemove()
 	return err
 }
@@ -805,10 +805,10 @@ func BuildAvatar(uid int, avatar string) (normalAvatar, microAvatar string) {
 	}
 	if avatar[0] == '.' {
 		if avatar[1] == '.' {
-			normalAvatar = Config.AvatarResBase+"avatar_" + strconv.Itoa(uid) + "_tmp" + avatar[1:]
+			normalAvatar = Config.AvatarResBase + "avatar_" + strconv.Itoa(uid) + "_tmp" + avatar[1:]
 			return normalAvatar, normalAvatar
 		}
-		normalAvatar = Config.AvatarResBase+"avatar_" + strconv.Itoa(uid) + avatar
+		normalAvatar = Config.AvatarResBase + "avatar_" + strconv.Itoa(uid) + avatar
 		return normalAvatar, normalAvatar
 	}
 	return avatar, avatar

updater/main.go

@@ -16,8 +16,7 @@ func main() {
 
 	// Capture panics instead of closing the window at a superhuman speed before the user can read the message on Windows
 	defer func() {
-		r := recover()
+		if r := recover(); r != nil {
-		if r != nil {
 			fmt.Println(r)
 			debug.PrintStack()
 			pressAnyKey(scanner)