From 6ce3f9c0b82d9059e8a1121dac8264424b8d011f Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sat, 8 Apr 2023 15:11:56 +0200
Subject: [PATCH] G1CopierYoutube Tag PATCH

---
 ASTROBOT/G1PalPay.sh                      | 33 ++++++++++++-----------
 tools/new_file_in_astroport.sh            |  6 +++--
 tools/search_for_this_email_in_players.sh |  4 +--
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/ASTROBOT/G1PalPay.sh b/ASTROBOT/G1PalPay.sh
index 907840b9..70b5889a 100755
--- a/ASTROBOT/G1PalPay.sh
+++ b/ASTROBOT/G1PalPay.sh
@@ -24,7 +24,7 @@ echo "$ME RUNNING"
 # IF COMMENT CONTAINS EMAIL ADDRESSES
 # THEN CREATE VISA+TW AND SEND PAIMENT REMOVING FIRST FROM LIST
 ########################################################################
-# this couls lead in several account creation sharing % of incomes each time
+# this could lead in several account creation sharing % of incomes each time
 ########################################################################
 INDEX="$1"
 [[ ! ${INDEX} ]] && INDEX="$HOME/.zen/game/players/.current/ipfs/moa/index.html"
@@ -102,25 +102,25 @@ while read LINE; do
             SALT="" && PEPPER=""
             echo "VISA.new : \"$SALT\" \"$PEPPER\" \"${EMAIL}\" \"$PSEUDO\" \"${URL}\""
 
-            if [[ ! $isLAN || $USER == "zen" ]]; then
+            #~ if [[ ! $isLAN || $USER == "zen" ]]; then
 
-                $(${MY_PATH}/../tools/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${URL}" | tail -n 1)
-                # export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS
+                #~ $(${MY_PATH}/../tools/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${URL}" | tail -n 1)
+                #~ # export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS
 
-            else
+            #~ else
 
-                ## CREATE new PLAYER IN myASTROTUBE
-                echo "https://astroport.cancer.copylaradio.com/?salt=0&pepper=0&g1pub=_URL_&email=${EMAIL}"
-                curl -so ~/.zen/tmp/${MOATS}/astro.port "https://astroport.cancer.copylaradio.com/?salt=0&pepper=0&g1pub=_URL_&email=${EMAIL}"
+                #~ ## CREATE new PLAYER IN myASTROTUBE
+                #~ echo "https://astroport.cancer.copylaradio.com/?salt=0&pepper=0&g1pub=_URL_&email=${EMAIL}"
+                #~ curl -so ~/.zen/tmp/${MOATS}/astro.port "https://astroport.cancer.copylaradio.com/?salt=0&pepper=0&g1pub=_URL_&email=${EMAIL}"
 
-                TELETUBE=$(cat ~/.zen/tmp/${MOATS}/astro.port | grep "(◕‿‿◕)" | cut -d ':' -f 2 | cut -d '/' -f 3)
-                TELEPORT=$(cat ~/.zen/tmp/${MOATS}/astro.port | grep "(◕‿‿◕)" | cut -d ':' -f 3 | cut -d '"' -f 1)
-                sleep 30
+                #~ TELETUBE=$(cat ~/.zen/tmp/${MOATS}/astro.port | grep "(◕‿‿◕)" | cut -d ':' -f 2 | cut -d '/' -f 3)
+                #~ TELEPORT=$(cat ~/.zen/tmp/${MOATS}/astro.port | grep "(◕‿‿◕)" | cut -d ':' -f 3 | cut -d '"' -f 1)
+                #~ sleep 30
 
-                curl -so ~/.zen/tmp/${MOATS}/astro.rep "http://$TELETUBE:$TELEPORT"
-                $(cat ~/.zen/tmp/${MOATS}/astro.rep | tail -n 1) ## SOURCE LAST LINE (SEE SALT PEPPER EMAIL API RETURN)
+                #~ curl -so ~/.zen/tmp/${MOATS}/astro.rep "http://$TELETUBE:$TELEPORT"
+                #~ $(cat ~/.zen/tmp/${MOATS}/astro.rep | tail -n 1) ## SOURCE LAST LINE (SEE SALT PEPPER EMAIL API RETURN)
 
-            fi
+            #~ fi
 
             ######################################################
 
@@ -128,10 +128,11 @@ while read LINE; do
         fi
 
         [[ ! $ASTROG1 ]] \
-        && echo "MISSING ASTROG1" \
+        && echo "SORRY ${EMAIL} MISSING ASTROG1" \
+        && echo " $PLAYER  VEUX VOUS OFFRIR ${SHARE} G1 \n Joignez-vous au Collectif ♥BOX https://opencollective.com/monnaie-libre/" > ~/.zen/tmp/palpay.bro \
+        && ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" "BRO. " ~/.zen/tmp/palpay.bro \
         && continue
 
-        ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" "BRO. $PLAYER  VOUS A OFFERT CE TW : $(myIpfsGw)/$ASTROTW" ## WELCOME NEW PLAYER
 
         ## MAKE FRIENDS & SEND G1
         echo "NEW PalPay Friend $ASTROMAIL
diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh
index 4f74687e..84df031a 100755
--- a/tools/new_file_in_astroport.sh
+++ b/tools/new_file_in_astroport.sh
@@ -269,7 +269,9 @@ then
     && SAISON=$(cat ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 5 | cut -d '_' -f 2) \
     && FILETAG=$(echo "$CapitalGluedTitle" | cut -d '_' -f 1)
 
-    [[ $CAT == "Youtube" ]] && H1="<h1><a target='youtube' href='https://www.youtube.com/watch?v="$(cat ${REFERENCE} | rev | cut -d '_' -f 1 | rev)"'>"${TITLE}"</a></h1>"
+    [[ $CAT == "Youtube" ]] \
+    && H1="<h1><a target='youtube' href='https://www.youtube.com/watch?v="$(cat ${REFERENCE} | rev | cut -d '_' -f 1 | rev)"'>"${TITLE}"</a></h1>" \
+    && PATCH="Copier"
 
     echo $GENRE $SAISON
 
@@ -284,7 +286,7 @@ then
         "$H1"<h2>"$DESCRIPTION"</h2>"
 
         TidType="text/vnd.tiddlywiki" ## MAYBE REAL ONCE TW CAN SHOW ATTACHED IPFS VIDEO (TODO: TESTINGS)
-        TAGS="G1${CAT} ${PLAYER} ${FILETAG} $SAISON $GENRE ipfs ${HASHTAG} $YEAR $MIME"
+        TAGS="G1${PATCH}${CAT} ${PLAYER} ${FILETAG} $SAISON $GENRE ipfs ${HASHTAG} $YEAR $MIME"
         # TyPE="$MIME"
         # CANON="/ipfs/"${IPFSID}
         CANON=''
diff --git a/tools/search_for_this_email_in_players.sh b/tools/search_for_this_email_in_players.sh
index 2331bfef..c77c1b20 100755
--- a/tools/search_for_this_email_in_players.sh
+++ b/tools/search_for_this_email_in_players.sh
@@ -9,8 +9,8 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 ME="${0##*/}"
 
 . "${MY_PATH}/my.sh"
-### TODO MAKE IT WORKS BETTER
 ### USE 12345 MAP
+## EXPLORE SWARM BOOTSTRAP REPLICATED TW CACHE
 
     start=`date +%s`
     MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
@@ -40,7 +40,7 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
 
 else
 
-    echo "export ASTROTW="" # ${EMAIL} NOT FOUND"
+    echo "export ASTROTW='' # ${EMAIL} NOT FOUND"
     exit 0
 
 fi