Show specific meetups link for the target city

.gitignore

@@ -46,4 +46,8 @@ tags
 # Persistent undo
 [._]*.un~
 
+# Misc
+.DS_Store
+dist/
+
 # End of https://www.toptal.com/developers/gitignore/api/go,vim

.goreleaser.yaml

@@ -0,0 +1,5 @@
+gitea_urls:
+  api: https://git.handmadecities.com/api/v1
+  download: https://git.handmadecities.com/
+  # set to true if you use a self-signed certificate
+  skip_tls_verify: false

config.toml

@@ -1,18 +0,0 @@
-# User Constants - Update as needed
-batch_size  = 500 # Max 500 messages per batch: https://postmarkapp.com/developer/api/templates-api#send-batch-with-templates
-test_email  = "" # Fill this in with your own email address
-
-# Handmade Cities Credentials - DON'T TOUCH
-[hmc]
-api_url       = "https://api.handmadecities.com/v1/meetups/subscribers"
-shared_secret = "Land_OF_TERminA__MAJORAS_LAIR#666!"
-city          = "Termina"
-
-# Postmark App Credentials - NO TOUCHY TOUCHY
-[postmark]
-server_token   = "37967b9a-6b1c-430e-a65f-de043de3e568"
-api_url        = "https://api.postmarkapp.com/email/batchWithTemplates"
-template_id    = 35682307
-sender_name    = "Skull Kid"
-sender_email   = "majora@handmadecities.com"
-message_stream = "termina"

main.go

@@ -7,138 +7,144 @@
 // ============================    Contributors    =========================
 // Bug & warning fixes
 //  Jacob Bell (@MysteriousJ)
-//  Asaf Gartner
+//  Asaf Gartner (@AsafGartner)
+//  Joshua Barnett (@jshbrntt)
+//  Jack Punter (@TarriestPython)
 //
 // Emotional Support
 //  Cucui Ganon Rosario
 // =========================================================================
 
-// WARNING: This program requires a companion config.toml file provided by Abner. Without it we will crash!
-
 package main
 
 import (
 	"bytes"
 	"crypto/sha1"
 	"encoding/json"
-    "errors"
+	"errors"
-    "fmt"
+	"fmt"
 	"io"
-    "io/fs"
+	"io/fs"
-    "io/ioutil"
+	"io/ioutil"
 	"net/http"
-    "os"
+	"os"
-    "strconv"
+	"strconv"
-    "strings"
+	"strings"
-    "time"
+	"time"
 
 	"github.com/pelletier/go-toml/v2"
-    "github.com/russross/blackfriday/v2"
+	"github.com/russross/blackfriday/v2"
 	"github.com/spf13/cobra"
 )
 
 type Config struct {
-    BatchSize   int `toml:"batch_size"`
+	BatchSize int    `toml:"batch_size"`
-	TestEmail   string `toml:"test_email"`
+	TestEmail string `toml:"test_email"`
-    HMC struct {
+	HMC       struct {
-        ApiUrl       string `toml:"api_url"`
+		ApiUrl       string `toml:"api_url"`
-        SharedSecret string `toml:"shared_secret"`
+		SharedSecret string `toml:"shared_secret"`
-        City         string `toml:"city"`
+		City         string `toml:"city"`
-    }
+	} `toml:"hmc"`
 	Postmark struct {
 		ServerToken   string `toml:"server_token"`
 		ApiUrl        string `toml:"api_url"`
 		TemplateId    int    `toml:"template_id"`
-        SenderName  string `toml:"sender_name"`
+		SenderName    string `toml:"sender_name"`
 		SenderEmail   string `toml:"sender_email"`
 		MessageStream string `toml:"message_stream"`
 	} `toml:"postmark"`
 }
 
 func retrieveSubscribers(cfg *Config) ([]string, error) {
-    /* Prepare request payload */
+	/* Prepare request payload */
-    /* *** */
+	/* *** */
-    payload := map[string]string{
+	payload := map[string]string{
-        "city": cfg.HMC.City,
+		"city": cfg.HMC.City,
-    }
+	}
 
-    payloadBytes, err := json.Marshal(payload)
+	payloadBytes, err := json.Marshal(payload)
-    if err != nil {
+	if err != nil {
-        return nil, fmt.Errorf("error encoding payload: %v", err)
+		return nil, fmt.Errorf("error encoding payload: %v", err)
-    }
+	}
 
-    /* Prepare request */
+	/* Prepare request */
-    /* *** */
+	/* *** */
-    req, err := http.NewRequest("POST", cfg.HMC.ApiUrl, bytes.NewReader(payloadBytes))
+	req, err := http.NewRequest("POST", cfg.HMC.ApiUrl, bytes.NewReader(payloadBytes))
-    if err != nil {
+	if err != nil {
-        return nil, fmt.Errorf("error creating request: %v", err)
+		return nil, fmt.Errorf("error creating request: %v", err)
-    }
+	}
 
-    req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Content-Type", "application/json")
-    req.Header.Set("Authorization", cfg.HMC.SharedSecret)
+	req.Header.Set("Authorization", cfg.HMC.SharedSecret)
 
-    /* Execute request */
+	/* Execute request */
-    /* *** */
+	/* *** */
-    client    := http.Client{}
+	client := http.Client{}
-    resp, err := client.Do(req)
+	resp, err := client.Do(req)
-    if err != nil {
+	if err != nil {
-        return nil, fmt.Errorf("error making request: %v", err)
+		return nil, fmt.Errorf("error making request: %v", err)
-    }
+	}
-    defer resp.Body.Close()
+	defer resp.Body.Close()
 
-    /* Fail if status code is not in the 2xx range */
+	/* Fail if status code is not in the 2xx range */
-    /* *** */
+	/* *** */
-    if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-        return nil, fmt.Errorf("error: HTTP status code %d", resp.StatusCode)
+		return nil, fmt.Errorf("error: HTTP status code %d", resp.StatusCode)
-    }
+	}
 
-    /* Read response's body */
+	/* Read response's body */
-    /* *** */
+	/* *** */
-    body, err := ioutil.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
-    if err != nil {
+	if err != nil {
-        return nil, fmt.Errorf("error reading response body: %v", err)
+		return nil, fmt.Errorf("error reading response body: %v", err)
-    }
+	}
 
-    /* Parse JSON response */
+	/* Parse JSON response */
-    /* *** */
+	/* *** */
-    var data map[string]interface{}
+	var data map[string]interface{}
-    if err := json.Unmarshal(body, &data); err != nil {
+	if err := json.Unmarshal(body, &data); err != nil {
-        return nil, fmt.Errorf("error unmarshalling JSON: %v", err)
+		return nil, fmt.Errorf("error unmarshalling JSON: %v", err)
-    }
+	}
 
-    /* Extract the emails from the response */
+	/* Extract the emails from the response */
-    /* *** */
+	/* *** */
-    emails, ok := data["emails"].([]interface{})
+	emails, ok := data["emails"].([]interface{})
-    if !ok {
+	if !ok {
-        return nil, errors.New("response format error: 'emails' field not found")
+		return nil, errors.New("response format error: 'emails' field not found")
-    }
+	}
 
-    /* Convert emails to []string */
+    /* De-duplicate emails using a map */
-    /* *** */
+	/* *** */
-    var subscribers []string
+	emailMap := make(map[string]bool)
-    for _, email := range emails {
+	for _, email := range emails {
-        if emailStr, ok := email.(string); ok {
+		if emailStr, ok := email.(string); ok {
-            subscribers = append(subscribers, emailStr)
+			emailMap[emailStr] = true
-        }
+		}
-    }
+	}
 
-    return subscribers, nil
+	/* Convert the map keys back to a slice */
+	var subscribers []string
+	for email := range emailMap {
+		subscribers = append(subscribers, email)
+	}
+
+	return subscribers, nil
 }
 
 func parseMailFile(contents string) (subject string, body string, valid bool) {
 	/* Remove leading and trailing newlines */
-    /* *** */
+	/* *** */
 	contents = strings.TrimSpace(contents)
 	lines := strings.Split(contents, "\n")
 
 	/* Check if there is at least one line */
-    /* *** */
+	/* *** */
 	if len(lines) == 0 {
 		return "", "", false
 	}
 
 	/* Check if the first line is a title with the '#' Markdown symbol */
-    /* *** */
+	/* *** */
 	if strings.HasPrefix(lines[0], "#") { // Extract subject without the '#' symbol and leading/trailing spaces
 		subject = strings.TrimSpace(strings.TrimPrefix(lines[0], "#"))
 	} else {
@@ -147,24 +153,24 @@ func parseMailFile(contents string) (subject string, body string, valid bool) {
 	}
 
 	/* Concatenate the remaining lines to form the body */
-    /* *** */
+	/* *** */
 	body = strings.Join(lines[1:], "\n")
 
 	/* Check if the body is not empty */
-    /* *** */
+	/* *** */
 	if body == "" {
 		return "", "", false
 	}
 
 	/* If all checks pass, set valid to true */
-    /* *** */
+	/* *** */
 	return subject, body, true
 }
 
 func sendTest(cfg *Config, markdownFile string) {
-    /* Open and parse Markdown file */
+	/* Open and parse Markdown file */
-    /* *** */
+	/* *** */
-	members       := []string{cfg.TestEmail}
+	members := []string{cfg.TestEmail}
 	contents, err := os.ReadFile(markdownFile)
 	if err != nil {
 		if errors.Is(err, fs.ErrNotExist) {
@@ -174,20 +180,20 @@ func sendTest(cfg *Config, markdownFile string) {
 		}
 		return
 	}
-    contents = bytes.ReplaceAll(contents, []byte("\r"), []byte(""))
+	contents = bytes.ReplaceAll(contents, []byte("\r"), []byte(""))
 
 	subject, body, valid := parseMailFile(string(contents))
 	if !valid {
-        fmt.Printf("Error parsing file %s: invalid format\n", markdownFile)
+		fmt.Printf("Error parsing file %s: invalid format\n", markdownFile)
 		return
 	}
 
-    /* Convert Markdown to HTML */
+	/* Convert Markdown to HTML */
-    /* *** */
+	/* *** */
-    html := blackfriday.Run([]byte(body))
+	html := blackfriday.Run([]byte(body))
 
-    /* Send the email */
+	/* Send the email */
-    /* *** */
+	/* *** */
 	trackingFile := markdownFile + ".test.track"
 	logFile := markdownFile + "." + time.Now().Format("20060102T150405") + ".test.log"
 	os.Truncate(trackingFile, 0)
@@ -201,8 +207,8 @@ func sendTest(cfg *Config, markdownFile string) {
 }
 
 func sendNews(cfg *Config, markdownFile string) {
-    /* Open and parse Markdown file */
+	/* Open and parse Markdown file */
-    /* *** */
+	/* *** */
 	contents, err := os.ReadFile(markdownFile)
 	if err != nil {
 		if errors.Is(err, fs.ErrNotExist) {
@@ -210,22 +216,22 @@ func sendNews(cfg *Config, markdownFile string) {
 		} else {
 			fmt.Printf("Error reading file %s: %v\n", markdownFile, err)
 		}
-        return
+		return
 	}
-    contents = bytes.ReplaceAll(contents, []byte("\r"), []byte(""))
+	contents = bytes.ReplaceAll(contents, []byte("\r"), []byte(""))
 
 	subject, body, valid := parseMailFile(string(contents))
 	if !valid {
-        fmt.Printf("Error parsing file %s: invalid format\n", markdownFile)
+		fmt.Printf("Error parsing file %s: invalid format\n", markdownFile)
-        return
+		return
 	}
 
-    /* Convert Markdown to HTML */
+	/* Convert Markdown to HTML */
-    /* *** */
+	/* *** */
-    html := blackfriday.Run([]byte(body))
+	html := blackfriday.Run([]byte(body))
 
-    /* Checksum test */
+	/* Checksum test */
-    /* *** */
+	/* *** */
 	sha1File := markdownFile + ".sha1"
 	sum := sha1.Sum(contents)
 	sumString := fmt.Sprintf("%x", sum)
@@ -237,19 +243,19 @@ func sendNews(cfg *Config, markdownFile string) {
 		} else {
 			fmt.Printf("Error reading file %s: %v\n", sha1File, err)
 		}
-        return
+		return
 	}
 	if string(sha1) != sumString {
 		fmt.Printf("Hash doesn't match. Did you change the newsletter's contents? Rerun the test command please!\n")
-        return
+		return
 	}
 
-    /* Retrieve the mailing list from the city listed in the config file */
+	/* Retrieve the mailing list from the city listed in the config file */
-    /* *** */
+	/* *** */
-    subscribers, err := retrieveSubscribers(cfg)
+	subscribers, err := retrieveSubscribers(cfg)
 
-    /* Blast the member update! */
+	/* Blast the member update! */
-    /* *** */
+	/* *** */
 	trackingFile := markdownFile + ".track"
 	logFile := markdownFile + "." + time.Now().Format("20060102T150405") + ".log"
 
@@ -276,6 +282,13 @@ func blastMail(cfg *Config, logFile string, trackingFile string, audience []stri
 		}
 	}
 
+    existingReaderCount := len(sentToAddresses)
+    newReaderCount := 0
+
+    if existingReaderCount > 0 {
+        fmt.Println("Same email file specified: Sending only to new subscribers...")
+    }
+
 	var group []string
 	for _, a := range audience {
 		if a == "" {
@@ -301,6 +314,7 @@ func blastMail(cfg *Config, logFile string, trackingFile string, audience []stri
 				for i, res := range results {
 					log.WriteString(fmt.Sprintf("%s: %s\n", group[i], res.Message))
 				}
+                newReaderCount += len(group)
 				group = group[0:0]
 			}
 		}
@@ -316,7 +330,17 @@ func blastMail(cfg *Config, logFile string, trackingFile string, audience []stri
 		for i, res := range results {
 			log.WriteString(fmt.Sprintf("%s: %s\n", group[i], res.Message))
 		}
+        newReaderCount += len(group)
 	}
+
+    if newReaderCount > 0 {
+        newSubscribers := existingReaderCount > 0
+        if newSubscribers {
+            fmt.Printf("Sent to %d new subscribers!\n", newReaderCount)
+        }
+    } else {
+        fmt.Printf("Not sent (no new subscribers)\n")
+    }
 }
 
 var postmarkClient = http.Client{}
@@ -324,7 +348,7 @@ var postmarkClient = http.Client{}
 type PostmarkTemplateModel struct {
 	Name    string `json:"name"`
 	Email   string `json:"email"`
-    Subject string `json:"subject"`
+	Subject string `json:"subject"`
 	Body    string `json:"body"`
 }
 
@@ -356,14 +380,14 @@ func sendMail(cfg *Config, recipients []string, subject, html string) ([]Postmar
 	body := PostmarkBatchWithTemplateBody{}
 	for _, r := range recipients {
 		body.Messages = append(body.Messages, PostmarkTemplateMessage{
-			From:          from,
+			From:       from,
-			To:            r,
+			To:         r,
-			TemplateId:    cfg.Postmark.TemplateId,
+			TemplateId: cfg.Postmark.TemplateId,
 			TemplateModel: PostmarkTemplateModel{
-                Name:     cfg.Postmark.SenderName,
+				Name:    cfg.Postmark.SenderName,
-                Email:    cfg.Postmark.SenderEmail,
+				Email:   cfg.Postmark.SenderEmail,
-				Subject:  subject,
+				Subject: subject,
-				Body:     html,
+				Body:    html,
 			},
 			MessageStream: cfg.Postmark.MessageStream,
 		})
@@ -404,36 +428,69 @@ func sendMail(cfg *Config, recipients []string, subject, html string) ([]Postmar
 	return results, nil
 }
 
+func ComplainEmpty(val string, complaint string) bool {
+	if val == "" {
+		fmt.Println(complaint)
+		return false
+	}
+	return true
+}
+
 func main() {
-    /* Read in credentials into Config struct */
+	/* Read in credentials into Config struct */
-    /* *** */
+	/* *** */
 	configFile := "config.toml"
 
 	data, err := ioutil.ReadFile(configFile)
 	if err != nil {
 		fmt.Println("Error reading TOML file:", err)
-        os.Exit(1)
+		os.Exit(1)
 	}
 
 	config := &Config{}
 
 	if err := toml.Unmarshal(data, config); err != nil {
 		fmt.Println("Error unmarshaling TOML:", err)
-        os.Exit(1)
+		os.Exit(1)
 	}
 
-    /* Setup Cobra */
+	if config.BatchSize == 0 {
-    /* *** */
+		config.BatchSize = 500
+	}
+
+	validConfig := true
+
+	validConfig = ComplainEmpty(config.TestEmail, "* Test email address is missing in config") && validConfig
+	validConfig = ComplainEmpty(config.HMC.ApiUrl, "* HMC API url is missing in config") && validConfig
+	validConfig = ComplainEmpty(config.HMC.SharedSecret, "* HMC Shared secret is missing in config") && validConfig
+	validConfig = ComplainEmpty(config.HMC.City, "* HMC City is missing in config") && validConfig
+	validConfig = ComplainEmpty(config.Postmark.ServerToken, "* Postmark server token is missing in config") && validConfig
+	validConfig = ComplainEmpty(config.Postmark.ApiUrl, "* Postmark API url is missing in config") && validConfig
+	if config.Postmark.TemplateId == 0 {
+		fmt.Println("* Postmark template ID is missing in config")
+		validConfig = false
+	}
+	validConfig = ComplainEmpty(config.Postmark.SenderName, "* Sender name is missing in config") && validConfig
+	validConfig = ComplainEmpty(config.Postmark.SenderEmail, "* Sender email is missing in config") && validConfig
+	validConfig = ComplainEmpty(config.Postmark.MessageStream, "* Postmark message stream is missing in config") && validConfig
+
+	if !validConfig {
+		fmt.Println("Please fix your config and try again")
+		os.Exit(1)
+	}
+
+	/* Setup Cobra */
+	/* *** */
 	cmd := &cobra.Command{
 		Use:   "meetupinvite2000",
 		Short: "MeetupInvite2000",
 		Run: func(cmd *cobra.Command, args []string) {
-            fmt.Printf(`Instructions:
+			fmt.Printf(`Instructions:
 	1. Create an email file
-		* Name it whatever you want. Markdown is expected
+		* Call it whatever you want. Markdown format is expected
-		* Any newlines at the start or end of the file will be removed
+		* Newlines at the beginning and end will be trimmed
-		* The first line of the file will be used as {{ subject }} in the postmark template. It must start with the # symbol
+		* The first line is your email subject. It MUST start with the # symbol
-		* The rest of the file will be used as {{{ content_body }}}
+		* The rest of the file is your email's body
 
 	2. See who's subscribed
 		* ./meetupinvite2000 dump
@@ -442,39 +499,39 @@ func main() {
 
 	3. Do a test run
 		* ./meetupinvite2000 test [email file]
-		* You must send a test email before blasting it to everyone (update config.toml to change test recipient)
+		* You must send a test before blasting to everyone (please update config.toml to change test recipient)
-		* If you modify the email file after testing, you must test again. Otherwise MeetupInvite2000 will complain
+		* If you modify the email after testing, you must test again. Otherwise we will complain
 
 	4. Start blasting!
 		* ./meetupinvite2000 blast [email file]
-		* Will batch send your invite using our Email API (Postmark)
+		* Batch sends your invite using our Email API (Postmark)
-		* Will produce a .track file that will list all email addresses that we attempted to send to
+		* Produces .track file that tracks email addresses we attempted to send to
-		* In case of error, you can blast again. All emails listed in the .track file will be skipped
+		* Produces .log file with information received back from Postmark
-		* Will produce a .log file with information received back from Postmark
+		* In case of errors, you can always blast again. Addresses already in .track file will be skipped
 `)
 		},
 	}
 
-    dumpCmd := &cobra.Command{
+	dumpCmd := &cobra.Command{
-        Use: "dump",
+		Use:   "dump",
-        Short: "Dump the list of subscribers",
+		Short: "Dump the list of subscribers",
-        Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, args []string) {
-            subscribers, err := retrieveSubscribers(config)
+			subscribers, err := retrieveSubscribers(config)
-            if err != nil {
+			if err != nil {
-                fmt.Printf("Error retrieving subscribers: %v\n", err)
+				fmt.Printf("Error retrieving subscribers: %v\n", err)
-                return
+				return
-            }
+			}
 
-            fmt.Printf("Handmade Meetups - \033[1m%s\033[0m\n\n", config.HMC.City)
+			fmt.Printf("Handmade Meetups - \033[1m%s\033[0m\n\n", config.HMC.City)
-            maxIndexWidth := len(strconv.Itoa(len(subscribers)))
+			maxIndexWidth := len(strconv.Itoa(len(subscribers)))
-            for index, email := range subscribers {
+			for index, email := range subscribers {
-                indexStr := strconv.Itoa(index + 1)
+				indexStr := strconv.Itoa(index + 1)
-                indexStr = strings.Repeat(" ", maxIndexWidth - len(indexStr)) + indexStr // Right-align the index
+				indexStr = strings.Repeat(" ", maxIndexWidth-len(indexStr)) + indexStr // Right-align the index
-                fmt.Printf("%s. \033[1m%s\033[0m\n", indexStr, email)
+				fmt.Printf("%s. \033[1m%s\033[0m\n", indexStr, email)
-            }
+			}
-            fmt.Printf("\nMailing list grows automatically as more subscribe at \033[1mhandmadecities.com/meetups\033[0m\n")
+			fmt.Printf("\nMailing list grows automatically as more subscribe at \033[1mhandmadecities.com/meetups/%s\033[0m\n", config.Postmark.MessageStream)
-        },
+		},
-    }
+	}
 
 	testCmd := &cobra.Command{
 		Use:   "test [email file]",
@@ -502,11 +559,11 @@ func main() {
 		},
 	}
 
-    /* Install commands and serve them to the user */
+	/* Install commands and serve them to the user */
-    /* *** */
+	/* *** */
-    cmd.AddCommand(dumpCmd)
+	cmd.AddCommand(dumpCmd)
-    cmd.AddCommand(testCmd)
+	cmd.AddCommand(testCmd)
-    cmd.AddCommand(blastCmd)
+	cmd.AddCommand(blastCmd)
 
-    cmd.Execute()
+	cmd.Execute()
 }