ruboty-tweetstream 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6c74e08390f08c9dc6d19475b478b419bc2c3d
-  data.tar.gz: ce85993be83303e4ad8cff5173822695b63aac58
+  metadata.gz: 82fd6a29c2eb198bc028cdaf0cc7795460543646
+  data.tar.gz: 0706a612363b5f0f7ae1dab7c8ba818841e2f8da
 SHA512:
-  metadata.gz: a0c58a8e19a54f3668fb48513c7d5998db368d014dc8845b163ab9c40a225666d70155b3b2c4b33325f644276832d1ec2f9d162b89073b0415806a3b688dce11
-  data.tar.gz: a3c587aa48b6fff6e7ff1120a6872195cdf2a500cf85066f81da18004522a03d2dc1d4c231da8f7871b5c0e18cec382cb1dc9effddda723040afe7cdeb8bc19e
+  metadata.gz: 2591f7c7baea9dd4fee1ea2b1dbe3f0da0ce41227ca003ab005b8b0ddbf6b01ed65ba632323d249ba9fa793b99fe85e5139673a5a0ff6bc5490a0850db21a859
+  data.tar.gz: d2f7fb74fbd96ec6e7c7ece17de47dcbc2a17ee1a8a8d7cb55bf26997fdfc9baf20639d3e75db666689558d21e54f9c9bc17e20402ab4d6462116e1986cb98ed

data/README.md

@@ -13,29 +13,30 @@ gem 'ruboty-tweetstream'
 ## Usage
 
 ```
-@ruboty add ts @<username>
-@ruboty delete ts @<username>
-@ruboty list ts
+@ruboty add stream @<username>
+@ruboty delete stream <id>
+@ruboty list streams
+@ruboty list streams --all
 ```
 
 ## Example
 
 ```
-> @ruboty add ts @kaihar4
+> @ruboty add stream @kaihar4
 '@kaihar4' stream is started.
-@kaihar4> テスト1
-@kaihar4> テスト2
-> @ruboty list ts
-@kaihar4
-> @ruboty delete ts @kaihar4
-'@kaihar4' stream is stopped.
+@kaihar4> test1
+@kaihar4> test2
+> @ruboty list streams
+123: @kaihar4
+> @ruboty delete stream 123
+'123' stream is stopped.
 ```
 
 ## Setup
 
 Ruboty::Tweetstream requires access tokens.
 
-Please get from [Here](https://apps.twitter.com/).
+Please get keys from [here](https://apps.twitter.com/).
 
 ```
 export CONSUMER_KEY=

data/lib/ruboty/handlers/tweetstream.rb

@@ -1,11 +1,25 @@
 require 'twitter'
+require 'xrc'
+
+Ruboty::Message.class_eval do
+  XMPP_PATERN = /\A(?:([^@]*)@)??([^@\/]*)(?:\/(.*?))?\z/
+
+  def channel
+    if XMPP_PATERN === from
+      # Get foobar@example.com in foobar@example.com/bot
+      Xrc::Jid.new(from).strip
+    else
+      from
+    end
+  end
+end
 
 module Ruboty
   module Handlers
     class Tweetstream < Base
-      on /add ts @(?<username>.+)/, name: 'add', description: 'Add a tweetstream'
-      on /list ts\z/, name: 'list', description: 'Show all tweetstreams'
-      on /delete ts @(?<username>.+)/, name: 'delete', description: 'Delete a tweetstream'
+      on /add stream @(?<username>.+)/, name: 'add', description: 'Add a tweetstream'
+      on /list streams(?<all_flag> --all)?\z/, name: 'list', description: 'Show all tweetstreams'
+      on /delete stream (?<id>.+)/, name: 'delete', description: 'Delete a tweetstream'
 
       def initialize(*args)
         super
@@ -13,55 +27,75 @@ module Ruboty
       end
 
       def add(message)
+        id = generate_id
         username = message[:username]
-        if streams.has_key?(username)
+        channel = message.channel
+
+        if stream_exists?(username, channel)
           message.reply("'@#{username}' stream is already started.")
         else
           stream = Ruboty::Tweetstream::Stream.new(
             message.original.except(:robot).merge(
               username: username,
-              id: twitter_id(username)
+              twitter_id: twitter_id(username),
+              channel: channel
             )
           )
 
           stream.start(robot)
-          running_streams[username] = stream
+          running_streams[id] = stream
 
-          streams[username] = stream.hash
+          streams[id] = stream.hash
           message.reply("'@#{username}' stream is started.")
         end
+      rescue Twitter::Error::Forbidden
+        message.reply('Unable to verify your credentials.')
       end
 
       def delete(message)
-        username = message[:username]
-        if streams.has_key?(username)
-          running_streams[username].stop
-          running_streams.delete(username)
+        id = message[:id].to_i
+        if streams.has_key?(id)
+          running_streams[id].stop
+          running_streams.delete(id)
 
-          streams.delete(username)
-          message.reply("'@#{username}' stream is stopped.")
+          streams.delete(id)
+          message.reply("'#{id}' stream is stopped.")
         else
-          message.reply("'@#{username}' stream is not found.")
+          message.reply("'#{id}' stream is not found.")
         end
       end
 
       def list(message)
-        if streams.empty?
+        sorted_streams = streams.sort_by {|_id, hash| hash[:username]}
+
+        if message[:all_flag]
+          stream_list = sorted_streams.map do |id, hash|
+            stream = "#{id}: @#{hash[:username]}"
+            stream << " (#{hash[:channel]})" unless hash[:channel].nil?
+            stream
+          end
+        else
+          stream_list = sorted_streams.map { |id, hash|
+            # Skip the channel that registered from other channel.
+            next unless hash[:channel] == message.channel
+
+            "#{id}: @#{hash[:username]}"
+          }.compact
+        end
+
+        if stream_list.empty?
           message.reply("The stream doesn't exist.")
         else
-          stream_list = streams.map do |username, _hash|
-            "@#{username}"
-          end.join("\t")
-          message.reply(stream_list, code: true)
+          message.reply(stream_list.join("\n"), code: true)
         end
       end
 
       def restart
-        streams.each do |username, hash|
+        streams.each do |id, hash|
           stream = Ruboty::Tweetstream::Stream.new(hash)
 
           stream.start(robot)
-          running_streams[username] = stream
+          running_streams[id] = stream
         end
       end
 
@@ -82,6 +116,20 @@ module Ruboty
         end
         client.user(username).id
       end
+
+      def generate_id
+        loop do
+          id = rand(1000)
+          break id unless streams.has_key?(id)
+        end
+      end
+
+      def stream_exists?(username, channel)
+        streams.each do |_id, hash|
+          return true if hash[:username] == username && hash[:channel] == channel
+        end
+        return false
+      end
     end
   end
 end

data/lib/ruboty/tweetstream/stream.rb

@@ -1,11 +1,9 @@
 require 'twitter'
 
-module Twitter
-  class Tweet
-    def is_pure_user_tweet?(username)
-      self.in_reply_to_screen_name.nil? &&\
-        !self.full_text.include?("@#{username}")
-    end
+Twitter::Tweet.class_eval do
+  def is_pure_user_tweet?(username)
+    self.in_reply_to_screen_name.nil? &&\
+      !self.full_text.include?("@#{username}")
   end
 end
 
@@ -27,10 +25,10 @@ module Ruboty
 
       def start(robot)
         @thread = Thread.start do
-          @client.filter(follow: hash[:id].to_s) do |object|
+          @client.filter(follow: hash[:twitter_id].to_s) do |object|
             if object.is_a?(Twitter::Tweet) && object.is_pure_user_tweet?(hash[:username])
               Message.new(
-                hash.except(:username, :id).merge(robot: robot)
+                hash.except(:username, :twitter_id).merge(robot: robot)
               ).reply("@#{hash[:username]}> #{object.full_text}")
             end
           end

data/lib/ruboty/tweetstream/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Tweetstream
-    VERSION = '0.0.3'
+    VERSION = '0.1.0'
   end
 end

data/ruboty-tweetstream.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ruboty'
   spec.add_dependency 'twitter'
+  spec.add_dependency 'xrc'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-tweetstream
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement