a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix group ids in cached replies

This commit is contained in:
Azareal 2020-02-01 15:55:33 +10:00
parent b5fa9c69f7
commit b38df9773b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/topic.go
View File

@ -326,7 +326,7 @@ func (t *Topic) Like(score, uid int) (err error) {
// TODO: Use a transaction // TODO: Use a transaction
func (t *Topic) Unlike(uid int) error { func (t *Topic) Unlike(uid int) error {
err := Likes.Delete(t.ID,"topics") err := Likes.Delete(t.ID, "topics")
if err != nil { if err != nil {
return err return err
} }
@ -647,11 +647,12 @@ func (t *TopicUser) Replies(offset, pFrag int, user *User) (rlist []*ReplyUser,
hTbl := GetHookTable() hTbl := GetHookTable()
rf := func(r *ReplyUser) error { rf := func(r *ReplyUser) error {
//log.Printf("before r: %+v\n", r)
err := r.Init() err := r.Init()
if err != nil { if err != nil {
return err return err
} }
//log.Printf("after r: %+v\n", r)
r.ContentHtml = ParseMessage(r.Content, t.ParentID, "forums", user.ParseSettings) r.ContentHtml = ParseMessage(r.Content, t.ParentID, "forums", user.ParseSettings)
// TODO: Do this more efficiently by avoiding the allocations entirely in ParseMessage, if there's nothing to do. // TODO: Do this more efficiently by avoiding the allocations entirely in ParseMessage, if there's nothing to do.
if r.ContentHtml == r.Content { if r.ContentHtml == r.Content {
@ -686,12 +687,14 @@ func (t *TopicUser) Replies(offset, pFrag int, user *User) (rlist []*ReplyUser,
// TODO: Factor the user fields out and embed a user struct instead // TODO: Factor the user fields out and embed a user struct instead
if err == nil { if err == nil {
//log.Print("reply cached serve") //log.Print("reply cached serve")
reply := &ReplyUser{ClassName: "", Reply: *re, CreatedByName: ruser.Name, Avatar: ruser.Avatar /*URLPrefix: ruser.URLPrefix, URLName: ruser.URLName, */, Level: ruser.Level} reply := &ReplyUser{ClassName: "", Reply: *re, CreatedByName: ruser.Name, Avatar: ruser.Avatar /*URLPrefix: ruser.URLPrefix, URLName: ruser.URLName, */, Level: ruser.Level, Tag: ruser.Tag}
reply.Group = ruser.Group
err = rf(reply) err = rf(reply)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
} else { } else {
//log.Print("reply query serve")
rows, err := topicStmts.getReplies.Query(t.ID, offset, Config.ItemsPerPage) rows, err := topicStmts.getReplies.Query(t.ID, offset, Config.ItemsPerPage)
if err != nil { if err != nil {
return nil, "", err return nil, "", err