c6168be8b1
* Tag Search + Tests + Search slight refactor First commit improving search. Different struct have their own file with their tests. This way of separating struct by files is inspired by the go packages I've seen so far. Added new behaviour as discussed in #1334 * fix fallback to ES * Added some comments to explain PG fallback + log err moved * Refactored search Nearly fully covered WhereParams struct has disappeared for Query struct instead In DB model, we use an interface implementing Query struct methods * 1rst Refactor of Tags (WTF already?!) Prepare Tags for the refactored system. Now there will be descriptive tags for a particular release (ecchi, BDSM, ....) and typed tags. Typed tags are tags relevant to all torrents and can be limited to some input value. For example, video quality is a typed tag limited to some values (hd, full hd, sd, ...). In the same way, anidbid is also a typed tag but doesn't have default values. Furthermore, the location storage of tags have changed, now accepted descriptive tags are stored in the torrents table in the column "tags" and they are separated by commas. In the opposite, accepted typed tags can have have their own column in the torrents table. For example, anidbid, vndbid will populate the column DbID when accepted. On the other hand, videoquality will populate the same way as descriptive tags. This behaviour depends on the callbackOnType function in tag/helpers.go * fix for modtools :') * Added anidb, vndb, dlsite & vmdb id fields in torrent model. Tags don't have an accepted field anymore. Accepted Tags are in torrent.AcceptedTags and non-accepted ones in torrrent.Tags. New Helper + New Changelog for translation string. * New upload/edit form for torrent tags. Now the inputs are dynamically generated by the helper tag_form. No more modal window in those form, only inputs. Support of tags in API New translation string for the link to the modal on torrent view. More comments in the functions for tags * Improving how config for tags work. Adding a test on them with understandable messages. Config for tags have now a Field attribute which is linked to the Torrent model. For example anidbid tag type has now a AnidbID field in config which is the name of the field in torrent model (AnidbID). Every new tag type need to have a field attribute with its counterpart in torrent Model. Fixing some errors * Fix compile error + Tests Errors * Improve performance by caching the list of tags with an index Adding/removing tags works/tested New translation strings TODO: test/fix adding tag on upload/edit * Mini fix to display video quality + tags works/tested on modo edit * Fix editing tags on modpanel * Edit tags works * Add translation string * Add search backend for tags. ?tags=xxx,eee,ddd ?anidb=21 ?vndb=23 ?vgmdb=24 ?vq=full_hd * Fix Ajax tag Removal&Add * Added form for descriptive tags * Forgot to add the link between database and form for descriptive tags. * Adding the increase/decrease pantsu for descriptive tags * Fix #1370 * When you actually forgot to commit files after having forgotten commits
207 lignes
6,5 Kio
Go
207 lignes
6,5 Kio
Go
package moderatorController
|
|
|
|
import (
|
|
"fmt"
|
|
"html"
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"github.com/NyaaPantsu/nyaa/controllers/router"
|
|
"github.com/NyaaPantsu/nyaa/models"
|
|
"github.com/NyaaPantsu/nyaa/models/activities"
|
|
"github.com/NyaaPantsu/nyaa/models/reports"
|
|
"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/search"
|
|
"github.com/NyaaPantsu/nyaa/utils/upload"
|
|
"github.com/NyaaPantsu/nyaa/utils/validator/torrent"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// TorrentsListPanel : Controller for listing torrents, can accept common search arguments
|
|
func TorrentsListPanel(c *gin.Context) {
|
|
page := c.Param("page")
|
|
messages := msg.GetMessages(c)
|
|
deleted := c.Request.URL.Query()["deleted"]
|
|
unblocked := c.Request.URL.Query()["unblocked"]
|
|
blocked := c.Request.URL.Query()["blocked"]
|
|
if deleted != nil {
|
|
messages.AddInfoTf("infos", "torrent_deleted", "")
|
|
}
|
|
if blocked != nil {
|
|
messages.AddInfoT("infos", "torrent_blocked")
|
|
}
|
|
if unblocked != nil {
|
|
messages.AddInfoT("infos", "torrent_unblocked")
|
|
}
|
|
|
|
var err error
|
|
pagenum := 1
|
|
if page != "" {
|
|
pagenum, err = strconv.Atoi(html.EscapeString(page))
|
|
if !log.CheckError(err) {
|
|
c.AbortWithError(http.StatusInternalServerError, err)
|
|
return
|
|
}
|
|
}
|
|
|
|
searchParam, torrents, count, err := search.ByQueryWithUser(c, pagenum)
|
|
if err != nil {
|
|
messages.Error(err)
|
|
}
|
|
category := ""
|
|
if len(searchParam.Category) > 0 {
|
|
category = searchParam.Category[0].String()
|
|
}
|
|
searchForm := templates.SearchForm{
|
|
TorrentParam: searchParam,
|
|
Category: category,
|
|
ShowItemsPerPage: true,
|
|
}
|
|
|
|
nav := templates.Navigation{count, int(searchParam.Max), pagenum, "mod/torrents/p"}
|
|
|
|
templates.ModelList(c, "admin/torrentlist.jet.html", torrents, nav, searchForm)
|
|
}
|
|
|
|
// TorrentEditModPanel : Controller for editing a torrent after GET request
|
|
func TorrentEditModPanel(c *gin.Context) {
|
|
id, _ := strconv.ParseInt(c.Query("id"), 10, 32)
|
|
torrent, _ := torrents.FindUnscopeByID(uint(id))
|
|
torrent.LoadTags()
|
|
|
|
torrentJSON := torrent.ToJSON()
|
|
uploadForm := upload.NewTorrentRequest()
|
|
uploadForm.ID = torrentJSON.ID
|
|
uploadForm.Name = torrentJSON.Name
|
|
uploadForm.Category = torrentJSON.Category + "_" + torrentJSON.SubCategory
|
|
uploadForm.Status = torrentJSON.Status
|
|
uploadForm.Hidden = torrent.Hidden
|
|
uploadForm.WebsiteLink = string(torrentJSON.WebsiteLink)
|
|
uploadForm.Description = string(torrentJSON.Description)
|
|
uploadForm.Languages = torrent.Languages
|
|
uploadForm.Tags.Bind(&torrent)
|
|
|
|
templates.Form(c, "admin/paneltorrentedit.jet.html", uploadForm)
|
|
}
|
|
|
|
// TorrentPostEditModPanel : Controller for editing a torrent after POST request
|
|
func TorrentPostEditModPanel(c *gin.Context) {
|
|
var uploadForm torrentValidator.UpdateRequest
|
|
id, _ := strconv.ParseInt(c.Query("id"), 10, 32)
|
|
messages := msg.GetMessages(c)
|
|
torrent, _ := torrents.FindUnscopeByID(uint(id))
|
|
torrent.LoadTags()
|
|
currentUser := router.GetUser(c)
|
|
if torrent.ID > 0 {
|
|
errUp := upload.ExtractEditInfo(c, &uploadForm.Update)
|
|
uploadForm.ID = torrent.ID
|
|
uploadForm.Update.ID = torrent.ID
|
|
|
|
if errUp != nil {
|
|
messages.AddErrorT("errors", "fail_torrent_update")
|
|
}
|
|
if !messages.HasErrors() {
|
|
_, err := upload.UpdateUnscopeTorrent(&uploadForm, &torrent, currentUser).UpdateUnscope()
|
|
messages.AddInfoT("infos", "torrent_updated")
|
|
if err == nil { // We only log edit torrent for admins
|
|
if torrent.Uploader == nil {
|
|
torrent.Uploader = &models.User{}
|
|
}
|
|
_, username := torrents.HideUser(torrent.UploaderID, torrent.Uploader.Username, torrent.Hidden)
|
|
activities.Log(&models.User{}, torrent.Identifier(), "edit", "torrent_edited_by", strconv.Itoa(int(torrent.ID)), username, currentUser.Username)
|
|
}
|
|
}
|
|
}
|
|
templates.Form(c, "admin/paneltorrentedit.jet.html", uploadForm.Update)
|
|
}
|
|
|
|
// TorrentDeleteModPanel : Controller for deleting a torrent
|
|
func TorrentDeleteModPanel(c *gin.Context) {
|
|
id, _ := strconv.ParseInt(c.Query("id"), 10, 32)
|
|
definitely := c.Request.URL.Query()["definitely"]
|
|
|
|
var returnRoute = "/mod/torrents"
|
|
torrent, errFind := torrents.FindByID(uint(id))
|
|
if errFind == nil {
|
|
var err error
|
|
if definitely != nil {
|
|
_, _, err = torrent.DefinitelyDelete()
|
|
|
|
//delete reports of torrent
|
|
query := &search.Query{}
|
|
query.Append("torrent_id", id)
|
|
reports, _, _ := reports.FindOrderBy(query, "", 0, 0)
|
|
for _, report := range reports {
|
|
report.Delete(true)
|
|
}
|
|
returnRoute = "/mod/torrents/deleted"
|
|
} else {
|
|
_, _, err = torrent.Delete(false)
|
|
|
|
//delete reports of torrent
|
|
query := &search.Query{}
|
|
query.Append("torrent_id", id)
|
|
reports, _, _ := reports.FindOrderBy(query, "", 0, 0)
|
|
for _, report := range reports {
|
|
report.Delete(false)
|
|
}
|
|
}
|
|
if err == nil {
|
|
if torrent.Uploader == nil {
|
|
torrent.Uploader = &models.User{}
|
|
}
|
|
_, username := torrents.HideUser(torrent.UploaderID, torrent.Uploader.Username, torrent.Hidden)
|
|
activities.Log(&models.User{}, torrent.Identifier(), "delete", "torrent_deleted_by", strconv.Itoa(int(torrent.ID)), username, router.GetUser(c).Username)
|
|
}
|
|
}
|
|
|
|
c.Redirect(http.StatusSeeOther, returnRoute+"?deleted")
|
|
}
|
|
|
|
// DeleteTagsModPanel : Controller for deleting all torrent tags
|
|
func DeleteTagsModPanel(c *gin.Context) {
|
|
id, _ := strconv.ParseInt(c.Query("id"), 10, 32)
|
|
|
|
torrent, errFind := torrents.FindByID(uint(id))
|
|
if errFind == nil {
|
|
// delete all tags
|
|
torrent.DeleteTags()
|
|
}
|
|
// redirect to edit form
|
|
c.Redirect(http.StatusSeeOther, fmt.Sprintf("/mod/torrent?id=%d", id))
|
|
}
|
|
|
|
// TorrentBlockModPanel : Controller to lock torrents, redirecting to previous page
|
|
func TorrentBlockModPanel(c *gin.Context) {
|
|
id, _ := strconv.ParseInt(c.Query("id"), 10, 32)
|
|
torrent, _, err := torrents.ToggleBlock(uint(id))
|
|
var returnRoute, action string
|
|
if torrent.IsDeleted() {
|
|
returnRoute = "/mod/torrents/deleted"
|
|
} else {
|
|
returnRoute = "/mod/torrents"
|
|
}
|
|
if torrent.IsBlocked() {
|
|
action = "blocked"
|
|
} else {
|
|
action = "unblocked"
|
|
}
|
|
if err == nil {
|
|
if torrent.Uploader == nil {
|
|
torrent.Uploader = &models.User{}
|
|
}
|
|
_, username := torrents.HideUser(torrent.UploaderID, torrent.Uploader.Username, torrent.Hidden)
|
|
activities.Log(&models.User{}, torrent.Identifier(), action, "torrent_"+action+"_by", strconv.Itoa(int(torrent.ID)), username, router.GetUser(c).Username)
|
|
}
|
|
|
|
c.Redirect(http.StatusSeeOther, returnRoute+"?"+action)
|
|
}
|
|
|
|
// TorrentsPostListPanel : Controller for listing torrents, after POST request when mass update
|
|
func TorrentsPostListPanel(c *gin.Context) {
|
|
torrentManyAction(c)
|
|
TorrentsListPanel(c)
|
|
}
|