From bfaa5bbe2b7a86d5d71325c795c34fb91bb1eeb9 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 27 Feb 2024 00:25:17 +0100 Subject: [PATCH] ${signatures} -gt ${gloops} :: send gratitude for > 1 signature tiddler (copied at least once) --- RUNTIME/RSS2UPlanetSECTORTW.sh | 50 ++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/RUNTIME/RSS2UPlanetSECTORTW.sh b/RUNTIME/RSS2UPlanetSECTORTW.sh index f17107bc..113229e7 100755 --- a/RUNTIME/RSS2UPlanetSECTORTW.sh +++ b/RUNTIME/RSS2UPlanetSECTORTW.sh @@ -39,6 +39,8 @@ ${RSS} cat "${RSS}" | jq 'sort_by(.created) | reverse | .[]' | jq -r '.title' > ~/.zen/tmp/${MOATS}/${SECTOR}/tiddlers.list ## gloops=0 +signatures=0 + while read title; do [[ ${floop} -gt 2 ]] && echo "0lder Tiddlers are similaR... BREAK" && break @@ -54,7 +56,12 @@ while read title; do [[ ! "${ISHERE}" ]] && echo "No Tiddler found in ${INDEX}" - if [[ "${ISHERE}" != "${title}" ]]; then + TMPTAGS=$(cat ~/.zen/tmp/${MOATS}/TMP.json | jq -r .[].tags) + TMPEMAILS=($(echo "$TMPTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) + TMPSIGN=${#TMPEMAILS[@]} + echo "INSIDE TIDDLER HAVE ${TMPSIGN} SIGNATURE(S)" + + if [[ "${ISHERE}" != "${title}" || ${TMPSIGN} == 0 ]]; then ## NEW TIDDLER echo "Importing Title: $title" @@ -72,14 +79,15 @@ while read title; do && rm ${INDEX} \ && mv ~/.zen/tmp/${MOATS}/${SECTOR}/${SECTOR}.html ${INDEX} \ && ((gloops++)) \ - && echo "SECTOR (${gloops}) : ${title}" + && echo "SECTOR (${gloops}) : ${title}" \ + && signatures=$((signatures + TMPSIGN)) [[ ! -s ${INDEX} ]] && echo "ERROR. TW did not ingest ~/.zen/tmp/${MOATS}/NEW.json" && exit 1 else ## SAME TIDDLER - echo "TIDDLER WITH TITLE $title ALREADY EXISTS..." + echo "TIDDLER WITH TITLE $title and more than 1 signature ALREADY EXISTS..." cp -f ~/.zen/tmp/${MOATS}/TMP.json ~/.zen/tmp/${MOATS}/INSIDE.json cat "${RSS}" | jq -rc ".[] | select(.title == \"$title\")" > ~/.zen/tmp/${MOATS}/NEW.json @@ -90,17 +98,23 @@ while read title; do continue fi floop=1 - + echo + echo "=========== INSIDE.json" + cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -c + echo + echo "=========== NEW.json" + cat ~/.zen/tmp/${MOATS}/NEW.json | jq -c + echo ## TODO EXTEND CONTROL TO text & ipfs & _canonical_url -## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP + ## NEED SIGNATURES & TIDDLER SIMILARITY TO COME UP ## CHECK FOR EMAIL SIGNATURES DIFFERENCE - NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags) + NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .[].tags) NEMAILS=($(echo "$NTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) NSIGN=${#NEMAILS[@]} echo "New Tiddler $NSIGN signatures : ${NEMAILS[*]}" - ITAGS=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .tags) + ITAGS=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .[].tags) IEMAILS=($(echo "$ITAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) ISIGN=${#IEMAILS[@]} echo "Inside Tiddler $ISIGN signatures : ${IEMAILS[*]}" @@ -128,7 +142,7 @@ while read title; do # Print the results echo "Common email addresses : ${COMMON[*]}" echo "Email addresses unique in NEW Tiddler : ${NUNIQUE[*]}" - echo "Email addresses unique in ACTUAL Tiddler : ${IUNIQUE[*]}" + echo "Email addresses unique in INSIDE Tiddler : ${IUNIQUE[*]}" combined=("${IEMAILS[@]}" "${NEMAILS[@]}") unique_combined=($(echo "${combined[@]}" | tr ' ' '\n' | sort -u)) @@ -168,7 +182,7 @@ To Refuse

Actual TiddlerEngage discussion about it...

" > ~/.zen/tmp/${MOATS}/g1message - ${MY_PATH}/mailjet.sh "$email" ~/.zen/tmp/${MOATS}/g1message "TIDDLER COLLISION" + ${MY_PATH}/../tools/mailjet.sh "$email" ~/.zen/tmp/${MOATS}/g1message "TIDDLER COLLISION" done @@ -178,12 +192,12 @@ To Refuse
fi ## CHECK DIFFERENCE - DATENEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .modified) - TEXTNEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .text) - TAGSNEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags) - DATEINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .modified) - TEXTINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .text) - TAGSINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .tags) + DATENEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .[].modified) + TEXTNEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .[].text) + TAGSNEW=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .[].tags) + DATEINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .[].modified) + TEXTINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .[].text) + TAGSINSIDE=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .[].tags) TIDLEREMAILSNEW=($(echo "$TAGSNEW" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) ## MUST BE SAME IN BOTH TIDLEREMAILSINSIDE=($(echo "$TAGSINSIDE" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) ## MUST BE SAME IN BOTH @@ -201,6 +215,8 @@ To Refuse
&& rm ${INDEX} \ && mv ~/.zen/tmp/${MOATS}/${SECTOR}.html ${INDEX} + signatures=$((signatures + ISIGN)) + fi fi @@ -213,11 +229,11 @@ To Refuse
done < ~/.zen/tmp/${MOATS}/${SECTOR}/tiddlers.list #################################################### -################################################ +################################################ ${signatures} -gt ${gloops} ## SECTOR SENDS GRATITUDE TO PUBLISHING PLAYER ################################################### -if [[ ${gloops} -gt 0 && ${ASTROG1} ]]; then +if [[ ${gloops} -gt 0 && ${signatures} -gt ${gloops} && ${ASTROG1} ]]; then # GENERATE SECTOR PRIVATE KEY ################################ ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/sector.dunikey "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}" G1SECTOR=$(cat ~/.zen/tmp/${MOATS}/sector.dunikey | grep 'pub:' | cut -d ' ' -f 2)