delete shit

model/comment.go

@@ -11,6 +11,7 @@ type Comment struct {
 	Content   string    `gorm:"column:content"`
 	CreatedAt time.Time `gorm:"column:created_at"`
 	UpdatedAt time.Time `gorm:"column:updated_at"`
+	DeletedAt *time.Time
 
 	Torrent *Torrent `gorm:"ForeignKey:torrent_id"`
 	User    *User    `gorm:"ForeignKey:user_id"`

model/torrent.go

@@ -34,6 +34,7 @@ type Torrent struct {
 	Filesize    int64     `gorm:"column:filesize"`
 	Description string    `gorm:"column:description"`
 	WebsiteLink string    `gorm:"column:website_link"`
+	DeletedAt *time.Time
 
 	Uploader    *User        `gorm:"ForeignKey:UploaderId"`
 	OldComments []OldComment `gorm:"ForeignKey:torrent_id"`

router/modpanel.go

@@ -142,7 +142,7 @@ func CommentDeleteModPanel(w http.ResponseWriter, r *http.Request) {
 	if userPermission.HasAdmin(currentUser) {
 		_ = form.NewErrors()
 		_, _ = userService.DeleteComment(id)
-		url, _ := Router.Get("mod_comment_list").URL()
+		url, _ := Router.Get("mod_clist").URL()
 		http.Redirect(w, r, url.String()+"?deleted", http.StatusSeeOther)
 	} else {
 		http.Error(w, "admins only", http.StatusForbidden)
@@ -154,7 +154,7 @@ func TorrentDeleteModPanel(w http.ResponseWriter, r *http.Request) {
 	if userPermission.HasAdmin(currentUser) {
 		_ = form.NewErrors()
 		_, _ = torrentService.DeleteTorrent(id)
-		url, _ := Router.Get("mod_torrent_list").URL()
+		url, _ := Router.Get("mod_tlist").URL()
 		http.Redirect(w, r, url.String()+"?deleted", http.StatusSeeOther)
 	} else {
 		http.Error(w, "admins only", http.StatusForbidden)

service/torrent/torrent.go

@@ -97,6 +97,7 @@ func getTorrentsOrderBy(parameters *WhereParams, orderBy string, limit int, offs
 	torrents []model.Torrent, count int, err error,
 ) {
 	var conditionArray []string
+	conditionArray = append(conditionArray, "deleted_at  IS NULL")
 	if strings.HasPrefix(orderBy, "filesize") {
 		// torrents w/ NULL filesize fuck up the sorting on Postgres
 		conditionArray = append(conditionArray, "filesize IS NOT NULL")

templates/admin/commentlist.html

@@ -2,7 +2,7 @@
 <table>
 {{ range .Comments}}
 
-<tr><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .Content }}</a></td><td><a href="{{ genRoute "mod_cdelete" }}?id{{ .ID }}">Delete</a></td></tr>
+<tr><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .Content }}</a></td><td><a href="{{ genRoute "mod_cdelete" }}?id={{ .ID }}">Delete</a></td></tr>
 {{end}}
 </table>
 {{end}}

templates/admin/torrentlist.html

@@ -2,7 +2,7 @@
 <table>
 {{ range .Torrents}}
 
-<tr><td><a href="{{ genRoute "mod_tedit" }}?id={{.ID}}">{{ .Name }}</a></td><td><a href="{{ genRoute "mod_tdelete" }}?id{{ .ID }}">Delete</a></td></tr>
+<tr><td><a href="{{ genRoute "mod_tedit" }}?id={{.ID}}">{{ .Name }}</a></td><td><a href="{{ genRoute "mod_tdelete" }}?id={{ .ID }}">Delete</a></td></tr>
 {{end}}
 </table>
 {{end}}