X-Git-Url: https://software.frrobert.com/lace/blobdiff_plain/e8f2635964ea55125de802da6faa7193bdf1f88d..HEAD:/laced

diff --git a/laced b/laced
index debf547..9afbcaf 100755
--- a/laced
+++ b/laced
@@ -90,20 +90,22 @@ function timeline() {
 				url="$url/"
 			fi
 			domain=$(sed 's/\/.*$//' <<< "$domain")
-			fav=$(timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"gemini://$domain/favicon.txt" 2>/dev/null | sed -e '1d')
+			timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3
 			timeoutstatus=${PIPESTATUS[0]}
 			if [ $timeoutstatus -ne 124 ];then
-			if [ ! -z "$fav" ];then
-				user="$fav $user"
-			fi
-			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 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"
+	else
+	fav=$(timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"gemini://$domain/favicon.txt" 2>/dev/null | sed -e '1d')
+if [ ! -z "$fav" ];then
+	user="$fav $user"
+	fi
+		
 			fi
 
 
@@ -111,7 +113,8 @@ function timeline() {
 			[[ ! -z $(sed -n '$p' $tmpfile) ]] && echo "" >> $tmpfile
 			fi
 		done <"$subsfile"
-		cat $tmpfile | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sed -rn '/^## .*/p' | sed -e 's/\v/\n/g' | sed -e "s/^## \(.*\)/date -d '\1' +%s/e" | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sort -r | sed -e 's/\v/\n/g'  > $tmpfile
+		cat $tmpfile | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sed -rn '/^## .*/p' | sed -e 's/\v/\n/g' | sed -e "s/^## \(.*\)/date -d '\1' +%s/e" | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sort -r | sed -e 's/\v/\n/g'  > $tmpfile3
+cp $tmpfile3 $tmpfile
 
 
 	# removed segment of code	| sed "s/^\([0-9]\+\)$/{reldate \1 $now_unix;}/e" | sed "s/^\([0-9]* [a-z]* ago\)$/${esc}$blue\1${esc}$nc/g"
@@ -130,6 +133,7 @@ function timeline() {
 	wordcount="$(wc -c $tmpfile | awk '{print $1}')"
 	if [[ "$wordcount" > 100 ]]; then
        cp $tmpfile $config_place/microblogs.gmi 
+       cp $tmpfile /mnt/geminiserver/gemini/lace.gmi
 	else
 		
 sed -i '1i Laced could not connect to the Internet showing previous download' $config_place/microblogs.gmi
@@ -156,7 +160,7 @@ elif [[ "$1" == "unsub" ]];then
 elif [[ "$1" == "subs" ]];then
 	awk '{print $2" ("$1")"}' $subsfile 
 elif [[ "$1" == "update" ]];then
-	curl https://raw.githubusercontent.com/frrobert2/lace/main/laced > "${BASH_SOURCE[0]}"
+	curl https://gitlab.com/frrobert2/lace/-/raw/dev/laced > "${BASH_SOURCE[0]}"
 else
 	now_unix="$(date +'%s')"
 		timeline