From f378eedcc862c6a4c81244efb6ceed388b45abd7 Mon Sep 17 00:00:00 2001 From: Zed Date: Tue, 2 Jul 2019 01:01:27 +0200 Subject: [PATCH] Hide "Replying to" in threads when appropriate --- src/views/tweet.nimf | 4 ++-- src/views/user.nimf | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/tweet.nimf b/src/views/tweet.nimf index e2fc056..035991a 100644 --- a/src/views/tweet.nimf +++ b/src/views/tweet.nimf @@ -155,7 +155,7 @@ #end proc # -#proc renderTweet*(tweet: Tweet; class=""; last=false): string = +#proc renderTweet*(tweet: Tweet; class=""; first=true; last=false): string = #var divClass = if last: "thread-last " & class else: class #if divClass.len > 0:
@@ -164,7 +164,7 @@
${renderHeading(tweet)} - #if tweet.reply.len > 0: + #if first and tweet.reply.len > 0: ${renderReply(tweet)} #end if
diff --git a/src/views/user.nimf b/src/views/user.nimf index 9b700b2..0aec49d 100644 --- a/src/views/user.nimf +++ b/src/views/user.nimf @@ -106,8 +106,8 @@
#if conversation.before.tweets.len > 0:
- #for tweet in conversation.before.tweets: - ${renderTweet(tweet)} + #for i, tweet in conversation.before.tweets: + ${renderTweet(tweet, first=(i == 0))} #end for
#end if @@ -118,7 +118,7 @@ #if conversation.after.tweets.len > 0:
#for i, tweet in conversation.after.tweets: - ${renderTweet(tweet, last=(i == conversation.after.tweets.high))} + ${renderTweet(tweet, first=(i == 0), last=(i == conversation.after.tweets.high))} #end for
#end if @@ -128,7 +128,8 @@ #for thread in conversation.replies:
#for i, tweet in thread.tweets: - ${renderTweet(tweet, last=(i == thread.tweets.high and thread.more == 0))} + #let last = (i == thread.tweets.high and thread.more == 0) + ${renderTweet(tweet, first=(i == 0), last=last)} #end for #if thread.more != 0: #let num = if thread.more != -1: $thread.more & " " else: ""