friendfeed 0.1.13 → 0.1.14

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/bin/tw2ff

@@ -106,6 +106,12 @@ class FriendFeed::Client
     }
     t.unlink
   end
+
+  def follow_twitter_user(twitter_name, display_name, picture_url = nil)
+    id = create_imaginary_friend(display_name)
+    add_twitter(id, twitter_name, 'includeatreplies' => 'on')
+    change_picture_to_url(id, picture_url) if picture_url
+  end
 end
 
 def friendfeed_client
@@ -131,10 +137,6 @@ class Twitter::Base
     }
     list
   end
-
-  def get_profile(name)
-    friends(:screen_name => name).first
-  end
 end
 
 def twitter_client
@@ -175,13 +177,67 @@ EOF
       system ENV['VISUAL'] || ENV['EDITOR'] || 'vi', ConfigFile()
     end
   end
+
+  mode 'follow' do
+    description 'Import a Twitter user to FriendFeed as an "imaginary friend"'
+
+    option('name-format') {
+      description 'A printf format to generate an imaginary friend\'s name from a Twitter name'
+
+      argument_required
+      default '(%s)'
+    }
+
+    argument('names') {
+      description 'List of Twitter user names to follow'
+      arity -1
+    }
+
+    def run
+      name_format = params['name-format'].value
+
+      names = params['names'].values
+
+      exit if names.empty?
+
+      names.each { |name|
+        twuser =
+          begin
+            twitter_client().user(name)
+          rescue Twitter::NotFound
+            putinfo 'Twitter user not found: %s', name
+            next
+          rescue => e
+            putinfo 'Twitter user not accessible: %s: %s', name, e
+            next
+          end
+
+        if !twuser.status
+          putinfo 'Twitter user may not be followable: %s', name
+        end
+
+        putinfo 'Creating an imaginary friend for %s', name
+        friendfeed_client().follow_twitter_user(name, name_format % name,
+          twuser.profile_image_url)
+      }
+    end
+  end
   
   mode 'friends' do
     description 'Import Twitter-only friends to FriendFeed as "imaginary friends"'
 
+    option('name-format') {
+      description 'A printf format to generate an imaginary friend\'s name from a Twitter name'
+
+      argument_required
+      default '(%s)'
+    }
+
     def run
       require 'set'
 
+      name_format = params['name-format'].value
+
       ffcli = friendfeed_client()
 
       subscribed_real = Set[]
@@ -258,12 +314,8 @@ EOF
 
       to_subscribe.each { |name|
         putinfo 'Creating an imaginary friend for %s', name
-        id = ffcli.create_imaginary_friend('(%s)' % name)
-        ffcli.add_twitter(id, name)
-        if url = picture_urls[name]
-          putinfo 'Setting the picture of %s', name
-          ffcli.change_picture_to_url(id, url)
-        end
+        friendfeed_client().follow_twitter_user(name, name_format % name,
+          picture_urls[name])
       }
 
       printf <<-EOS, 'http://friendfeed.com/friends/twitter?username=' + URI.escape(twitter_me)
@@ -299,7 +351,7 @@ to see if someone is joining FriendFeed:
             if picture_urls.key?(name)
               url = picture_urls[name]
             else
-              friend = twcli.get_profile(name) rescue
+              friend = twcli.user(name) rescue
                 begin
                   putinfo "Failed to get profile of %s", name
                   next
@@ -315,6 +367,32 @@ to see if someone is joining FriendFeed:
     end
   end
 
+  mode 'includeatreplies' do
+    description 'Fix imaginary friends to include @replies'
+
+    def run
+      ffcli = friendfeed_client()
+
+      putinfo "Checking imaginary friends in FriendFeed..."
+      ffcli.get_imaginary_friends.each { |profile|
+        id = profile['id']
+        ffcli.get_services(id).each { |service|
+          url = service['profileUrl'] or next
+
+          if (name = TWITTER_URI.route_to(url).to_s).match(/\A[A-Za-z0-9_]+\z/)
+            name.downcase!
+            putinfo 'Trying to include @replies by %s', name
+            begin
+              ffcli.edit_service(id, service['serviceid'], 'includeatreplies' => 'on')
+            rescue => e
+              putinfo 'Failed, maybe due to the Twitter account removal or a network problem.'
+            end
+          end
+        }
+      }
+    end
+  end
+
   mode 'favorites' do
     description 'Synchronize Twitter favorites and FriendFeed likes as far as possible'
 

data/friendfeed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendfeed}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akinori MUSHA"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-06-01}
   s.default_executable = %q{tw2ff}
   s.description = %q{This is a Ruby library to provide access to FriendFeed API's.
 
@@ -42,7 +42,7 @@ manipulating friends, groups and services for your personal purposes.
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{friendfeed}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Ruby library to provide access to FriendFeed API's}
   s.test_files = [
     "test/friendfeed_test.rb",
@@ -53,7 +53,7 @@ manipulating friends, groups and services for your personal purposes.
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
     else

data/lib/friendfeed/unofficial.rb

@@ -145,11 +145,11 @@ module FriendFeed
       hash = { 'stream' => id }
       form.xpath(".//input").each { |input|
         case input['type'].downcase
-        when 'text'
+        when 'text', 'hidden'
           hash[input['name']] = input['value']
         when 'radio', 'checkbox'
           if input['checked']
-            value = input['value']
+            value = input['value'] || 'on'
             if value && !value.empty?
               hash[input['name']] = value
             end
@@ -166,10 +166,36 @@ module FriendFeed
     # Supported fields are 'nickname', 'name', 'description', 'access'
     # ('private', 'semipublic' or 'public'), and 'anyoneinvite' (none
     # or '1').  [unofficial]
-    def edit_group(id, hash)
-      param_hash = get_group(id)
-      param_hash.update(hash)
-      post(EDIT_GROUP_URI, param_hash)
+    def edit_group(id, options)
+      params = get_group(id)
+      params.update(options)
+      post(EDIT_GROUP_URI, params)
+    end
+
+    # Gets information of a service specified by a unique
+    # ID. [unofficial]
+    def get_service(id, serviceid)
+      parser = post(ROOT_URI + '/a/servicedialog',
+        'serviceid' => serviceid, 'stream' => id)['html_parser']
+      form = parser.at("//form[1]")
+      hash = { 'stream' => id }
+      form.xpath(".//input").each { |input|
+        case input['type'].downcase
+        when 'text', 'hidden'
+          hash[input['name']] = input['value']
+        when 'radio', 'checkbox'
+          if input['checked']
+            value = input['value'] || 'on'
+            if value && !value.empty?
+              hash[input['name']] = value
+            end
+          end
+        end
+      }
+      form.xpath(".//textarea").each { |input|
+        hash[input['name']] = input.text
+      }
+      hash
     end
 
     # Adds a feed to the authenticated user, a group or an imaginary
@@ -187,12 +213,8 @@ module FriendFeed
 
     # Edits a service of the authenticated user, a group or an
     # imaginary friend specified by a unique ID. [unofficial]
-    def edit_service(id, serviceid, service, options = nil)
-      params = {
-        'stream' => id,
-        'service' => service,
-        'serviceid' => serviceid,
-      }
+    def edit_service(id, serviceid, options = nil)
+      params = get_service(id, serviceid)
       params.update(options) if options
       post(ROOT_URI + '/a/configureservice', params)
     end
@@ -244,65 +266,10 @@ module FriendFeed
 
     # Adds a Twitter service to the authenticated user, a group or an
     # imaginary friend specified by a unique ID. [unofficial]
-    def add_twitter(id, twitter_name)
-      add_service(id, 'twitter', 'username' => twitter_name)
-    end
-
-    # Edits a feed of the authenticated user, a group or an imaginary
-    # friend specified by a unique ID.  Specify 'isstatus' => 'on' to
-    # display entries as messages (no link), and 'importcomment' =>
-    # 'on' to include entry description as a comment. [unofficial]
-    def edit_feed(id, serviceid, url, options = nil)
-      params = { 'url' => url }
-      params.update(options) if options
-      edit_service(id, 'feed', options)
-    end
-
-    # Adds a blog feed to the authenticated user, a group or an
-    # imaginary friend specified by a unique ID.  Specify 'multiauth'
-    # => 'on' when the blog has multiple authors, and 'author' =>
-    # '(name)' to limit entries to those written by a specific
-    # author. [unofficial]
-    def edit_blog(id, url, options = nil)
-      params = { 'url' => url }
-      params.update(options) if options
-      edit_service(id, 'blog', options)
-    end
-
-    # Edits a Twitter service of the authenticated user, a group or an
-    # imaginary friend specified by a unique ID.  Specify 'isstatus'
-    # => 'on' to display entries as messages (no link), and
-    # 'importcomment' => 'on' to include entry description as a
-    # comment. [unofficial]
-    def edit_twitter(id, serviceid, twitter_name)
-      edit_service(id, serviceid, 'twitter', 'username' => twitter_name)
-    end
-
-    # Removes a feed from the authenticated user, a group or an
-    # imaginary friend specified by a unique ID.  Specify
-    # 'deleteentries' => 'on' to delete entries also. [unofficial]
-    def remove_feed(id, serviceid, url, options = nil)
-      params = { 'url' => url }
-      params.update(options) if options
-      remove_service(id, serviceid, 'feed', options = nil)
-    end
-
-    # Removes a blog feed from the authenticated user, a group or an
-    # imaginary friend specified by a unique ID.  Specify
-    # 'deleteentries' => 'on' to delete entries also. [unofficial]
-    def remove_blog(id, serviceid, url, options = nil)
-      params = { 'url' => url }
-      params.update(options) if options
-      remove_service(id, serviceid, 'blog', options = nil)
-    end
-
-    # Removes a Twitter service from the authenticated user, a group
-    # or an imaginary friend specified by a unique ID.  Specify
-    # 'deleteentries' => 'on' to delete entries also. [unofficial]
-    def remove_twitter(id, serviceid, twitter_name, options = nil)
+    def add_twitter(id, twitter_name, options = nil)
       params = { 'username' => twitter_name }
       params.update(options) if options
-      remove_service(id, serviceid, 'twitter', options = nil)
+      add_service(id, 'twitter', params)
     end
 
     # Changes the picture of the authenticated user, a group or an

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: friendfeed
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
+  hash: 7
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -9,29 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +09:00
+date: 2010-06-01 00:00:00 +09:00
 default_executable: tw2ff
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mechanize
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: |
   This is a Ruby library to provide access to FriendFeed API's.
   
@@ -71,21 +87,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: friendfeed
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby library to provide access to FriendFeed API's