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

Make IP ban page template compatible with new API

Browse source
This commit is contained in:
Eggbertx 2022-11-29 12:06:08 -08:00
parent 292b2a8f2f
commit 7e5a78fa8c
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkg/building/posts.go
View file

@ -82,12 +82,16 @@ func (p Post) TitleText() string {
return title
}
func (p Post) WebPath() string {
func (p Post) ThreadPath() string {
threadID := p.ParentID
if threadID == 0 {
threadID = p.ID
}
return config.WebPath(p.BoardDir, "res", strconv.Itoa(threadID)+".html#"+strconv.Itoa(p.ID))
return config.WebPath(p.BoardDir, "res", strconv.Itoa(threadID)+".html")
}
func (p Post) WebPath() string {
return p.ThreadPath() + "#" + strconv.Itoa(p.ID)
}
func (p Post) ThumbnailPath() string {

10
pkg/posting/bans.go
View file

@ -1,6 +1,7 @@
package posting
import (
"bytes"
"net/http"
"github.com/gochan-org/gochan/pkg/config"
@ -22,7 +23,13 @@ func showBanpage(ban gcsql.Ban, banType string, upload *gcsql.Upload, post *gcsq
if upload != nil {
tmplMap["filename"] = upload.OriginalFilename
}
err := serverutil.MinifyTemplate(gctemplates.Banpage, tmplMap, writer, "text/html")
ipb, ok := ban.(*gcsql.IPBan)
if ok {
tmplMap["permanent"] = ipb.Permanent
tmplMap["expires"] = ipb.ExpiresAt
}
banPageBuffer := bytes.NewBufferString("")
err := serverutil.MinifyTemplate(gctemplates.Banpage, tmplMap, banPageBuffer, "text/html")
if err != nil {
gcutil.LogError(err).
Str("IP", post.IP).
@ -32,6 +39,7 @@ func showBanpage(ban gcsql.Ban, banType string, upload *gcsql.Upload, post *gcsq
serverutil.ServeErrorPage(writer, "Error minifying page: "+err.Error())
return
}
writer.Write(banPageBuffer.Bytes())
ev := gcutil.LogInfo().
Str("IP", post.IP).
Str("boardDir", postBoard.Dir).

29
templates/banpage.html
View file

@ -15,17 +15,17 @@
</div><br />
<div class="section-block" style="margin: 0px 26px 0px 24px">
<div class="section-title-block">
<span class="section-title"><b>{{if bannedForever .ban}}YOUR'E PERMABANNED, IDIOT!{{else if isBanned .ban .banBoards}}YOU ARE BANNED :({{else}}YOU ARE NOT BANNED :){{end}}</b></span>
<span class="section-title"><b>{{if bannedForever .ban}}YOUR'E PERMABANNED, IDIOT!{{else}}YOU ARE BANNED :({{end}}</b></span>
</div>
<div class="section-body" style="padding-top:8px">{{if not (isBanned .ban .banBoards)}}<div style="text-align:center;">You're not banned. Good job.</div><br /><img id="banpage-image" src="/notbanned.png" style="display: block;margin-left: auto;margin-right: auto;"/><br />{{else}}
<div id="ban-info" style="float:left">{{if eq .ban.Boards ""}}
<div class="section-body" style="padding-top:8px">
<div id="ban-info" style="float:left">{{if .ban.IsGlobalBan}}
You are banned from posting on <b>all boards</b> for the following reason:{{else}}
You are banned from posting on <b>{{.ban.Boards}}</b> for the following reason:{{end}}
You are banned from posting on <b>{{.board.Dir}}</b> for the following reason:{{end}}
<br /><br />
<b>{{.ban.Reason}}</b>
<br /><br />{{$expires_timestamp := formatTimestamp .ban.Expires}}{{$appeal_timestamp := formatTimestamp .ban.AppealAt}}
Your ban was placed on {{formatTimestamp .ban.Timestamp}} and will
{{if .ban.Permaban}}<b>not expire</b>{{else}}expire on <b>{{$expires_timestamp}}</b>{{end}}.<br />
<b>{{.ban.Message}}</b>
<br /><br />{{$expires_timestamp := formatTimestamp .ban.ExpiresAt}}{{$appeal_timestamp := formatTimestamp .ban.AppealAt}}
Your ban was placed on {{formatTimestamp .ban.IssuedAt}} and will
{{if .ban.Permanent}}<b>not expire</b>{{else}}expire on <b>{{$expires_timestamp}}</b>{{end}}.<br />
Your IP address is <b>{{.ban.IP}}</b>.<br /><br />
{{if .ban.CanAppeal}}You may appeal this ban:<br />
<form id="appeal-form" action="/banned" method="POST">
@ -33,16 +33,15 @@
<input type="submit" value="Submit" /><br />
</form>{{else}}You may <b>not</b> appeal this ban.<br />{{end}}
</div>{{if bannedForever .ban}}
<img id="banpage-image" src="/permabanned.png" style="float:right; margin: 4px 8px 8px 4px"/><br />
<img id="banpage-image" src="{{webPath "permabanned.jpg"}}" style="float:right; margin: 4px 8px 8px 4px"/><br />
<audio id="jack" preload="auto" autobuffer loop>
<source src="{{.systemCritical.WebRoot}}hittheroad.ogg" />
<source src="{{.systemCritical.WebRoot}}hittheroad.wav" />
<source src="{{.systemCritical.WebRoot}}hittheroad.mp3" />
<source src="{{webPath "hittheroad.ogg"}}" />
<source src="{{webPath "hittheroad.wav"}}" />
<source src="{{webPath "hittheroad.mp3"}}" />
</audio>
<script type="text/javascript">
document.getElementById("jack").play();
</script>{{else if isBanned .ban .banBoards}}
<img id="banpage-image" src="/banned.png" style="float:right; margin: 4px 8px 8px 4px"/><br />{{end}}
{{end}}</div>
</script>{{end}}
</div>
</div>
{{template "page_footer.html" .}}

2
templates/post.html
View file

@ -16,7 +16,7 @@
{{- if ne .post.Tripcode ""}}<span class="tripcode">!{{.post.Tripcode}}</span>{{end}} {{formatTimestamp .post.Timestamp -}}
</label><a href="{{.post.WebPath}}">No.</a> <a href="javascript:quote({{.post.ID}})" class="backlink-click">{{.post.ID}}</a> <span class="post-links"></span>
{{if $.is_board_page}}
[<a href="{{$.webroot}}{{$.board.Dir}}/res/{{$.post.ID}}.html">View</a>]
[<a href="{{$.post.ThreadPath}}">View</a>]
{{end}}<br />
{{- end -}}
{{- if $.post.IsTopPost -}}