lib/chatterbot/reply.rb in chatterbot-0.7.1 vs lib/chatterbot/reply.rb in chatterbot-0.9.0

@@ -8,18 +8,26 @@
     def replies(&block)
       return unless require_login
 
       debug "check for replies since #{since_id_reply}"
 
-      opts = since_id_reply > 0 ? {:since_id => since_id_reply} : {}
+      opts = {}
+      if since_id_reply > 0
+        opts[:since_id] = since_id_reply
+      elsif since_id > 0
+        opts[:since_id] = since_id
+      end
       opts[:count] = 200
 
-      results = client.mentions(opts)
+      results = client.mentions_timeline(opts)
+      @current_tweet = nil
       results.each { |s|
         update_since_id_reply(s)
         unless ! block_given? || on_blacklist?(s) || skip_me?(s)
+          @current_tweet = s
           yield s         
         end
       }
+      @current_tweet = nil
     end
   end
 end