fucking typo (#251)

* Update torrent.go

* another typo yay!!!

* typo

router/modpanel.go

@@ -3,22 +3,23 @@
 package router
 
 import (
-	"net/http"
-	"strconv"
 	"html/template"
+	"net/http"
 	"path/filepath"
+	"strconv"
 
 	"github.com/ewhal/nyaa/service/comment"
-	"github.com/ewhal/nyaa/service/user"
-	"github.com/ewhal/nyaa/service/user/permission"
-	form "github.com/ewhal/nyaa/service/user/form"
 	"github.com/ewhal/nyaa/service/torrent"
 	"github.com/ewhal/nyaa/service/torrent/form"
+	"github.com/ewhal/nyaa/service/user"
+	form "github.com/ewhal/nyaa/service/user/form"
+	"github.com/ewhal/nyaa/service/user/permission"
 	"github.com/ewhal/nyaa/util/languages"
 	"github.com/ewhal/nyaa/util/modelHelper"
 )
 
 var panelIndex, panelTorrentList, panelUserList, panelCommentList, panelTorrentEd *template.Template
+
 func init() {
 	panelTorrentList = template.Must(template.New("torrentlist").Funcs(FuncMap).ParseFiles(filepath.Join(TemplateDir, "admin_index.html"), filepath.Join(TemplateDir, "admin/torrentlist.html")))
 	panelUserList = template.Must(template.New("userlist").Funcs(FuncMap).ParseFiles(filepath.Join(TemplateDir, "admin_index.html"), filepath.Join(TemplateDir, "admin/userlist.html")))
@@ -29,7 +30,7 @@ func init() {
 
 func IndexModPanel(w http.ResponseWriter, r *http.Request) {
 	currentUser := GetUser(r)
-	if (userPermission.HasAdmin(currentUser)) {
+	if userPermission.HasAdmin(currentUser) {
 		offset := 10
 
 		torrents, _, _ := torrentService.GetAllTorrents(0, offset)
@@ -43,7 +44,7 @@ func IndexModPanel(w http.ResponseWriter, r *http.Request) {
 }
 func TorrentsListPanel(w http.ResponseWriter, r *http.Request) {
 	currentUser := GetUser(r)
-	if (userPermission.HasAdmin(currentUser)) {
+	if userPermission.HasAdmin(currentUser) {
 		page, _ := strconv.Atoi(r.URL.Query().Get("p"))
 		offset := 100
 
@@ -55,7 +56,7 @@ func TorrentsListPanel(w http.ResponseWriter, r *http.Request) {
 }
 func UsersListPanel(w http.ResponseWriter, r *http.Request) {
 	currentUser := GetUser(r)
-	if (userPermission.HasAdmin(currentUser)) {
+	if userPermission.HasAdmin(currentUser) {
 		page, _ := strconv.Atoi(r.URL.Query().Get("p"))
 		offset := 100
 
@@ -67,7 +68,7 @@ func UsersListPanel(w http.ResponseWriter, r *http.Request) {
 }
 func CommentsListPanel(w http.ResponseWriter, r *http.Request) {
 	currentUser := GetUser(r)
-	if (userPermission.HasAdmin(currentUser)) {
+	if userPermission.HasAdmin(currentUser) {
 		page, _ := strconv.Atoi(r.URL.Query().Get("p"))
 		offset := 100
 
@@ -80,7 +81,7 @@ func CommentsListPanel(w http.ResponseWriter, r *http.Request) {
 }
 func TorrentEditModPanel(w http.ResponseWriter, r *http.Request) {
 	currentUser := GetUser(r)
-	if (userPermission.HasAdmin(currentUser)) {
+	if userPermission.HasAdmin(currentUser) {
 		id := r.URL.Query().Get("id")
 		torrent, _ := torrentService.GetTorrentById(id)
 		languages.SetTranslationFromRequest(panelTorrentEd, r, "en-us")
@@ -91,7 +92,7 @@ func TorrentEditModPanel(w http.ResponseWriter, r *http.Request) {
 }
 func TorrentPostEditModPanel(w http.ResponseWriter, r *http.Request) {
 	currentUser := GetUser(r)
-	if (userPermission.HasAdmin(currentUser)) {
+	if userPermission.HasAdmin(currentUser) {
 		b := torrentform.PanelPost{}
 		err := form.NewErrors()
 		infos := form.NewInfos()
@@ -99,14 +100,14 @@ func TorrentPostEditModPanel(w http.ResponseWriter, r *http.Request) {
 		err = modelHelper.ValidateForm(&b, err)
 		id := r.URL.Query().Get("id")
 		torrent, _ := torrentService.GetTorrentById(id)
-	if (torrent.Id > 0) {
+		if torrent.ID > 0 {
 			modelHelper.AssignValue(&torrent, &b)
-		if (len(err) == 0) {
+			if len(err) == 0 {
 				_, errorT := torrentService.UpdateTorrent(torrent)
-			if (errorT != nil) {
+				if errorT != nil {
 					err["errors"] = append(err["errors"], errorT.Error())
 				}
-			if (len(err) == 0) {
+				if len(err) == 0 {
 					infos["infos"] = append(infos["infos"], "torrent_updated")
 				}
 			}
@@ -121,7 +122,7 @@ func CommentDeleteModPanel(w http.ResponseWriter, r *http.Request) {
 	currentUser := GetUser(r)
 	id := r.URL.Query().Get("id")
 
-	if (userPermission.HasAdmin(currentUser)) {
+	if userPermission.HasAdmin(currentUser) {
 		_ = form.NewErrors()
 		_, _ = userService.DeleteComment(id)
 		url, _ := Router.Get("mod_comment_list").URL()
@@ -131,7 +132,7 @@ func CommentDeleteModPanel(w http.ResponseWriter, r *http.Request) {
 func TorrentDeleteModPanel(w http.ResponseWriter, r *http.Request) {
 	currentUser := GetUser(r)
 	id := r.URL.Query().Get("id")
-	if (userPermission.HasAdmin(currentUser)) {
+	if userPermission.HasAdmin(currentUser) {
 		_ = form.NewErrors()
 		_, _ = torrentService.DeleteTorrent(id)
 		url, _ := Router.Get("mod_torrent_list").URL()

router/templateVariables.go

@@ -114,13 +114,13 @@ type UploadTemplateVariables struct {
 }
 
 type PanelIndexVbs struct {
-	Torrents  []model.Torrents
+	Torrents  []model.Torrent
 	Users  []model.User
 	Comments  []model.Comment
 }
 
 type PanelTorrentListVbs struct {
-	Torrents  []model.Torrents
+	Torrents  []model.Torrent
 }
 type PanelUserListVbs struct {
 	Users  []model.User
@@ -129,7 +129,7 @@ type PanelCommentListVbs struct {
 	Comments  []model.Comment
 }
 type PanelTorrentEdVbs struct {
-	Torrent  model.Torrents
+	Torrent  model.Torrent
 }
 
 /*

service/torrent/torrent.go

@@ -174,7 +174,7 @@ func CreateWhereParams(conditions string, params ...string) WhereParams {
 }
 
 func DeleteTorrent(id string) (int, error) {
-	var torrent model.Torrents
+	var torrent model.Torrent
 	if db.ORM.First(&torrent, id).RecordNotFound() {
 		return http.StatusNotFound, errors.New("Torrent is not found.")
 	}
@@ -184,7 +184,7 @@ func DeleteTorrent(id string) (int, error) {
 	return http.StatusOK, nil
 }
 
-func UpdateTorrent(torrent model.Torrents) (int, error) {
+func UpdateTorrent(torrent model.Torrent) (int, error) {
 	if db.ORM.Save(torrent).Error != nil {
 		return http.StatusInternalServerError, errors.New("Torrent is not updated.")
 	}