@@ -24,21 +24,20 @@ module Termtter::Client :help => ['retweet,rt (ID|@USER)', 'Post a retweet message'], :exec_proc => lambda {|arg| arg, comment = arg.split(/\s/, 2) - txt = if public_storage[:typable_id] && s = typable_id_status(arg) - post_retweet(s, comment) - else - case arg - when /(\d+)/ - post_retweet(Termtter::API.twitter.show(arg), comment) - when /@([A-Za-z0-9_]+)/ - user = $1 - statuses = Termtter::API.twitter.user_timeline(user) - return if statuses.empty? - post_retweet(statuses[0], comment) - end - end - return txt + if public_storage[:typable_id] && s = typable_id_status(arg) + post_retweet(s, comment) + else + case arg + when /(\d+)/ + post_retweet(Termtter::API.twitter.show(arg), comment) + when /@([A-Za-z0-9_]+)/ + user = $1 + statuses = Termtter::API.twitter.user_timeline(user) + return if statuses.empty? + post_retweet(statuses[0], comment) + end + end } ) end lib/plugins/defaults/retweet.rb @@ -257,25 +257,25 @@ module Termtter::Client register_command( :name => :favorite, :aliases => [:fav], :exec_proc => lambda {|arg| - id = 0 - case arg - when /^\d+/ - id = arg.to_i - when /^@([A-Za-z0-9_]+)/ - user_name = normalize_as_user_name($1) - statuses = Termtter::API.twitter.user_timeline(user_name) - return if statuses.empty? - id = statuses[0].id - when /^\/(.*)$/ - word = $1 - raise "Not implemented yet." - else - if public_storage[:typable_id] && typable_id?(arg) - id = typable_id_convert(arg) + id = + case arg + when /^\d+/ + arg.to_i + when /^@([A-Za-z0-9_]+)/ + user_name = normalize_as_user_name($1) + statuses = Termtter::API.twitter.user_timeline(user_name) + return if statuses.empty? + statuses[0].id + when /^\/(.*)$/ + word = $1 + raise "Not implemented yet." else - return + if public_storage[:typable_id] && typable_id?(arg) + typable_id_convert(arg) + else + return + end end - end r = Termtter::API.twitter.favorite id puts "Favorited status ##{r.id} on user @#{r.user.screen_name} #{r.text}" lib/plugins/defaults/standard_commands.rb @@ -64,7 +64,7 @@ module Termtter # match? :: String -> Boolean def match?(input) - !(pattern !~input) + pattern === input end # pattern :: Regexp lib/termtter/command.rb 9967bae615af195192c52fb061814c07d8bc9432 nanki nanki@dotswitch.net http://github.com/ohac/termtter/commit/ab2792b329d282ff78541beeee780579790ea343 ab2792b329d282ff78541beeee780579790ea343 2009-11-09T23:33:47-08:00 2009-11-09T23:33:47-08:00 refactoring. 871921b6a605fef10bbabd1c35d79a3d48830c0f nanki nanki@dotswitch.net