implemented comments and display
Cette révision appartient à :
Parent
18a470b87f
révision
2e3c45cbc7
|
@ -6,13 +6,14 @@ import (
|
||||||
|
|
||||||
// Comment is a comment model.
|
// Comment is a comment model.
|
||||||
type Comment struct {
|
type Comment struct {
|
||||||
Id int `json:"id"`
|
Id int `json:"id"`
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
UserId int `json:"userId"`
|
UserId int `json:"userId"`
|
||||||
TorrentId int
|
Username string `json:"username"` // this is duplicate but it'll be faster rite?
|
||||||
|
TorrentId int
|
||||||
// LikingCount int `json:"likingCount"`
|
// LikingCount int `json:"likingCount"`
|
||||||
CreatedAt time.Time `json:"createdAt"`
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
UpdatedAt time.Time `json:"updatedAt"`
|
UpdatedAt time.Time `json:"updatedAt"`
|
||||||
DeletedAt time.Time `json:"deletedAt"`
|
DeletedAt time.Time `json:"deletedAt"`
|
||||||
User User `json:"user"`
|
User User `json:"user"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,17 +21,18 @@ type Feed struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type Torrents struct {
|
type Torrents struct {
|
||||||
Id int `gorm:"column:torrent_id;primary_key"`
|
Id int `gorm:"column:torrent_id;primary_key"`
|
||||||
Name string `gorm:"column:torrent_name"`
|
Name string `gorm:"column:torrent_name"`
|
||||||
Category int `gorm:"column:category_id"`
|
Category int `gorm:"column:category_id"`
|
||||||
Sub_Category int `gorm:"column:sub_category_id"`
|
Sub_Category int `gorm:"column:sub_category_id"`
|
||||||
Status int `gorm:"column:status_id"`
|
Status int `gorm:"column:status_id"`
|
||||||
Hash string `gorm:"column:torrent_hash"`
|
Hash string `gorm:"column:torrent_hash"`
|
||||||
Date int64 `gorm:"column:date"`
|
Date int64 `gorm:"column:date"`
|
||||||
Downloads int `gorm:"column:downloads"`
|
Downloads int `gorm:"column:downloads"`
|
||||||
Filesize int64 `gorm:"column:filesize"`
|
Filesize int64 `gorm:"column:filesize"`
|
||||||
Description string `gorm:"column:description"`
|
Description string `gorm:"column:description"`
|
||||||
Comments []byte `gorm:"column:comments"`
|
OldComments []byte `gorm:"column:comments"`
|
||||||
|
Comments []Comment `gorm:"ForeignKey:TorrentId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We need JSON Object instead because of Magnet URL that is not in the database but generated dynamically
|
/* We need JSON Object instead because of Magnet URL that is not in the database but generated dynamically
|
||||||
|
@ -41,12 +42,12 @@ JSON Models Oject
|
||||||
*/
|
*/
|
||||||
|
|
||||||
type ApiResultJson struct {
|
type ApiResultJson struct {
|
||||||
Torrents []TorrentsJson `json:"torrents"`
|
Torrents []TorrentsJson `json:"torrents"`
|
||||||
QueryRecordCount int `json:"queryRecordCount"`
|
QueryRecordCount int `json:"queryRecordCount"`
|
||||||
TotalRecordCount int `json:"totalRecordCount"`
|
TotalRecordCount int `json:"totalRecordCount"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type CommentsJson struct {
|
type OldCommentsJson struct {
|
||||||
C template.HTML `json:"c"`
|
C template.HTML `json:"c"`
|
||||||
Us string `json:"us"`
|
Us string `json:"us"`
|
||||||
Un string `json:"un"`
|
Un string `json:"un"`
|
||||||
|
@ -56,26 +57,50 @@ type CommentsJson struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CommentsJson struct {
|
||||||
|
Content template.HTML `json:"content"`
|
||||||
|
Username string `json:"username"`
|
||||||
|
}
|
||||||
|
|
||||||
type TorrentsJson struct {
|
type TorrentsJson struct {
|
||||||
Id string `json:"id"`
|
Id string `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Status int `json:"status"`
|
Status int `json:"status"`
|
||||||
Hash string `json:"hash"`
|
Hash string `json:"hash"`
|
||||||
Date string `json:"date"`
|
Date string `json:"date"`
|
||||||
Filesize string `json:"filesize"`
|
Filesize string `json:"filesize"`
|
||||||
Description template.HTML `json:"description"`
|
Description template.HTML `json:"description"`
|
||||||
Comments []CommentsJson `json:"comments"`
|
Comments []CommentsJson `json:"comments"`
|
||||||
Sub_Category string `json:"sub_category"`
|
Sub_Category string `json:"sub_category"`
|
||||||
Category string `json:"category"`
|
Category string `json:"category"`
|
||||||
Magnet template.URL `json:"magnet"`
|
Magnet template.URL `json:"magnet"`
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Model Conversion to Json */
|
/* Model Conversion to Json */
|
||||||
|
|
||||||
func (t *Torrents) ToJson() TorrentsJson {
|
func (t *Torrents) ToJson() TorrentsJson {
|
||||||
magnet := util.InfoHashToMagnet(strings.TrimSpace(t.Hash), t.Name, config.Trackers...)
|
magnet := util.InfoHashToMagnet(strings.TrimSpace(t.Hash), t.Name, config.Trackers...)
|
||||||
b := []CommentsJson{}
|
offset := 0
|
||||||
_ = json.Unmarshal([]byte(t.Comments), &b)
|
var commentsJson []CommentsJson
|
||||||
|
if len(t.OldComments) != 0 {
|
||||||
|
b := []OldCommentsJson{}
|
||||||
|
err := json.Unmarshal([]byte(t.OldComments), &b)
|
||||||
|
if err == nil {
|
||||||
|
commentsJson = make([]CommentsJson, len(t.Comments)+len(b))
|
||||||
|
offset = len(b)
|
||||||
|
for i, commentJson := range b {
|
||||||
|
commentsJson[i] = CommentsJson{Content: commentJson.C,
|
||||||
|
Username: commentJson.Un}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
commentsJson = make([]CommentsJson, len(t.Comments))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
commentsJson = make([]CommentsJson, len(t.Comments))
|
||||||
|
}
|
||||||
|
for i, comment := range t.Comments {
|
||||||
|
commentsJson[i+offset] = CommentsJson{Content: template.HTML(comment.Content), Username: comment.Username}
|
||||||
|
}
|
||||||
res := TorrentsJson{
|
res := TorrentsJson{
|
||||||
Id: strconv.Itoa(t.Id),
|
Id: strconv.Itoa(t.Id),
|
||||||
Name: html.UnescapeString(t.Name),
|
Name: html.UnescapeString(t.Name),
|
||||||
|
@ -84,7 +109,7 @@ func (t *Torrents) ToJson() TorrentsJson {
|
||||||
Date: time.Unix(t.Date, 0).Format(time.RFC3339),
|
Date: time.Unix(t.Date, 0).Format(time.RFC3339),
|
||||||
Filesize: util.FormatFilesize2(t.Filesize),
|
Filesize: util.FormatFilesize2(t.Filesize),
|
||||||
Description: template.HTML(t.Description),
|
Description: template.HTML(t.Description),
|
||||||
Comments: b,
|
Comments: commentsJson,
|
||||||
Sub_Category: strconv.Itoa(t.Sub_Category),
|
Sub_Category: strconv.Itoa(t.Sub_Category),
|
||||||
Category: strconv.Itoa(t.Category),
|
Category: strconv.Itoa(t.Category),
|
||||||
Magnet: util.Safe(magnet)}
|
Magnet: util.Safe(magnet)}
|
||||||
|
|
|
@ -35,8 +35,7 @@ func UploadHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
Hash: uploadForm.Infohash,
|
Hash: uploadForm.Infohash,
|
||||||
Date: time.Now().Unix(),
|
Date: time.Now().Unix(),
|
||||||
Filesize: uploadForm.Filesize, // FIXME: should set to NULL instead of 0
|
Filesize: uploadForm.Filesize, // FIXME: should set to NULL instead of 0
|
||||||
Description: uploadForm.Description,
|
Description: uploadForm.Description}
|
||||||
Comments: []byte{}}
|
|
||||||
db.ORM.Create(&torrent)
|
db.ORM.Create(&torrent)
|
||||||
fmt.Printf("%+v\n", torrent)
|
fmt.Printf("%+v\n", torrent)
|
||||||
url, err := Router.Get("view_torrent").URL("id", strconv.Itoa(torrent.Id))
|
url, err := Router.Get("view_torrent").URL("id", strconv.Itoa(torrent.Id))
|
||||||
|
|
|
@ -45,7 +45,7 @@ func GetFeeds() []model.Feed {
|
||||||
func GetTorrentById(id string) (model.Torrents, error) {
|
func GetTorrentById(id string) (model.Torrents, error) {
|
||||||
var torrent model.Torrents
|
var torrent model.Torrents
|
||||||
|
|
||||||
if db.ORM.Where("torrent_id = ?", id).Find(&torrent).RecordNotFound() {
|
if db.ORM.Where("torrent_id = ?", id).Preload("Comments").Find(&torrent).RecordNotFound() {
|
||||||
return torrent, errors.New("Article is not found.")
|
return torrent, errors.New("Article is not found.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,8 +49,8 @@
|
||||||
</tr>
|
</tr>
|
||||||
{{ range .Comments }}
|
{{ range .Comments }}
|
||||||
<tr class="comment-row">
|
<tr class="comment-row">
|
||||||
<td>{{.Un}}</td>
|
<td>{{.Username}}</td>
|
||||||
<td>{{.C}}</td>
|
<td>{{.Content}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{{end}}
|
{{end}}
|
||||||
</table>
|
</table>
|
||||||
|
|
Référencer dans un nouveau ticket