twitter2jabber 0.0.6 → 0.0.7

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.0.6
+This documentation refers to twitter2jabber version 0.0.7
 
 
 == DESCRIPTION

data/TODO

@@ -1,4 +1,4 @@
-- in reply to
+- 'direct message' command
 - persistent cache! (friends_timeline: since/since_id?)
 - OAuth (register: http://twitter.com/oauth_clients/new)
 - better interrupt handling (in loop mode)

data/lib/twitter2jabber.rb

@@ -102,7 +102,10 @@ class Twitter2Jabber
 
     i, seen = 1, Hash.new { |h, k| h[k] = true; false }
 
-    trap(:INT) { i = -1 }
+    trap(:INT) {
+      log "SIGINT received #{Time.now}, shutting down..."
+      i = -1
+    }
 
     while i > 0
       run(recipients, seen, i % ratio == 1, &block)
@@ -111,6 +114,8 @@ class Twitter2Jabber
 
       i += 1
     end
+
+    log "KTHXBYE (#{Time.now})"
   end
 
   def deliver_tweets(recipients, seen = {}, &block)
@@ -224,17 +229,19 @@ class Twitter2Jabber
     case body
       when /\Ahe?(?:lp)?\z/i
         deliver(from, <<-HELP) if execute
-h[e[lp]]                     -- Print this help
+h[e[lp]]                          -- Print this help
 
-de[bug]                      -- Print debug mode
-de[bug] on|off               -- Turn debug mode on/off
+de[bug]                           -- Print debug mode
+de[bug] on|off                    -- Turn debug mode on/off
 
-bl[ock] #ID                  -- Block ID
-fa[v[orite]] #ID             -- Create favorite #ID
+bl[ock] #USER                     -- Block USER
+fa[v[orite]] #ID                  -- Add #ID to favorites
 
-re[ply] #ID[:] [!] STATUS    -- Reply to ID (Force if too long)
-le[n[gth]] STATUS            -- Determine length
-[!] STATUS                   -- Update status (Force if too long)
+rt|retweet #ID[:] [!] [STATUS]    -- Retweet ID (Force if too long)
+re[ply] #ID[:] [!] STATUS         -- Reply to ID (Force if too long)
+
+le[n[gth]] STATUS                 -- Determine length
+[!] STATUS                        -- Update status (Force if too long)
 
 (Note: Message body must be shorter than #{MAX_LENGTH} characters)
         HELP
@@ -251,7 +258,7 @@ le[n[gth]] STATUS            -- Determine length
 
           deliver(from, "DEBUG = #{debug ? 'on' : 'off'}")
         end
-      when /\Abl(?:ock)?\s+#?(\d+)\z/i
+      when /\Abl(?:ock)?\s+#?(\w+)\z/i
         twitter.block($1) if execute && !debug
       when /\Afav?(?:orite)?\s+#?(\d+)\z/i
         twitter.favorite_create($1) if execute && !debug
@@ -269,11 +276,16 @@ le[n[gth]] STATUS            -- Determine length
           return
         end
 
-        if body.sub!(/\Are(?:ply)?\s+#?(\d+):?\s+/i, '')
+        if body.sub!(/\A(?:rt|retweet)?\s+#?(\d+)(?::?\s+|\z)/i, '')
+          tweet = twitter.status($1)
+
+          body << ' ' unless body.empty?
+          body << '@' << tweet.user.screen_name << ': ' << tweet.body
+        elsif body.sub!(/\Are(?:ply)?\s+#?(\d+):?\s+/i, '')
           options[:in_reply_to_status_id] = $1
         end
 
-        if body.sub!(/\A!\s+/, '')
+        if body.sub!(/\A!(?:\s+|\z)/, '')
           force = true
         end
 

data/lib/twitter2jabber/version.rb

@@ -4,7 +4,7 @@ class Twitter2Jabber
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 6
+    TINY  = 7
 
     class << self
 

data/sample/templates/tweet.html

@@ -1,3 +1,3 @@
 <%= user.name %> (<a href="http://twitter.com/<%= user.screen_name %>"><%= user.screen_name %></a>) [<%= tweet.created_at %>]:
 <br /><br />
-<img src="<%= user.profile_image_url %>" alt="[<%= user.screen_name %>]" /> <%= tweet.text %> | #<%= tweet.id %>
+<img src="<%= user.profile_image_url %>" alt="[<%= user.screen_name %>]" /> <%= tweet.text %> | #<%= tweet.id %><% if tweet.in_reply_to_id %> (irt <a href="http://twitter.com/<%= tweet.in_reply_to_screen_name %>/status/<%= tweet.in_reply_to_id %>"><%= tweet.in_reply_to_screen_name %></a>)<% end %>

data/sample/templates/tweet.txt

@@ -1,3 +1,3 @@
 <%= user.name %> (<%= user.screen_name %>) [<%= tweet.created_at %>]:
 
-<%= tweet.text %> | #<%= tweet.id %>
+<%= tweet.text %> | #<%= tweet.id %><% if tweet.in_reply_to_id %> (irt <%= tweet.in_reply_to_screen_name %>)<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2jabber
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-21 00:00:00 +02:00
+date: 2009-08-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency