From e8f2635964ea55125de802da6faa7193bdf1f88d Mon Sep 17 00:00:00 2001
From: frrobert2 <frrobert@stnectarios.org>
Date: Thu, 10 Jun 2021 13:26:45 -0400
Subject: [PATCH] bug fix

---
 lace  | 9 +++++----
 laced | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lace b/lace
index 3929cac..bf89aeb 100755
--- a/lace
+++ b/lace
@@ -97,12 +97,13 @@ function timeline() {
 				user="$fav $user"
 			fi
 			timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3
-              local newuser=$(cat $tmpfile3 | sed -n '/# /{n;p;}' | grep -e author | awk '{print $2}'  )
-		local newavatar=$(cat $tmpfile3 | sed -n '/# /{n;n;p;}' | grep -e avatar | awk '{print $2}'  )
+              	local newuser=$(cat $tmpfile3 | grep -m 1 author: | awk -F ":" '{print $2}'  )
+		local newavatar=$(cat $tmpfile3 | grep -m 1 avatar: | awk -F ":" '{print $2}'  )
 			if [[ $newuser != "" ]]
 			then
-				
-			user="$newavatar $newuser"
+	newuser=$(echo "$newuser" | xargs)
+	newavatar=$(echo "$newavatar" | xargs)
+		user="$newavatar $newuser"
 			fi
 
 			cat $tmpfile3 | sed -e '1d' | sed -n '/##/,$p' | sed -e "s/^\(## .*\)$/\1\n${esc}$red$user${esc}$nc ($domain)/g" >> $tmpfile
diff --git a/laced b/laced
index 3a855f5..debf547 100755
--- a/laced
+++ b/laced
@@ -97,12 +97,13 @@ function timeline() {
 				user="$fav $user"
 			fi
 			timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3
-		local newuser=$(cat $tmpfile3 | sed -n '/# /{n;p;}' | grep -e author | awk '{print $2}'  )
-		local newavatar=$(cat $tmpfile3 | sed -n '/# /{n;n;p;}' | grep -e avatar | awk '{print $2}'  )
+		local newuser=$(cat $tmpfile3 | grep -m 1 author: | awk -F ":" '{print $2}'  )
+		local newavatar=$(cat $tmpfile3 | grep -m 1 avatar: | awk -F ":" '{print $2}'  )
 			if [[ $newuser != "" ]]
 			then
-				
-			user="$newavatar $newuser"
+	newuser=$(echo "$newuser" | xargs)
+	newavatar=$(echo "$newavatar" | xargs)
+		user="$newavatar $newuser"
 			fi
 
 
-- 
1.8.3.1