Fix comments

controllers/view_torrent_handler.go

@@ -20,7 +20,6 @@ import (
 	"github.com/NyaaPantsu/nyaa/utils/captcha"
 	"github.com/NyaaPantsu/nyaa/utils/filelist"
 	msg "github.com/NyaaPantsu/nyaa/utils/messages"
-	"github.com/NyaaPantsu/nyaa/utils/publicSettings"
 	"github.com/NyaaPantsu/nyaa/utils/sanitize"
 	"github.com/NyaaPantsu/nyaa/utils/search/structs"
 	"github.com/NyaaPantsu/nyaa/utils/upload"
@@ -109,14 +108,7 @@ func PostCommentHandler(c *gin.Context) {
 	}
 	if !messages.HasErrors() {
 
-		comment, err := comments.Create(content, torrent, currentUser)
-		url := "/view/" + strconv.FormatUint(uint64(torrent.ID), 10)
-		torrent.Uploader.ParseSettings()
-		if torrent.Uploader.Settings.Get("new_comment") {
-			T, _, _ := publicSettings.TfuncAndLanguageWithFallback(torrent.Uploader.Language, torrent.Uploader.Language) // We need to send the notification to every user in their language
-			notifications.NotifyUser(torrent.Uploader, comment.Identifier(), fmt.Sprintf(T("new_comment_on_torrent"), torrent.Name), url, torrent.Uploader.Settings.Get("new_comment_email"))
-		}
-
+		_, err := comments.Create(content, torrent, currentUser)
 		if err != nil {
 			messages.Error(err)
 		}

models/comments/create.go

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/NyaaPantsu/nyaa/models"
+	"github.com/NyaaPantsu/nyaa/utils/cache"
 )
 
 func Create(content string, torrent *models.Torrent, user *models.User) (*models.Comment, error) {
@@ -12,6 +13,10 @@ func Create(content string, torrent *models.Torrent, user *models.User) (*models
 	if err != nil {
 		return comment, err
 	}
+	NewCommentEvent(comment, torrent)
+
 	comment.Torrent = torrent
+	cache.C.Delete(torrent.Identifier())
+
 	return comment, nil
 }

models/comments/helpers.go

@@ -0,0 +1,21 @@
+package comments
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/NyaaPantsu/nyaa/models"
+	"github.com/NyaaPantsu/nyaa/models/notifications"
+	"github.com/NyaaPantsu/nyaa/utils/publicSettings"
+)
+
+func NewCommentEvent(comment *models.Comment, torrent *models.Torrent) {
+	url := "/view/" + strconv.FormatUint(uint64(torrent.ID), 10)
+	if torrent.UploaderID > 0 {
+		torrent.Uploader.ParseSettings()
+		if torrent.Uploader.Settings.Get("new_comment") {
+			T, _, _ := publicSettings.TfuncAndLanguageWithFallback(torrent.Uploader.Language, torrent.Uploader.Language) // We need to send the notification to every user in their language
+			notifications.NotifyUser(torrent.Uploader, comment.Identifier(), fmt.Sprintf(T("new_comment_on_torrent"), torrent.Name), url, torrent.Uploader.Settings.Get("new_comment_email"))
+		}
+	}
+}

models/torrent.go

@@ -111,7 +111,7 @@ func (t Torrent) TableName() string {
 
 // Identifier : Return the identifier of a torrent
 func (t *Torrent) Identifier() string {
-	return "torrent_" + strconv.Itoa(int(t.ID))
+	return fmt.Sprintf("torrent_%d", t.ID)
 }
 
 // IsNormal : Return if a torrent status is normal

models/torrents/find.go

@@ -6,7 +6,6 @@ import (
 	"strconv"
 	"strings"
 
-	"fmt"
 	"time"
 
 	"github.com/NyaaPantsu/nyaa/config"
@@ -23,12 +22,12 @@ import (
 
 // FindByID : get a torrent with its id
 func FindByID(id uint) (*models.Torrent, error) {
-	torrent := &models.Torrent{}
+	torrent := &models.Torrent{ID: id}
 	var err error
-	if found, ok := cache.C.Get(fmt.Sprintf("torrent_%d", id)); ok {
+	if found, ok := cache.C.Get(torrent.Identifier()); ok {
 		return found.(*models.Torrent), nil
 	}
-
+	torrent = &models.Torrent{}
 	tmp := models.ORM.Where("torrent_id = ?", id).Preload("Scrape").Preload("Comments")
 	if id > config.Conf.Models.LastOldTorrentID {
 		tmp = tmp.Preload("FileList")
@@ -59,7 +58,7 @@ func FindByID(id uint) (*models.Torrent, error) {
 		torrent.Comments[i].User = new(models.User)
 		models.ORM.Where("user_id = ?", torrent.Comments[i].UserID).Find(torrent.Comments[i].User)
 	}
-	cache.C.Set(fmt.Sprintf("torrent_%d", id), torrent, 5*time.Minute)
+	cache.C.Set(torrent.Identifier(), torrent, 5*time.Minute)
 	return torrent, nil
 }
 

templates/site/torrents/view.jet.html

@@ -92,9 +92,9 @@
   <p class="torrent-hr">{{ T("comments")}}</p>
   {{range index, element := Torrent.Comments}}
   <div class="torrent-info-box comment-box">
- <span class="comment-index"><a href="#comment_{{index}}">#{{index}}</a><small style="padding-left: 4px;" class="date-short">{{formatDateRFC(.Date)}}</small></span>
-  <p>{{.Username}}</p>
-  <p>{{.Content}}</p>
+ <span class="comment-index"><a href="#comment_{{index}}">#{{index}}</a><small style="padding-left: 4px;" class="date-short">{{formatDateRFC(element.Date)}}</small></span>
+  <p>{{element.Username}}</p>
+  <p>{{element.Content|raw}}</p>
   </div>
   {{end}}
   <div style="margin-top: 10px" class="torrent-info-box">