remove colored in messages and likes

This commit is contained in:
qo-op 2021-05-20 12:56:19 +02:00
parent 24c5fc60a5
commit f9da0812e6
5 changed files with 23 additions and 14 deletions

View File

@ -20,3 +20,14 @@
* Email de fred: support@qo-op.com (principal contributeur) * Email de fred: support@qo-op.com (principal contributeur)
* contributeur Hayssam: https://t.me/hayssamhoballah * contributeur Hayssam: https://t.me/hayssamhoballah
# jaklis : commandes de messaging / like
```
## GET ALERT MESSAGES
~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" read -n300 -j | jq -r --arg friendKEY "$G1PUB" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ALERT")' | jq -r '.id'
## SEND MONITORING MESSAGE TO onelove
~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d "Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS" -t "MONITORING" -f ~/.zen/A_my_swarm.txt
## LINKING ME PEOPLE
~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" stars | jq -r '.likes[].issuer'

View File

@ -3,7 +3,6 @@ from lib.natools import fmt, sign, get_privkey, box_decrypt, box_encrypt
from time import sleep from time import sleep
from hashlib import sha256 from hashlib import sha256
from datetime import datetime from datetime import datetime
from termcolor import colored
from lib.cesiumCommon import CesiumCommon, PUBKEY_REGEX from lib.cesiumCommon import CesiumCommon, PUBKEY_REGEX
class ReadLikes(CesiumCommon): class ReadLikes(CesiumCommon):
@ -112,7 +111,7 @@ class SendLikes(CesiumCommon):
def configDoc(self, profile, likes): def configDoc(self, profile, likes):
if not profile: profile = self.pubkey if not profile: profile = self.pubkey
if likes not in range(0, 6): if likes not in range(0, 6):
sys.stderr.write(colored('Votre like doit être compris entre 0 et 5.\n', 'red')) sys.stderr.write('Votre like doit être compris entre 0 et 5.\n')
return False return False
@ -156,7 +155,7 @@ class SendLikes(CesiumCommon):
result = requests.post('{0}/user/profile/:id/_like'.format(self.pod), headers=headers, data=document) result = requests.post('{0}/user/profile/:id/_like'.format(self.pod), headers=headers, data=document)
if result.status_code == 200: if result.status_code == 200:
print(colored("Profile liké avec succès !", 'green')) print("Profile liké avec succès !")
return result.text return result.text
elif result.status_code == 400: elif result.status_code == 400:
resultJson = json.loads(result.text) resultJson = json.loads(result.text)
@ -236,7 +235,7 @@ class UnLikes(CesiumCommon):
if result.status_code == 200: if result.status_code == 200:
if not silent: if not silent:
print(colored("Like supprimé avec succès !", 'green')) print("Like supprimé avec succès !")
return result.text return result.text
else: else:
sys.stderr.write("Echec de l'envoi du document de lecture des messages...\n" + result.text + '\n') sys.stderr.write("Echec de l'envoi du document de lecture des messages...\n" + result.text + '\n')

View File

@ -1,7 +1,6 @@
import os, sys, ast, requests, json, base58, base64 import os, sys, ast, requests, json, base58, base64
from time import time from time import time
from datetime import datetime from datetime import datetime
from termcolor import colored
from lib.natools import fmt, get_privkey, box_decrypt, box_encrypt from lib.natools import fmt, get_privkey, box_decrypt, box_encrypt
from lib.cesiumCommon import CesiumCommon, pp_json, PUBKEY_REGEX from lib.cesiumCommon import CesiumCommon, pp_json, PUBKEY_REGEX
@ -57,11 +56,11 @@ class ReadFromCesium(CesiumCommon):
nbrMsg = totalMsg nbrMsg = totalMsg
if totalMsg == 0: if totalMsg == 0:
print(colored("Aucun message à afficher.", 'yellow')) print("Aucun message à afficher.")
return True return True
else: else:
infoTotal = " Nombre de messages: " + str(nbrMsg) + "/" + str(totalMsg) + " " infoTotal = " Nombre de messages: " + str(nbrMsg) + "/" + str(totalMsg) + " "
print(colored(infoTotal.center(rows, '#'), "yellow")) print(infoTotal.center(rows, '#'))
for hits in msgJSON["hits"]: for hits in msgJSON["hits"]:
self.idMsg = hits["_id"] self.idMsg = hits["_id"]
msgSrc = hits["_source"] msgSrc = hits["_source"]
@ -77,19 +76,19 @@ class ReadFromCesium(CesiumCommon):
headerMsg = startHeader + date + "(ID: {})".format(self.idMsg) + " " headerMsg = startHeader + date + "(ID: {})".format(self.idMsg) + " "
print('-'.center(rows, '-')) print('-'.center(rows, '-'))
print(colored(headerMsg, "blue").center(rows+9, '-')) print(headerMsg.center(rows+9, '-'))
print('-'.center(rows, '-')) print('-'.center(rows, '-'))
try: try:
self.title = decrypt(msgSrc["title"]) self.title = decrypt(msgSrc["title"])
self.content = decrypt(msgSrc["content"]) self.content = decrypt(msgSrc["content"])
except Exception as e: except Exception as e:
sys.stderr.write(colored(str(e), 'red') + '\n') sys.stderr.write(str(e) + '\n')
pp_json(hits) pp_json(hits)
continue continue
print('\033[1m' + self.title + '\033[0m') print('\033[1m' + self.title + '\033[0m')
print(self.content) print(self.content)
print(colored(infoTotal.center(rows, '#'), "yellow")) print(infoTotal.center(rows, '#'))
# Parse JSON result and display messages # Parse JSON result and display messages
def jsonMessages(self, msgJSON, nbrMsg, outbox): def jsonMessages(self, msgJSON, nbrMsg, outbox):
@ -125,7 +124,7 @@ class ReadFromCesium(CesiumCommon):
self.title = decrypt(msgSrc["title"]) self.title = decrypt(msgSrc["title"])
self.content = decrypt(msgSrc["content"]) self.content = decrypt(msgSrc["content"])
except Exception as e: except Exception as e:
sys.stderr.write(colored(str(e), 'red') + '\n') sys.stderr.write(str(e) + '\n')
pp_json(hits) pp_json(hits)
continue continue
@ -183,7 +182,7 @@ class SendToCesium(CesiumCommon):
sys.exit(1) sys.exit(1)
else: else:
if result.status_code == 200: if result.status_code == 200:
print(colored("Message envoyé avec succès !", "green")) print("Message envoyé avec succès !")
print("ID: " + result.text) print("ID: " + result.text)
return result return result
else: else:
@ -226,11 +225,11 @@ class DeleteFromCesium(CesiumCommon):
elif result.status_code == 403: elif result.status_code == 403:
raise ValueError("Vous n'êtes pas l'auteur de ce message.") raise ValueError("Vous n'êtes pas l'auteur de ce message.")
except Exception as e: except Exception as e:
sys.stderr.write(colored("Impossible de supprimer le message {0}:\n".format(idMsg), 'red') + str(e) + "\n") sys.stderr.write("Impossible de supprimer le message {0}:\n".format(idMsg) + str(e) + "\n")
return False return False
else: else:
if result.status_code == 200: if result.status_code == 200:
print(colored("Message {0} supprimé avec succès !".format(idMsg), "green")) print("Message {0} supprimé avec succès !".format(idMsg))
return result return result
else: else:
sys.stderr.write("Erreur inconnue.") sys.stderr.write("Erreur inconnue.")