diff options
Diffstat (limited to 'templates/status.tmpl')
| -rw-r--r-- | templates/status.tmpl | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/templates/status.tmpl b/templates/status.tmpl index a1e2d9f..9109f4e 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -3,7 +3,7 @@ {{if .Reblog}} <div class="retweet-info"> <a class="img-link" href="/user/{{.Account.ID}}"> - <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="24" /> + <img class="status-profile-img" src="{{.Account.Avatar}}" title="@{{.Account.Acct}}" alt="avatar" height="24" /> </a> <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi> <a href="/user/{{.Account.ID}}"> @@ -18,7 +18,7 @@ <div class="status-container status-{{.ID}}" data-id="{{.ID}}"> <div class="status-profile-img-container"> <a class="img-link" href="/user/{{.Account.ID}}"> - <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" /> + <img class="status-profile-img" src="{{.Account.Avatar}}" title="@{{.Account.Acct}}" alt="avatar" height="48" /> </a> </div> <div class="status"> @@ -88,7 +88,7 @@ {{end}} </div> {{if .Content}} - <div class="status-content"> {{StatusContentFilter .SpoilerText .Content .Emojis .Mentions}} </div> + <div class="status-content"> {{StatusContentFilter (html .SpoilerText) .Content .Emojis .Mentions}} </div> {{end}} {{if .MediaAttachments}} <div class="status-media-container"> @@ -101,7 +101,7 @@ </a> {{else}} <a class="img-link" href="{{.URL}}" target="_blank" title="{{.Description}}"> - <img class="status-image" src="{{.URL}}" alt="status-image" height="240" /> + <img class="status-image" src="{{.PreviewURL}}" alt="status-image" height="240" /> {{if (and $.Ctx.MaskNSFW $s.Sensitive)}} <div class="status-nsfw-overlay"></div> {{end}} @@ -153,12 +153,12 @@ {{range $i, $o := .Poll.Options}} <div class="poll-option"> {{if (or $s.Poll.Expired $s.Poll.Voted)}} - <div> {{EmojiFilter $o.Title $s.Emojis}} - {{$o.VotesCount}} votes </div> + <div> {{EmojiFilter (html $o.Title) $s.Emojis}} - {{$o.VotesCount}} votes </div> {{else}} <input type="{{if $s.Poll.Multiple}}checkbox{{else}}radio{{end}}" name="choices" id="poll-{{$s.ID}}-{{$i}}" value="{{$i}}"> <label for="poll-{{$s.ID}}-{{$i}}"> - {{EmojiFilter $o.Title $s.Emojis}} + {{EmojiFilter (html $o.Title) $s.Emojis}} </label> {{end}} </div> @@ -193,24 +193,19 @@ </a> </div> <div class="status-action"> - {{if or (eq .Visibility "private") (eq .Visibility "direct")}} - <a class="status-retweet" href="" title="this status cannot be retweeted"> - retweet - </a> - {{else}} {{$rt := "retweet"}} {{if .Reblogged}} {{$rt = "unretweet"}} {{end}} <form class="status-retweet" data-action="{{$rt}}" action="/{{$rt}}/{{.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}"> - <input type="submit" value="{{$rt}}" class="btn-link"> + <input type="submit" value="{{$rt}}" class="btn-link" + {{if or (eq .Visibility "private") (eq .Visibility "direct")}}title="this status cannot be retweeted" disabled{{end}}> <a class="status-retweet-count" href="/retweetedby/{{.ID}}" title="click to see the the list"> {{if and (not $.Ctx.AntiDopamineMode) .ReblogsCount}} ({{DisplayInteractionCount .ReblogsCount}}) {{end}} </a> </form> - {{end}} </div> <div class="status-action"> {{$like := "like"}} {{if .Favourited}} {{$like = "unlike"}} {{end}} |