.gitea/workflows/build.yml

@@ -22,8 +22,6 @@ jobs:
           cd master
           echo "${{ secrets.DOCKERGIT_TOKEN }}" | docker login git.woodburn.au -u nathanwoodburn --password-stdin
           tag_num=$(git rev-parse --short HEAD)
-          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
-
           docker build -t hnshosting-master:$tag_num .
           docker tag hnshosting-master:$tag_num git.woodburn.au/nathanwoodburn/hnshosting-master:$tag_num
           docker push git.woodburn.au/nathanwoodburn/hnshosting-master:$tag_num
@@ -49,7 +47,6 @@ jobs:
           cd discord-bot
           echo "${{ secrets.DOCKERGIT_TOKEN }}" | docker login git.woodburn.au -u nathanwoodburn --password-stdin
           tag_num=$(git rev-parse --short HEAD)
-          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
           docker build -t hnshosting-bot:$tag_num .
           docker tag hnshosting-bot:$tag_num git.woodburn.au/nathanwoodburn/hnshosting-bot:$tag_num
           docker push git.woodburn.au/nathanwoodburn/hnshosting-bot:$tag_num

README.md

@@ -60,7 +60,7 @@ SMTP_HOST: smtp-server
 SMTP_PORT: smtp-port
 SMTP_USER: smtp-user
 SMTP_PASS: smtp-pass
-SMTP_FROM: smtp-from (eg. HNSHosting <hosting@nathan.woodburn.au>) This is optional
+SMTP_FROM: smtp-from <Optional>
 ```
 
 

master/main.py

@@ -252,6 +252,7 @@ def stripeapi():
     except stripe.error.SignatureVerificationError as e:
         return jsonify({'success': 'false'})
 
+    # Handle the event
     if event.type == 'payment_intent.succeeded':
         payment_intent = event.data.object
         # Get email
@@ -269,12 +270,12 @@ def stripeapi():
         password = os.getenv('SMTP_PASS')
         from_email = os.getenv('SMTP_FROM')
         if from_email == None:
-            from_email = "Hosting <"+user + ">"
+            from_email = user
         
         context = ssl.create_default_context()
         with smtplib.SMTP_SSL(host, port, context=context) as server:
             server.login(user, password)
-            message = "From: " + from_email + "\nTo: " + email + \
+            message = "From: Hosting <" + from_email + ">\nTo: " + email + \
                 "\nSubject: Your Licence key\n\nHello,\n\n"\
                 +"This email contains your licence key for your new wordpress site.\n" \
                 +"You can redeem this key via the discord bot or api.\n\n"\
@@ -282,12 +283,16 @@ def stripeapi():
 
             server.sendmail(from_email, email, message)
 
-        print('Licence sent via email for stripe payment', flush=True)
+
+
+        print('PaymentIntent was successful!', flush=True)
     else:
         print('Unhandled event type {}'.format(event.type))
     return jsonify({'success': 'true'})
 
 
+
+
 def get_sites_count():
     # If file doesn't exist, create it
     try: