go fmt all the code

common/search.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 )
 
-
 type Status uint8
 
 const (
@@ -109,7 +108,6 @@ func (c *Category) Parse(s string) (ok bool) {
 	return
 }
 
-
 // deprecated for TorrentParam
 type SearchParam struct {
 	Order    bool // True means acsending

common/torrent.go

@@ -32,4 +32,3 @@ func (p *TorrentParam) Clone() TorrentParam {
 		NameLike:  p.NameLike,
 	}
 }
-

config/config.go

@@ -33,7 +33,6 @@ func IsSukebei() bool {
 	return TorrentsTableName == "sukebei_torrents"
 }
 
-
 type Config struct {
 	Host   string `json:"host"`
 	Port   int    `json:"port"`

config/metainfo_fetcher.go

@@ -26,4 +26,3 @@ var DefaultMetainfoFetcherConfig = MetainfoFetcherConfig{
 	DownloadRateLimiter:  1024,
 	FetchNewTorrentsOnly: true, // Only fetch torrents newer than config.LastOldTorrentID
 }
-

config/user_settings.go

@@ -1,6 +1,5 @@
 package config
 
-
 /*
  * Here we config the notifications options
  * Uses in user model for default setting

model/dumps.go

@@ -1,8 +1,8 @@
 package model
 
 import (
-	"time"
 	"html/template"
+	"time"
 
 	"github.com/NyaaPantsu/nyaa/util"
 )

model/file.go

@@ -19,7 +19,7 @@ func (f File) TableName() string {
 
 // Returns the total size of memory allocated for this struct
 func (f File) Size() int {
-	return (2 + len(f.BencodedPath) + 1) * 8;
+	return (2 + len(f.BencodedPath) + 1) * 8
 }
 
 func (f *File) Path() (out []string) {
@@ -36,4 +36,3 @@ func (f *File) SetPath(path []string) error {
 	f.BencodedPath = encoded
 	return nil
 }
-

model/notification.go

@@ -21,4 +21,3 @@ func NewNotification(identifier string, c string, url string) Notification {
 func (n *Notification) TableName() string {
 	return config.NotificationTableName
 }
-

model/user.go

@@ -2,8 +2,8 @@ package model
 
 import (
 	"encoding/json"
-	"time"
 	"fmt"
+	"time"
 
 	"github.com/NyaaPantsu/nyaa/config"
 )
@@ -156,7 +156,7 @@ func (s *UserSettings) Initialize() {
 func (u *User) SaveSettings() {
 	byteArray, err := json.Marshal(u.Settings)
 
-	if (err != nil) {
+	if err != nil {
 		fmt.Print(err)
 	}
 	u.UserSettings = string(byteArray)

router/database_dump_handler.go

@@ -1,10 +1,10 @@
 package router
 
 import (
+	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
-	"net/http"
-	"fmt"
 	"time"
 
 	"github.com/NyaaPantsu/nyaa/model"
@@ -55,4 +55,3 @@ func DatabaseDumpHandler(w http.ResponseWriter, r *http.Request) {
 		log.Errorf("DatabaseDump(): %s", err)
 	}
 }
-

router/home_handler.go

@@ -31,7 +31,7 @@ func HomeHandler(w http.ResponseWriter, r *http.Request) {
 			maxPerPage = 50 // default Value maxPerPage
 		}
 	}
-	if (deleteVar != nil) {
+	if deleteVar != nil {
 		messages.AddInfoTf("infos", "torrent_deleted", "")
 	}
 	pagenum := 1

router/modpanel.go

@@ -341,8 +341,6 @@ func TorrentsPostListPanel(w http.ResponseWriter, r *http.Request) {
 	TorrentsListPanel(w, r)
 }
 
-
-
 /*
  * Controller to modify multiple torrents and can be used by the owner of the torrent or admin
  */

router/search_handler.go

@@ -32,7 +32,6 @@ func SearchHandler(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-
 	searchParam, torrents, nbTorrents, err := search.SearchByQuery(r, pagenum)
 	if err != nil {
 		util.SendError(w, err, 400)

router/template_functions.go

@@ -175,7 +175,7 @@ var FuncMap = template.FuncMap{
 		}
 	},
 	"fileSize": func(filesize int64, T languages.TemplateTfunc) template.HTML {
-        if (filesize == 0) {
+		if filesize == 0 {
 			return T("unknown")
 		}
 		return template.HTML(util.FormatFilesize(filesize))

router/template_variables.go

@@ -201,4 +201,3 @@ func NewCommonVariables(r *http.Request) CommonTemplateVariables {
 		Route:      mux.CurrentRoute(r),
 	}
 }
-

router/upload_handler.go

@@ -80,7 +80,7 @@ func UploadPostHandler(w http.ResponseWriter, r *http.Request) {
 
 		url, err := Router.Get("view_torrent").URL("id", strconv.FormatUint(uint64(torrent.ID), 10))
 
-		if (user.ID > 0 && config.DefaultUserSettings["new_torrent"]) { // If we are a member and notifications for new torrents are enabled
+		if user.ID > 0 && config.DefaultUserSettings["new_torrent"] { // If we are a member and notifications for new torrents are enabled
 			userService.GetLikings(user) // We populate the liked field for users
 			if len(user.Likings) > 0 {   // If we are followed by at least someone
 				for _, follower := range user.Likings {

router/user_handler.go

@@ -147,7 +147,6 @@ func UserProfileFormHandler(w http.ResponseWriter, r *http.Request) {
 	userForm := form.UserForm{}
 	userSettingsForm := form.UserSettingsForm{}
 
-
 	Ts, _ := languages.GetTfuncAndLanguageFromRequest(r)
 
 	if len(r.PostFormValue("email")) > 0 {

router/view_torrent_handler.go

@@ -210,7 +210,7 @@ func TorrentDeleteUserPanel(w http.ResponseWriter, r *http.Request) {
 	torrent, _ := torrentService.GetTorrentById(id)
 	if userPermission.CurrentOrAdmin(currentUser, torrent.UploaderID) {
 		_, err := torrentService.DeleteTorrent(id)
-		if (err == nil) {
+		if err == nil {
 			//delete reports of torrent
 			whereParams := serviceBase.CreateWhereParams("torrent_id = ?", id)
 			reports, _, _ := reportService.GetTorrentReportsOrderBy(&whereParams, "", 0, 0)

router/wrap_handler.go

@@ -30,7 +30,6 @@ func (wrw *wrappedResponseWriter) Header() http.Header {
 	return wrw.Rw.Header()
 }
 
-
 type wrappedHandler struct {
 	h http.Handler
 }
@@ -52,7 +51,7 @@ func wrapHandler(handler http.Handler) http.Handler {
 
 // Make sure the user is a moderator, otherwise return forbidden
 // TODO Clean this
-func WrapModHandler(handler func (w http.ResponseWriter, r *http.Request)) (func (w http.ResponseWriter, r *http.Request)) {
+func WrapModHandler(handler func(w http.ResponseWriter, r *http.Request)) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		currentUser := GetUser(r)
 		if userPermission.HasAdmin(currentUser) {

service/notifier/notifier.go

@@ -5,9 +5,8 @@ import (
 	"github.com/NyaaPantsu/nyaa/model"
 )
 
-
 func NotifyUser(user *model.User, name string, msg string, url string, email bool) {
-	if (user.ID > 0) {
+	if user.ID > 0 {
 		notification := model.NewNotification(name, msg, url)
 		notification.UserID = user.ID
 		db.ORM.Create(&notification)

util/markdown.go

@@ -31,6 +31,7 @@ var htmlFlags = 0 |
 func init() {
 	HtmlMdRenderer = md.HtmlRenderer(htmlFlags, "", "")
 }
+
 var HtmlMdRenderer md.Renderer
 
 // TODO: restrict certain types of markdown
@@ -44,7 +45,6 @@ func MarkdownToHTML(markdown string) template.HTML {
 	return template.HTML(html)
 }
 
-
 /*
  * Sanitize a message passed as a string according to a setted model or allowing a set of html tags and output a string
  */

util/messages/messages.go

@@ -1,10 +1,11 @@
 package Messages
+
 import (
-	"github.com/gorilla/context"
 	"fmt"
-	"net/http"
-	"github.com/nicksnyder/go-i18n/i18n"
 	"github.com/NyaaPantsu/nyaa/util/languages"
+	"github.com/gorilla/context"
+	"github.com/nicksnyder/go-i18n/i18n"
+	"net/http"
 )
 
 const MessagesKey = "messages"
@@ -31,7 +32,7 @@ func GetMessages(r *http.Request) *Messages {
 }
 
 func (mes *Messages) AddError(name string, msg string) {
-	if (mes.Errors == nil) {
+	if mes.Errors == nil {
 		mes.Errors = make(map[string][]string)
 	}
 	mes.Errors[name] = append(mes.Errors[name], msg)
@@ -51,7 +52,7 @@ func (mes *Messages) ImportFromError(name string, err error) {
 }
 
 func (mes *Messages) AddInfo(name string, msg string) {
-	if (mes.Infos == nil) {
+	if mes.Infos == nil {
 		mes.Infos = make(map[string][]string)
 	}
 	mes.Infos[name] = append(mes.Infos[name], msg)