From 128cabaa8d9a9f138dd530725f6a57a016d121ce Mon Sep 17 00:00:00 2001
From: ccostan <carlo@ipm.com>
Date: Thu, 8 Mar 2018 12:51:32 -0500
Subject: [PATCH] Disabled a twitter welcome message via HA.  Working on a new
 HOT Flow! See @BearStoneHA for details.

---
 config/packages/hasspodcast.yaml | 26 +++++++----------
 config/packages/twitter.yaml     | 48 ++++++++++++++++----------------
 2 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/config/packages/hasspodcast.yaml b/config/packages/hasspodcast.yaml
index 97a672c3..dceb0a76 100755
--- a/config/packages/hasspodcast.yaml
+++ b/config/packages/hasspodcast.yaml
@@ -7,9 +7,9 @@
 #-------------------------------------------
 feedreader:
     urls:
-      - https://hasspodcast.io/feed/podcast
-      - http://feeds.feedburner.com/IPMer?format=xml
-# - http://feeds.feedburner.com/RecentCommitsToBearStoneHA
+      - https://hasspodcast.io/feed/podcast #HA Podcast Feed
+      - https://us12.campaign-archive.com/feed?u=45cab4343ffdbeb9667c28a26&id=e01847e94f #This is CCOSTAN's Smart Home Blog feed
+# - http://feeds.feedburner.com/RecentCommitsToBearStoneHA - This is the Repo Commit feed.
 #-------------------------------------------
 
 automation:
@@ -21,32 +21,26 @@ automation:
     action:
       - service: script.notify_engine
         data_template:
-          value1: 'There is a new HA Podcast available for {{trigger.event.data.title}}.'
-          value2: 'https://hasspodcast.io/'
+          value1: 'There is a new RSS item available for {{trigger.event.data.title}}.'
+          value2: '{{trigger.event.data.link}}'
           who: 'carlo'
 
       - service: notify.html5
         data_template:
-          title: "New HA Podcast available"
-          message: "New HA Podcast - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }} {{trigger.event.data.title}}"
+          title: "New RSS Item available"
+          message: "New RSS Item - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }} {{trigger.event.data.title}}"
           data:
-            url: "https://hasspodcast.io/"
+            url: "{{trigger.event.data.link}}"
 
       - service: persistent_notification.create
         data_template:
           title: "{{trigger.event.data.title}}"
-          message: "New Podcast available - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}"
+          message: "New RSS item available - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}"
           notification_id: "update_available"
 
       - service: script.tweet_engine
         data_template:
-          tweet: >
-            {{ [
-            "There is a new HA Podcast available! @DanGeek, @rohank9, @philhawthorne & Crew rock it out (#HomeAutomation Style!)!",
-            "Mine and @DanGeek Favorite Podcast just came out!",
-            "Listen to @rohank9 and the HA Podcast crew on thier new #HomeAutomation episode!",
-            "Mine & @CCostan Favorite Podcast just came out! Thanks @DanGeek!"
-            ] | random + "(https://hasspodcast.io/)"}}
+          tweet: 'Check it out! {{trigger.event.data.title}} - {{trigger.event.data.link}}'
 
       - service: script.notify_engine
         data_template:
diff --git a/config/packages/twitter.yaml b/config/packages/twitter.yaml
index 0fa09563..da2b7b4f 100755
--- a/config/packages/twitter.yaml
+++ b/config/packages/twitter.yaml
@@ -107,30 +107,30 @@ automation:
           media_content_id: "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/twitter-chirp.mp3"
           media_content_type: audio/mp4
 
-      - service: script.tweet_engine
-        data_template:
-          tweet: >-
-            {% set handle = trigger.event.data.value1 %}
-            {% set location = trigger.event.data.location %}
-            {% set phrases = [
-              "Thanks for the Follow " ~ handle ~ "! Chirp the Bird from " ~ location ~ "!!",
-              "Hey " ~ handle ~ "! Thanks for the Follow from " ~ location ~ " !",
-              "Sending a #Chirp to " ~ handle ~ " in " ~ location ~ "!",
-              "New follower " ~ handle ~ " from " ~ location ~ ", I just sounded a chirp in the house.",
-              "Boom! The " ~ location ~ " follow from " ~ handle ~ " makes me sound a chirp in the house.",
-              "Wanna know who is super cool? "~ handle ~" IS!!! Thanks for making me CHIRP!",
-              "If the AMP (http://amzn.to/2j18dlT) is on & I get a new follower like " ~ handle ~ ", I sound a chirp!"
-            ] %}
-            {% set hashtags = [
-              "#ThanksForTheFollow",
-              "#FollowBack",
-              "#ChirpTheHouse",
-              "#FollowMe",
-              "#MakingitChirp",
-              "(http://www.vmwareinfo.com/2017/12/giving-house-twitter-account.html)",
-              "(http://www.vmwareinfo.com/2017/11/building-digital-cuckoo-clock-with-home.html)"
-            ] %}
-            {{ phrases|random ~ " " ~ hashtags|random }}
+      # - service: script.tweet_engine
+      #   data_template:
+      #     tweet: >-
+      #       {% set handle = trigger.event.data.value1 %}
+      #       {% set location = trigger.event.data.location %}
+      #       {% set phrases = [
+      #         "Thanks for the Follow " ~ handle ~ "! Chirp the Bird from " ~ location ~ "!!",
+      #         "Hey " ~ handle ~ "! Thanks for the Follow from " ~ location ~ " !",
+      #         "Sending a #Chirp to " ~ handle ~ " in " ~ location ~ "!",
+      #         "New follower " ~ handle ~ " from " ~ location ~ ", I just sounded a chirp in the house.",
+      #         "Boom! The " ~ location ~ " follow from " ~ handle ~ " makes me sound a chirp in the house.",
+      #         "Wanna know who is super cool? "~ handle ~" IS!!! Thanks for making me CHIRP!",
+      #         "If the AMP (http://amzn.to/2j18dlT) is on & I get a new follower like " ~ handle ~ ", I sound a chirp!"
+      #       ] %}
+      #       {% set hashtags = [
+      #         "#ThanksForTheFollow",
+      #         "#FollowBack",
+      #         "#ChirpTheHouse",
+      #         "#FollowMe",
+      #         "#MakingitChirp",
+      #         "(http://www.vmwareinfo.com/2017/12/giving-house-twitter-account.html)",
+      #         "(http://www.vmwareinfo.com/2017/11/building-digital-cuckoo-clock-with-home.html)"
+      #       ] %}
+      #       {{ phrases|random ~ " " ~ hashtags|random }}
 
   - alias: 'Closed Github Issue'
     hide_entity: True