gochan/gochan
1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-08-04 08:06:23 -07:00
Code Releases Activity

fixed replies not being shown on boardpage

Browse source
This commit is contained in:
Joshua Merrell 2013-07-28 11:54:27 -07:00
parent ef70ea736e
commit 6cec81bb3a
2 changed files with 66 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/posting.go
View file

@ -58,20 +58,33 @@ func buildBoardPages(boardid int, boards []BoardsTable, sections []interface{})
for _,op_post_i := range op_posts { for _,op_post_i := range op_posts {
var thread Thread var thread Thread
var posts_in_thread []interface{} var posts_in_thread []interface{}
var limit int
op_post := op_post_i.(PostTable) op_post := op_post_i.(PostTable)
thread.IName = "thread" thread.IName = "thread"
if op_post.Stickied { if op_post.Stickied {
posts_in_thread,err = getPostArr("SELECT * FROM `"+config.DBprefix+"posts` WHERE `boardid` = "+strconv.Itoa(board.ID)+" AND (`id` = "+strconv.Itoa(op_post.ID)+" OR `parentid` = "+strconv.Itoa(op_post.ID)+") LIMIT "+strconv.Itoa(config.StickyRepliesOnBoardPage)) limit = config.StickyRepliesOnBoardPage
} else { } else {
posts_in_thread,err = getPostArr("SELECT * FROM `"+config.DBprefix+"posts` WHERE `boardid` = "+strconv.Itoa(board.ID)+" AND (`id` = "+strconv.Itoa(op_post.ID)+" OR `parentid` = "+strconv.Itoa(op_post.ID)+") LIMIT "+strconv.Itoa(config.RepliesOnBoardpage)) limit = config.RepliesOnBoardpage
} }
/*err = db.QueryRow("SELECT * FROM (SELECT * FROM `"+config.DBprefix+"posts` WHERE `boardid` = "+strconv.Itoa(board.ID)+" AND `id` = "+strconv.Itoa(op_post.ID)+" AND `parentid` = "+strconv.Itoa(op_post.ID)+" ORDER BY `id` DESC LIMIT "+strconv.Itoa(config.StickyRepliesOnBoardPage)+" ORDER BY `id` ASC").Scan(&thread.OP)
if err != nil { if err != nil {
html += err.Error()+"<br />" html += err.Error()+"<br />"
posts_in_thread = make([]interface{},0) }*/
} else {
thread.Posts = posts_in_thread posts_in_thread,err = getPostArr("SELECT * FROM `"+config.DBprefix+"posts` WHERE `boardid` = "+strconv.Itoa(board.ID)+" AND `parentid` = "+strconv.Itoa(op_post.ID)+" LIMIT "+strconv.Itoa(limit))
if err != nil {
html += err.Error()+"<br />"
}
err = db.QueryRow("SELECT COUNT(*) FROM `"+config.DBprefix+"posts` WHERE `boardid` = "+strconv.Itoa(board.ID)+" AND `parentid` = "+strconv.Itoa(op_post.ID)).Scan(&thread.NumReplies)
if err != nil {
html += err.Error()+"<br />"
}
thread.OP = op_post_i
if len(posts_in_thread) > 0 {
thread.BoardReplies = posts_in_thread
} }
threads = append(threads, thread) threads = append(threads, thread)
} }

73
templates/img_boardpage.html
View file

@ -50,37 +50,60 @@
<hr /> <hr />
<div id="content"> <div id="content">
<form action="/util" method="POST" id="main-form"> <form action="/util" method="POST" id="main-form">
{{range $t, $thread := $thread_arr.Data}}{{range $post_num,$post := $thread.Posts}}{{$post := getInterface $thread.Posts $post_num}}<div class="thread" id="{{$post.ID}}">{{if intEq $post_num 0}} {{range $t, $thread := $thread_arr.Data}}
{{if stringNeq $post.Filename ""}}{{if stringNeq $post.Filename "deleted"}}<span class="file-info">File: <a href="{{$board.Dir}}/src/{{$post.Filename}}">{{$post.Filename}}</a> - ({{formatFilesize $post.Filesize}} , {{$post.ImageW}}x{{$post.ImageH}}, {{$post.FilenameOriginal}} )</span><br />{{end}}
{{if stringEq $post.Filename "deleted"}}<div class="file-deleted-box"><center>File removed</center></div>{{else}}<a href="{{$config.SiteWebfolder}}{{$board.Dir}}/src/{{$post.Filename}}" target="_blank"><img src="{{$config.SiteWebfolder}}{{$board.Dir}}/thumb/{{imageToThumbnailPath $post.Filename}}" width="{{$post.ThumbW}}" height="{{$post.ThumbH}}" class="thumbnail" /></a>{{end}}{{end}} {{$post := $thread.OP}}
<label class="post-info"><input type="checkbox" id="{{$post.ID}}" name="check{{$post.ID}}" /> <span class="subject">{{$post.Subject}}</span> <span class="postername">{{if stringNeq $post.Email ""}}<a href="mailto:{{$post.Email}}">{{if stringEq $post.Name ""}}{{$board.Anonymous}}{{else}}{{$post.Name}}{{end}}</a>{{end}}</span>{{if stringNeq $post.Tripcode ""}}<span class="tripcode">!{{$post.Tripcode}}</span>{{end}} {{formatTimestamp $post.Timestamp}} <a href="/{{$board.Dir}}/res/{{$post.ID}}.html#{{$post.ID}}">No.</a> <a href="/{{$board.Dir}}/res/{{$post.ID}}.html#i{{$post.ID}}">{{$post.ID}}</a></label> <span class="post-links"> <span class="thread-ddown">[<a href="javascript:void(0)">&#9660;</a>]</span> [<a href="/{{$board.Dir}}/res/{{$post.ID}}.html">View</a>] </span><br /> <div class="thread" id="{{$post.ID}}">
<div class="posttext"> {{if stringNeq $post.Filename ""}}
{{$post.Message}} {{if stringNeq $post.Filename "deleted"}}
</div>{{else}}<b>{{$num_replies := len $thread.Posts}}{{subtract $num_replies 4}} omitted</b> <span class="file-info">File: <a href="{{$board.Dir}}/src/{{$post.Filename}}">{{$post.Filename}}</a> - ({{formatFilesize $post.Filesize}} , {{$post.ImageW}}x{{$post.ImageH}}, {{$post.FilenameOriginal}} )</span><br />
{{if gt $post_num 1}}<div class="post" id="{{$post.ID}}"> {{end}}
<label class="post-info"><input type="checkbox" id="{{$post.ID}}" name="check{{$post.ID}}" /> <span class="postername">{{if stringEq $post.Name ""}}{{$board.Anonymous}}{{else}}{{$post.Name}}{{end}}</span>{{if stringNeq $post.Tripcode ""}}<span class="tripcode">!{{$post.Tripcode}}</span>{{end}} {{formatTimestamp $post.Timestamp}} <a href="135693079632">No.</a> <a href="{{$post.ID}}i">{{$post.ID}}</a></label> <span class="post-links"><span class="thread-ddown">[<a href="javascript:void(0)">&#9660;</a>]</span></span><br /> {{if stringEq $post.Filename "deleted"}}
{{if stringNeq $post.Filename ""}}<span class="file-info">File: <a href="{{$board.Dir}}/src/{{$post.Filename}}">{{$post.Filename}}</a> - ({{formatFilesize $post.Filesize}} , {{$post.ImageW}},{{$post.ImageH}}, {{$post.FilenameOriginal}} )</span><br /> <div class="file-deleted-box">
<a href="{{$config.SiteWebfolder}}{{$board.Dir}}/src/{{$post.Filename}}" target="_blank"><img src="{{$config.SiteWebfolder}}{{$board.Dir}}/thumb/{{imageToThumbnailPath $post.Filename}}" width="{{$post.ThumbW}}" height="{{$post.ThumbH}}" class="thumbnail" /></a>{{end}} <center>File removed</center>
<div class="posttext"> </div>
{{$post.Message}} {{else}}
</div> <a href="{{$config.SiteWebfolder}}{{$board.Dir}}/src/{{$post.Filename}}" target="_blank"><img src="{{$config.SiteWebfolder}}{{$board.Dir}}/thumb/{{imageToThumbnailPath $post.Filename}}" width="{{$post.ThumbW}}" height="{{$post.ThumbH}}" class="thumbnail" /></a>
</div>{{end}}{{end}}{{end}} {{end}}
</div><hr />{{end}} {{end}}
<label class="post-info"><input type="checkbox" id="{{$post.ID}}" name="check{{$post.ID}}" /> <span class="postername">{{if stringEq $post.Name ""}}{{$board.Anonymous}}{{else}}{{$post.Name}}{{end}}</span>{{if stringNeq $post.Tripcode ""}}<span class="tripcode">!{{$post.Tripcode}}</span>{{end}} {{formatTimestamp $post.Timestamp}} <a href="135693079632">No.</a> <a href="{{$post.ID}}i">{{$post.ID}}</a></label> <span class="post-links"><span class="thread-ddown">[<a href="javascript:void(0)">&#9660;</a>]</span></span><br />
<div class="posttext">
{{$post.Message}}<br />
{{if gt $thread.NumReplies 3}}
<b>{{subtract $thread.NumReplies 3}} post{{if gt $thread.NumReplies 4}}s{{end}} omitted</b>
{{end}}
</div>
{{range $r, $reply := $thread.BoardReplies}}
<div class="post" id="{{$reply.ID}}">
<label class="post-info"><input type="checkbox" id="{{$reply.ID}}" name="check{{$reply.ID}}" /> <span class="postername">{{if stringEq $reply.Name ""}}{{$board.Anonymous}}{{else}}{{$reply.Name}}{{end}}</span>{{if stringNeq $reply.Tripcode ""}}<span class="tripcode">!{{$reply.Tripcode}}</span>{{end}} {{formatTimestamp $reply.Timestamp}} <a href="135693079632">No.</a> <a href="{{$reply.ID}}i">{{$reply.ID}}</a></label> <span class="post-links"><span class="thread-ddown">[<a href="javascript:void(0)">&#9660;</a>]</span></span><br />
{{if stringNeq $reply.Filename ""}}
<span class="file-info">File: <a href="{{$board.Dir}}/src/{{$reply.Filename}}">{{$reply.Filename}}</a> - ({{formatFilesize $reply.Filesize}} , {{$reply.ImageW}},{{$reply.ImageH}}, {{$reply.FilenameOriginal}} )</span><br />
<a href="{{$config.SiteWebfolder}}{{$board.Dir}}/src/{{$reply.Filename}}" target="_blank"><img src="{{$config.SiteWebfolder}}{{$board.Dir}}/thumb/{{imageToThumbnailPath $reply.Filename}}" width="{{$reply.ThumbW}}" height="{{$reply.ThumbH}}" class="thumbnail" /></a>
{{end}}
<div class="posttext">
{{$reply.Message}}
</div>
</div>
{{end}}
</div>
<hr />
{{end}}
<div id="left-bottom-content"> <div id="left-bottom-content">
<span id="boardmenu-bottom"> <span id="boardmenu-bottom">
[{{range $i, $board := $board_arr.Data}} {{if gt $i 0}}/{{end}} <a href="/{{$board.Dir}}/">{{$board.Dir}}</a> {{end}}] [{{range $i, $board := $board_arr.Data}} {{if gt $i 0}}/{{end}} <a href="/{{$board.Dir}}/">{{$board.Dir}}</a> {{end}}]
</span> </span>
</div> </div>
<div id="right-bottom-content"> <div id="right-bottom-content">
<div id="report-delbox"> <div id="report-delbox">
<input type="hidden" name="board" value="{{$board.Dir}}" /> <input type="hidden" name="board" value="{{$board.Dir}}" />
<label>[<input type="checkbox" name="fileonly"/>File only]</label> <input type="password" size="10" name="password" /> <input type="submit" name="delete_btn" value="Delete" onclick="return confirm('Are you sure you want to delete these posts?');" /><br /> <label>[<input type="checkbox" name="fileonly"/>File only]</label> <input type="password" size="10" name="password" /> <input type="submit" name="delete_btn" value="Delete" onclick="return confirm('Are you sure you want to delete these posts?');" /><br />
Reason: <input type="text" size="10" name="reason" /> <input type="submit" name="report_btn" value="Report" /> Reason: <input type="text" size="10" name="reason" /> <input type="submit" name="report_btn" value="Report" />
</div>
</div> </div>
</div> </form>
</form>
</div> </div>
<div id="footer"> <div id="footer">
<a href="{{$config.SiteWebfolder}}">Home</a> | <a href="{{$config.SiteWebfolder}}#boards">Boards</a> | <a href="{{$config.SiteWebfolder}}#rules">Rules</a> | <a href="{{$config.SiteWebfolder}}#faq">FAQ</a><br /> <a href="{{$config.SiteWebfolder}}">Home</a> | <a href="{{$config.SiteWebfolder}}#boards">Boards</a> | <a href="{{$config.SiteWebfolder}}#rules">Rules</a> | <a href="{{$config.SiteWebfolder}}#faq">FAQ</a><br />