From d74972ef3e1bc636b8fae20ea407ac95f0e7aa39 Mon Sep 17 00:00:00 2001
From: Patrick Steadman <ptsteadman@gmail.com>
Date: Tue, 26 Jul 2016 20:46:27 -0400
Subject: [PATCH 1/2] add spaces between claps and make wait time 42.0 secs

---
 bot.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot.py b/bot.py
index 849bbbe..8ee8454 100644
--- a/bot.py
+++ b/bot.py
@@ -43,7 +43,7 @@ def clap(tweet,user):
   clap_tweet = first_word
   words.pop(0)
   for w in words:
-  	clap_tweet = clap_tweet + clap_emoji +  w
+  	clap_tweet = clap_tweet + " " + clap_emoji + " " +  w
   clap_tweet = clap_tweet + clap_emoji
   if len(clap_tweet) < 141:
     if clap_tweet[0] == '@':
@@ -68,10 +68,10 @@ def clap(tweet,user):
   except Exception as e:
     print str(e)
     print 'some sort of drama when listening'
-    sleep(420)
+    sleep(42.0)
     pass
   if len(mentions) < 1:
-    sleep(420)
+    sleep(42.0)
     print 'no new mentions, taking a 420 second break'
   else:
     for i in mentions:
@@ -91,4 +91,4 @@ def clap(tweet,user):
         except Exception:
         	print 'couldnt tweet'
         	sleep(30)
-        	pass
\ No newline at end of file
+        	pass

From 136c60012314209a6abd2bdcbe5a492aa9900669 Mon Sep 17 00:00:00 2001
From: Patrick Steadman <ptsteadman@gmail.com>
Date: Tue, 26 Jul 2016 21:09:05 -0400
Subject: [PATCH 2/2] finish merge with dm feature

---
 bot.py | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/bot.py b/bot.py
index e952ebd..c9e7418 100644
--- a/bot.py
+++ b/bot.py
@@ -92,25 +92,10 @@ def process(i, user):
     pass
   if len(mentions) < 1:
     sleep(42.0)
-    print 'no new mentions, taking a 420 second break'
+    print 'no new mentions, taking a 42.0 second break'
   else:
     for i in mentions:
       if i.user.screen_name <> 'ClapBot':
-        request_id = i.id_str
-        seen.append(int(request_id)+1)
-        log.write(request_id + '\n')
-        sender = i.user.screen_name
-        tweet = clap(i.text,sender)
-        api = twitter_api(consumer_key, consumer_secret, access_key, access_secret)
-        try:
-          api.update_status(status=tweet)
-          api.create_favorite(tweet_id)
-          print 'tweeted '+tweet
-          sleep(30)
-        except Exception:
-        	print 'couldnt tweet'
-        	sleep(30)
-        	pass
         process(i, i.user)
     for d in dms:
       process(d, d.sender)