Added form to add tags on view

controllers/torrent/tag.go

@@ -9,13 +9,14 @@ import (
 
 	"github.com/NyaaPantsu/nyaa/controllers/router"
 	"github.com/NyaaPantsu/nyaa/models"
+	"github.com/NyaaPantsu/nyaa/models/tag"
 	"github.com/NyaaPantsu/nyaa/models/torrents"
 	"github.com/NyaaPantsu/nyaa/templates"
+	"github.com/NyaaPantsu/nyaa/utils/log"
 	msg "github.com/NyaaPantsu/nyaa/utils/messages"
 	"github.com/NyaaPantsu/nyaa/utils/validator"
 	"github.com/NyaaPantsu/nyaa/utils/validator/tags"
 	"github.com/gin-gonic/gin"
-	"github.com/NyaaPantsu/nyaa/models/tag"
 )
 
 func postTag(c *gin.Context, torrent *models.Torrent, user *models.User) {
@@ -31,10 +32,9 @@ func postTag(c *gin.Context, torrent *models.Torrent, user *models.User) {
 		return
 	}
 
-	for _, tag := range user.Tags {
-		if tag.Tag == tagForm.Tag {
-			return // already a tag by the user, don't add one more
-		}
+	if user.Tags.Contains(models.Tag{Tag: tagForm.Tag, Type: tagForm.Type}) {
+		log.Info("User has already tagged the type for the torrent")
+		return
 	}
 
 	tags.Create(tagForm.Tag, tagForm.Type, torrent, user) // Add a tag to the db
@@ -82,3 +82,54 @@ func ViewFormTag(c *gin.Context) {
 
 	templates.Form(c, "/site/torrents/tag.jet.html", tagForm)
 }
+
+func DeleteTag(c *gin.Context) {
+	messages := msg.GetMessages(c)
+	user := router.GetUser(c)
+	id, _ := strconv.ParseInt(c.Query("id"), 10, 32)
+	// Retrieve the torrent
+	torrent, err := torrents.FindByID(uint(id))
+
+	// If torrent not found, display 404
+	if err != nil {
+		c.Status(http.StatusNotFound)
+		return
+	}
+
+	// We load tags for user and torrents
+	user.LoadTags(torrent)
+	torrent.LoadTags()
+
+	if c.PostForm("tag") != "" && user.ID > 0 {
+		tagForm := &tagsValidator.CreateForm{}
+
+		c.Bind(tagForm)
+		validator.ValidateForm(tagForm, messages)
+
+		if !messages.HasErrors() {
+			for _, tag := range user.Tags {
+				if tag.Tag == tagForm.Tag && tag.Type == tagForm.Type {
+					_, err := tag.Delete()
+					if err != nil {
+						log.CheckError(err)
+						break
+					}
+					if _, ok := c.GetQuery("json"); ok {
+						c.JSON(http.StatusOK, struct {
+							Ok bool
+						}{true})
+						return
+					}
+					break
+				}
+			}
+		}
+	}
+	if _, ok := c.GetQuery("json"); ok {
+		c.JSON(http.StatusOK, struct {
+			Ok bool
+		}{false})
+		return
+	}
+	c.Redirect(http.StatusSeeOther, fmt.Sprintf("/view/%d", id))
+}

models/tag.go

@@ -39,3 +39,14 @@ func (ta *Tag) Delete() (int, error) {
 func (ta *Tag) toMap() map[string]interface{} {
 	return structs.Map(ta)
 }
+
+type Tags []Tag
+
+func (ts *Tags) Contains(tag Tag) bool {
+	for _, ta := range *ts {
+		if ta.Tag == tag.Tag && ta.Type == tag.Type {
+			return true
+		}
+	}
+	return false
+}

models/tag/create.go

@@ -1,6 +1,9 @@
 package tags
 
-import "github.com/NyaaPantsu/nyaa/models"
+import (
+	"github.com/NyaaPantsu/nyaa/models"
+	"github.com/pkg/errors"
+)
 
 func Create(tag string, tagType string, torrent *models.Torrent, user *models.User) (*models.Tag, error) {
 	newTag := &models.Tag{
@@ -12,6 +15,9 @@ func Create(tag string, tagType string, torrent *models.Torrent, user *models.Us
 		Accepted:  false,
 	}
 
+	if torrent.ID == 0 {
+		return newTag, errors.New("Can't add a tag to no torrents")
+	}
 	if err := models.ORM.Create(newTag).Error; err != nil {
 		return newTag, err
 	}

models/tag/delete.go

@@ -1,9 +1,15 @@
 package tags
 
-import "github.com/NyaaPantsu/nyaa/models"
+import (
+	"github.com/NyaaPantsu/nyaa/models"
+	"github.com/pkg/errors"
+)
 
 // DeleteAllType : Deletes all tag from a tag type and torrent ID
 func DeleteAllType(tagType string, torrentID uint) error {
+	if torrentID == 0 || tagType == "" {
+		return errors.New("Can't delete empty tags")
+	}
 	if err := models.ORM.Model(&models.Tag{}).Where("torrent_id = ? AND type = ?", torrentID, tagType).Delete(&models.Tag{}).Error; err != nil {
 		return err
 	}

models/tag/helpers.go

@@ -8,6 +8,9 @@ import (
 )
 
 func Filter(tag string, tagType string, torrentID uint) bool {
+	if torrentID == 0 || tagType == "" || tag == "" {
+		return false
+	}
 	tagSum := models.Tag{}
 	if err := models.ORM.Select("tag, type, accepted, SUM(weight) as total").Where("torrent_id = ? AND tag = ? AND type = ?", torrentID, tag, tagType).Group("type, tag").Find(&tagSum).Error; err == nil {
 		if tagSum.Total > config.Get().Torrents.Tags.MaxWeight {

models/torrent.go

@@ -399,6 +399,11 @@ func (t *Torrent) UpdateUnscope() (int, error) {
 
 // Delete : delete a torrent based on id
 func (t *Torrent) Delete(definitely bool) (*Torrent, int, error) {
+	if t.ID == 0 {
+		err := errors.New("ERROR: Tried to delete a torrent with ID 0")
+		log.CheckErrorWithMessage(err, "ERROR_IMPORTANT: ")
+		return t, http.StatusBadRequest, err
+	}
 	db := ORM
 	if definitely {
 		db = ORM.Unscoped()

models/user.go

@@ -59,7 +59,7 @@ type User struct {
 
 	UnreadNotifications int          `gorm:"-"` // We don't want to loop every notifications when accessing user unread notif
 	Settings            UserSettings `gorm:"-"` // We don't want to load settings everytime, stock it as a string, parse it when needed
-	Tags                []Tag        `gorm:"-"` // We load tags only when viewing a torrent
+	Tags                Tags         `gorm:"-"` // We load tags only when viewing a torrent
 }
 
 // UserJSON : User model conversion in JSON
@@ -101,7 +101,7 @@ func (u User) Size() (s int) {
 		6*2 + // string pointers
 		4*3 + //time.Time
 		3*2 + // arrays
-	// string arrays
+		// string arrays
 		len(u.Username) + len(u.Password) + len(u.Email) + len(u.APIToken) + len(u.MD5) + len(u.Language) + len(u.Theme)
 	s *= 8
 

templates/site/torrents/view.jet.html

@@ -64,6 +64,24 @@
       </td>
     </tr>
     {{end}}
+    <tr class="torrent-info-row">
+      <td class="torrent-info-td torrent-info-label">{{ T("torrent_tags")}}:</td>
+      <td class="tr-flag torrent-view-td torrent-info-data">
+        {{ range Torrent.Tags}}
+        <span class="tag{{ if len(Torrent.Tags) > 5 }} big{{ end }}" title="{{ .Tag }}">
+          {{ T("tagtype_" + .Type) }}: {{ .Tag }}
+          {{ if .Accepted == false }}
+          <form action="{{ if User.Tags.Contains(.) }}/torrent/tag/delete?id={{Torrent.ID}}{{end}}" class="tag-form">
+            <input type="hidden" name="tag" value="{{ .Tag }}">
+            <input type="hidden" name="type" value="{{ .Type }}">
+            <button type="submit">{{ if User.Tags.Contains(.) }}-{{else}}+{{end}}</button>
+          </form>
+          {{ end }}
+        </span>
+        {{end}}
+        <a href="/torrent/tag?id={{ Torrent.ID }}" class="add-tag">{{ T("add") }}</a>
+      </td>
+    </tr>
   </table>
   <div class="torrent-buttons">
     <a href="{{Torrent.Magnet}}" class="form-input btn-green download" style="float:left;height: auto;margin-right: 0.5em;">

translations/en-us.all.json

@@ -1950,5 +1950,9 @@
   {
     "id": "tagtype_quality",
     "translation": "Quality tag"
+  },
+  {
+    "id": "torrent_tags",
+    "translation": "Torrent tags"
   }
 ]