From fd0f480e6946341c783807cead2c6ee40ad42787 Mon Sep 17 00:00:00 2001 From: Ben Date: Sat, 31 Oct 2020 10:31:13 +0900 Subject: [PATCH] refactor: removed 'sh' function & load env variables through os --- python3/smack_my_bitch_up.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/python3/smack_my_bitch_up.py b/python3/smack_my_bitch_up.py index 6e70d1d..0f7a3ad 100644 --- a/python3/smack_my_bitch_up.py +++ b/python3/smack_my_bitch_up.py @@ -4,20 +4,19 @@ import getpass import os import random -import subprocess +from dotenv import load_dotenv from twilio.rest import Client, TwilioException -TWILIO_ACCOUNT_SID = os.environ["TWILIO_ACCOUNT_SID"] -TWILIO_AUTH_TOKEN = os.environ["TWILIO_AUTH_TOKEN"] +from hackerutils import get_log_path, sh -LOG_FILE_PATH = os.getcwd() + "/smack_my_bitch_up.txt" +# Load .env file +load_dotenv() +TWILIO_ACCOUNT_SID = os.getenv("TWILIO_ACCOUNT_SID") +TWILIO_AUTH_TOKEN = os.getenv("TWILIO_AUTH_TOKEN") -def sh(*args): - proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, _ = proc.communicate() - return stdout +LOG_FILE_PATH = get_log_path("smack_my_bitch_up.txt") def main(): @@ -29,8 +28,8 @@ def main(): client = Client(TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN) # Phone numbers. - my_number = "+" + os.environ["TWILIO_TRIAL_NO"] - her_number = "+" + os.environ["TWILIO_HER_NO"] + my_number = "+" + os.getenv("TWILIO_TRIAL_NO") + her_number = "+" + os.getenv("TWILIO_HER_NO") reasons = [ "Working hard",