Merge pull request #11 from reidjs/fix-turn-off-queue

Remove queue system, allow different date formats

Author: reidjs

README.md

@@ -1,23 +1,25 @@
 # markdown-tweet-scheduler
-Schedule daily tweets from markdown files in your repo, posted to twitter via github actions. 
+Schedule tweets from markdown files in your repo, posted to twitter via github actions. 
+
 
 ## Why
 - View, edit, and post your tweets without logging into twitter 
 - Keep source controlled backups of your tweets
 - Free and open source
 
+
 ## Setup 
-1. Fork this repo
-2. Get your twitter credentials by creating an app (https://developer.twitter.com/apps)
+1. Clone this repo and push it to your own private repo. 
+2. Get your credentials by creating a twitter app (https://developer.twitter.com/apps)
 3. Add your twitter credentials to the repository's secrets (https://docs.github.com/en/actions/reference/encrypted-secrets)
    - API_KEY (known as consumer_key in twitter API)
    - API_SECRET_KEY (known as consumer_secret in twitter API)
    - ACCESS_TOKEN
    - ACCESS_TOKEN_SECRET
 
-## Scheduling Tweets
-**By Date**. 
-1. Create a markdown file in the `./tweets/` folder with a future date in `YYYY-Mon-DD` format, for example, `2021-Sep-05.md`, and write the content of your tweet in it.
+
+## Scheduling Tweets By Date
+1. Create a markdown file in the `./tweets/` folder with a future date in either the `YYYY-Mon-DD` or `Month dd, YYYY` format, for example, `2021-Sep-05.md` or `September 5, 2021.md`, and write the content of your tweet in it.
 2. Commit the file(s) and push to the remote repo. When the daily action runs on the specified date, the tweet should be posted.
 
 
@@ -28,15 +30,16 @@ Schedule daily tweets from markdown files in your repo, posted to twitter via gi
 2. Changing the tweet directory:
    - Change the `FILE_PATH` environment variable in `.github/workflows/go.yml`
 
+
 ## Running locally
 1. rename `.env-SAMPLE` to `.env` and fill in your twitter credentials
    - consumer_key == API_KEY
    - consumer_secret == API_SECRET_KEY
-2. In your terminal: `go run main.go`
+2. In your terminal, from the root directory: `go run .`
+
 
 ## Notes
 1. Fails silently on bad credentials, make sure you set those correctly.
 2. Only allows one tweet per day by design. If requested, this can be modified to allow tweets by the minute or hour. 
-3. I suggest moving posted tweets that have already been posted to a `posted/` subdirectory under `tweets/`.
-4. Tweets will not be posted exactly at the cron time set in `go.yml` because of how github actions work. If you need minute precision, run this script locally on a cronjob.
+3. Tweets will not be posted exactly at the cron time set in `go.yml`. In my experience in can be 5-10 minutes late. If you need minute precision, run this script locally on a cronjob.
 

main.go

@@ -88,16 +88,26 @@ func ScheduledTweet() (string, string, error) {
 	formatted_time := current_time.Format("2006-Jan-02")
 	path := os.Getenv("FILE_PATH")
 	fmt.Println(path)
+
 	todays_file_name := path + formatted_time + ".md"
-	fmt.Println(todays_file_name)
 	content, err := ReadFile(todays_file_name)
-	if err != nil {
-		return "", "", err
+	// Fixes issue #3: Allow different date format
+	formatted_time2 := current_time.Format("January 2, 2006")
+	todays_file_name2 := path + formatted_time2 + ".md"
+	content2, err2 := ReadFile(todays_file_name2)
+
+	if err == nil {
+		fmt.Println("Attempting to post content from: ", todays_file_name)
+		return content, todays_file_name, nil
+	} else if err2 == nil {
+		fmt.Println("Attempting to post content from: ", todays_file_name2)
+		return content2, todays_file_name2, nil
 	}
 
-	return content, todays_file_name, nil
+	return "", "", errors.New(err.Error() + err2.Error())
 }
 
+// TODO: either fix or remove queue system:
 func IsQueueNameFormat(filename string) bool {
 	// if name fits the format q-#, return true
 	if string(filename[0]) == "q" && string(filename[1]) == "-" {
@@ -106,6 +116,7 @@ func IsQueueNameFormat(filename string) bool {
 	return false
 }
 
+// TODO: either fix or remove queue system:
 func QueuedTweet() (string, string, error) {
 	LoadDotEnv()
 	path := os.Getenv("FILE_PATH")
@@ -148,37 +159,10 @@ func QueuedTweet() (string, string, error) {
 
 func main() {
 	scheduled_content, scheduled_tweet_filename, scheduled_tweet_error := ScheduledTweet()
-	path := os.Getenv("FILE_PATH")
-
 	if scheduled_tweet_error != nil {
-		fmt.Println(scheduled_tweet_error)
-		// If there's not a scheduled tweet today, then try a queued tweet
-		queued_content, queued_tweet_filename, queued_tweet_error := QueuedTweet()
-		if queued_tweet_error != nil {
-			fmt.Println(queued_tweet_error)
-		} else {
-			fmt.Println("Posting", queued_content)
-			post_failure := Tweet(queued_content)
-			if post_failure != nil {
-				// TODO: check if this is correct naming
-				rename_err := os.Rename(queued_tweet_filename, path+"failed_"+queued_tweet_filename[19:])
-				fmt.Println(rename_err)
-			} else {
-				// TODO
-				rename_err := os.Rename(queued_tweet_filename, path+"posted_"+queued_tweet_filename[19:])
-				fmt.Println(rename_err)
-			}
-		}
-	} else {
-		// try to post a scheduled tweet
-		post_failure := Tweet(scheduled_content)
-		if post_failure != nil {
-			rename_err := os.Rename(scheduled_tweet_filename, path+"failed_"+scheduled_tweet_filename[9:])
-			fmt.Println(rename_err)
-		} else {
-			// fmt.Println("todo: change filename to posted_", scheduled_tweet_filename)
-			rename_err := os.Rename(scheduled_tweet_filename, path+"posted_"+scheduled_tweet_filename[9:])
-			fmt.Println(rename_err)
-		}
+		fmt.Println("Error scheduling file:", scheduled_tweet_filename)
+		fmt.Println("Error:", scheduled_tweet_error)
 	}
+	post_failure := Tweet(scheduled_content)
+	fmt.Println("Error posting to Twitter:", post_failure)
 }

tweets/August 20, 2021.md

@@ -0,0 +1 @@
+This is another supported date format (August 20, 2021.md) of posting to twitter.

tweets/draft.md

@@ -0,0 +1,2 @@
+Example of a tweet draft that will not be posted because its name (draft.md) does not match either of the required formats (YYYY-Mon-DD.md) 
+