From 8135aaaabbd98dc1f0f7fa5a73f4066398dc1558 Mon Sep 17 00:00:00 2001 From: Jaiden Mispy <^_^@mispy.me> Date: Tue, 18 Nov 2014 13:31:59 +1100 Subject: [PATCH] Use can_pester? logic for timeline tweets --- lib/twitter_ebooks/bot.rb | 5 +++++ spec/bot_spec.rb | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lib/twitter_ebooks/bot.rb b/lib/twitter_ebooks/bot.rb index b0e3350..442a0d3 100755 --- a/lib/twitter_ebooks/bot.rb +++ b/lib/twitter_ebooks/bot.rb @@ -258,6 +258,11 @@ module Ebooks return end + if !meta[:mentions_bot] && !userinfo(ev.user.screen_name).can_pester? + log "Already pestered @#{ev.user.screen_name} enough for now" + return + end + log "Replying to @#{ev.user.screen_name} with: #{meta[:reply_prefix] + text}" @twitter.update(meta[:reply_prefix] + text, in_reply_to_status_id: ev.id) diff --git a/spec/bot_spec.rb b/spec/bot_spec.rb index af313b2..594b601 100644 --- a/spec/bot_spec.rb +++ b/spec/bot_spec.rb @@ -141,6 +141,10 @@ describe Ebooks::Bot do Timecop.travel(Time.now + 10) bot.receive_event(mock_tweet("spammer", "@test_ebooks @m1sp 8")) + expect_tweet(bot, "@spammer @m1sp echo: 8") + + Timecop.travel(Time.now + 10) + bot.receive_event(mock_tweet("spammer", "@test_ebooks @m1sp 9")) expect(bot.twitter).to_not have_received(:update) end end