blankie
/
nitter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix missing "Show thread" links

This commit is contained in:
Zed 2019-09-19 03:51:15 +02:00
parent 10bcf99205
commit 19659de410
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sass/tweet/_base.scss
View File

@ -118,6 +118,7 @@
.show-thread { .show-thread {
display: block; display: block;
pointer-events: all;
} }
.unavailable-box { .unavailable-box {

5
src/views/timeline.nim
View File

@ -35,8 +35,9 @@ proc renderNoneFound(): VNode =
proc renderThread(thread: seq[Tweet]; prefs: Prefs; path: string): VNode = proc renderThread(thread: seq[Tweet]; prefs: Prefs; path: string): VNode =
buildHtml(tdiv(class="thread-line")): buildHtml(tdiv(class="thread-line")):
for i, threadTweet in thread.sortedByIt(it.time): for i, threadTweet in thread.sortedByIt(it.time):
let show = i == thread.len and thread[0].id != threadTweet.threadId
renderTweet(threadTweet, prefs, path, class="thread", renderTweet(threadTweet, prefs, path, class="thread",
index=i, total=thread.high) index=i, total=thread.high, showThread=show)
proc threadFilter(it: Tweet; tweetThread: string): bool = proc threadFilter(it: Tweet; tweetThread: string): bool =
it.retweet.isNone and it.reply.len == 0 and it.threadId == tweetThread it.retweet.isNone and it.reply.len == 0 and it.threadId == tweetThread
@ -83,7 +84,7 @@ proc renderTimelineTweets*(results: Result[Tweet]; prefs: Prefs; path: string):
if tweet.threadId in threads: continue if tweet.threadId in threads: continue
let thread = results.content.filterIt(threadFilter(it, tweet.threadId)) let thread = results.content.filterIt(threadFilter(it, tweet.threadId))
if thread.len < 2: if thread.len < 2:
renderTweet(tweet, prefs, path) renderTweet(tweet, prefs, path, showThread=tweet.hasThread)
else: else:
renderThread(thread, prefs, path) renderThread(thread, prefs, path)
threads &= tweet.threadId threads &= tweet.threadId

4
src/views/tweet.nim
View File

@ -222,7 +222,7 @@ proc renderQuote(quote: Quote; prefs: Prefs): VNode =
text "Show this thread" text "Show this thread"
proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class=""; proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class="";
index=0; total=(-1); last=false): VNode = index=0; total=(-1); last=false; showThread=false): VNode =
var divClass = class var divClass = class
if index == total or last: if index == total or last:
divClass = "thread-last " & class divClass = "thread-last " & class
@ -265,6 +265,6 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class="";
if not prefs.hideTweetStats: if not prefs.hideTweetStats:
renderStats(tweet.stats, views) renderStats(tweet.stats, views)
if tweet.hasThread and "timeline" in class: if showThread:
a(class="show-thread", href=getLink(tweet)): a(class="show-thread", href=getLink(tweet)):
text "Show this thread" text "Show this thread"