bug fix

[lace] / laced

diff --git a/laced b/laced
index d779bb76fd3c46adbe48e9f2656ee3537dac3e0a..debf5475ba4fc2021a78a894bc5b455ea8dd69c2 100755 (executable)
--- a/laced
+++ b/laced
@@ -21,8 +21,15 @@ red="[31m"
 blue="[34m"
 nc="[m"
 esc=$(echo -e "\033")
+       if [[ "$1" == "strict" ]] || [[ "$1" == "--strict" ]] || [[ "$1" == "-strict" ]] || [[ "$1" == "-s" ]];then
+               red=""
+               blue=""
+               nc=""
+               esc=""
+       fi
 tmpfile=$(mktemp /tmp/lace.XXXXXX)
 tmpfile2=$(mktemp /tmp/lace.XXXXXX)
+tmpfile3=$(mktemp /tmp/lace.XXXXXX)
 function reldate() {
 # stolen from https://unix.stackexchange.com/a/451216
     local SEC_PER_MINUTE=$((60))
@@ -89,7 +96,18 @@ function timeline() {
                        if [ ! -z "$fav" ];then
                                user="$fav $user"
                        fi
-                       timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null | sed -e '1d' | sed -n '/##/,$p' | sed -e "s/^\(## .*\)$/\1\n${esc}$red$user${esc}$nc ($domain)/g" >> $tmpfile
+                       timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3
+               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
+       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
                        [[ ! -z $(sed -n '$p' $tmpfile) ]] && echo "" >> $tmpfile
                        fi
                done <"$subsfile"
@@ -119,7 +137,7 @@ sed -i '1i Laced could not connect to the Internet showing previous download' $c
        fi
 
 
-       rm -f $tmpfile $tmpfile2
+       rm -f $tmpfile $tmpfile2 $tmpfile3
        }
 
        if [[ "$1" == "help" ]] || [[ "$1" == "--help" ]] || [[ "$1" == "-help" ]] || [[ "$1" == "-h" ]];then