Add website link and remake flag to api (#797)

router/api_handler.go

@@ -3,13 +3,14 @@ package router
 import (
 	"encoding/json"
 	"fmt"
-	elastic "gopkg.in/olivere/elastic.v5"
 	"html"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
 
+	elastic "gopkg.in/olivere/elastic.v5"
+
 	"github.com/NyaaPantsu/nyaa/config"
 	"github.com/NyaaPantsu/nyaa/db"
 	"github.com/NyaaPantsu/nyaa/model"
@@ -172,6 +173,8 @@ func APIUploadHandler(w http.ResponseWriter, r *http.Request) {
 		upload.Category, _ = strconv.Atoi(r.FormValue("category"))
 		upload.SubCategory, _ = strconv.Atoi(r.FormValue("sub_category"))
 		upload.Description = r.FormValue("description")
+		upload.Remake, _ = strconv.ParseBool(r.FormValue("remake"))
+		upload.WebsiteLink = r.FormValue("website_link")
 
 		var err error
 		var code int
@@ -197,14 +200,22 @@ func APIUploadHandler(w http.ResponseWriter, r *http.Request) {
 			Name:        upload.Name,
 			Category:    upload.Category,
 			SubCategory: upload.SubCategory,
-			Status:      1,
+			Status:      model.TorrentStatusNormal,
 			Hash:        upload.Hash,
 			Date:        time.Now(),
 			Filesize:    filesize,
 			Description: upload.Description,
 			UploaderID:  user.ID,
 			Uploader:    &user,
+			WebsiteLink: upload.WebsiteLink,
 		}
+
+		if upload.Remake {
+			torrent.Status = model.TorrentStatusRemake
+		} else if user.IsTrusted() {
+			torrent.Status = model.TorrentStatusTrusted
+		}
+
 		db.ORM.Create(&torrent)
 
 		client, err := elastic.NewClient()

router/upload.go

@@ -79,7 +79,7 @@ var errInvalidTorrentName = errors.New("Torrent name is invalid")
 // error indicating a torrent's description is invalid
 var errInvalidTorrentDescription = errors.New("Torrent description is invalid")
 
-// error indicating a torrent's description is invalid
+// error indicating a torrent's website link is invalid
 var errInvalidWebsiteLink = errors.New("Website url or IRC link is invalid")
 
 // error indicating a torrent's category is invalid

service/api/api.go

@@ -43,6 +43,8 @@ type TorrentRequest struct {
 	Magnet      string `json:"magnet"`
 	Hash        string `json:"hash"`
 	Description string `json:"description"`
+	Remake      bool   `json:"remake"`
+	WebsiteLink string `json:"website_link"`
 }
 
 // UpdateRequest struct
@@ -94,6 +96,17 @@ func validateSubCategory(r *TorrentRequest) (error, int) {
 	return nil, http.StatusOK
 }
 
+func validateWebsiteLink(r *TorrentRequest) (error, int) {
+	if r.WebsiteLink != "" {
+		// WebsiteLink
+		urlRegexp, _ := regexp.Compile(`^(https?:\/\/|ircs?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$`)
+		if !urlRegexp.MatchString(r.WebsiteLink) {
+			return ErrWebsiteLink, http.StatusNotAcceptable
+		}
+	}
+	return nil, http.StatusOK
+}
+
 func validateMagnet(r *TorrentRequest) (error, int) {
 	magnetURL, err := url.Parse(string(r.Magnet)) //?
 	if err != nil {
@@ -144,6 +157,7 @@ func (r *TorrentRequest) ValidateUpload() (err error, code int) {
 		validateSubCategory,
 		validateMagnet,
 		validateHash,
+		validateWebsiteLink,
 	}
 
 	for i, validator := range validators {
@@ -206,6 +220,7 @@ func (r *TorrentRequest) ValidateUpdate() (err error, code int) {
 		validateSubCategory,
 		validateMagnet,
 		validateHash,
+		validateWebsiteLink,
 	}
 
 	//don't update not requested values
@@ -243,4 +258,7 @@ func (r *UpdateRequest) UpdateTorrent(t *model.Torrent) {
 	if r.Update.Description != "" {
 		t.Description = r.Update.Description
 	}
+	if r.Update.WebsiteLink != "" {
+		t.WebsiteLink = r.Update.WebsiteLink
+	}
 }

service/api/errors.go

@@ -11,6 +11,9 @@ var ErrCategory = errors.New("this category doesn't exist")
 // ErrSubCategory : Error for not found sub category used by api
 var ErrSubCategory = errors.New("this sub category doesn't exist")
 
+// ErrWebsiteLink : error indicating a torrent's website link is invalid
+var ErrWebsiteLink = errors.New("website url or IRC link is invalid")
+
 // ErrMagnet : Error for incorrect magnet used by api
 var ErrMagnet = errors.New("incorrect magnet")