ayadn 1.0.13 → 1.1.0

data/lib/ayadn/blacklist.rb

@@ -25,9 +25,10 @@ module Ayadn
 
     desc "list", "List the content of your blacklist"
     long_desc Descriptions.blacklist_list
+    option :raw, aliases: "-x", type: :boolean, desc: "Outputs the raw list in CSV"
     def list
       blacklist = BlacklistWorkers.new
-      blacklist.list
+      blacklist.list(options)
     end
 
     desc "import DATABASE", "Imports a blacklist database from another Ayadn account"
@@ -37,6 +38,15 @@ module Ayadn
       blacklist.import(database)
       puts Status.done
     end
+
+    desc "convert", "Convert your current blacklist database to the new format"
+    long_desc Descriptions.blacklist_convert
+    def convert
+      blacklist = BlacklistWorkers.new
+      blacklist.convert
+      puts Status.done
+    end
+
   end
 
   class BlacklistWorkers
@@ -61,6 +71,13 @@ module Ayadn
         Databases.close_all
       end
     end
+    def convert
+      begin
+        Databases.convert_blacklist
+      ensure
+        Databases.close_all
+      end
+    end
     def add(args)
       begin
         type, target = args[0], args[1]
@@ -100,17 +117,27 @@ module Ayadn
         Databases.close_all
       end
     end
-    def list
+    def list(options)
       begin
-        list = Databases.blacklist
-        unless list.empty?
-          puts Workers.new.build_blacklist_list(list)
-        else
-          abort(Status.empty_list)
-        end
+        show_list(options)
       ensure
         Databases.close_all
       end
     end
+
+    private
+
+    def show_list(options)
+      list = Databases.blacklist
+      unless list.empty?
+        if options[:raw]
+          list.each {|v,k| puts "#{v},#{k}"}
+        else
+          puts Workers.new.build_blacklist_list(list)
+        end
+      else
+        abort(Status.empty_list)
+      end
+    end
   end
 end

data/lib/ayadn/databases.rb

@@ -25,23 +25,32 @@ module Ayadn
     end
 
     def self.add_mention_to_blacklist(target)
-      @blacklist[target] = :mention
+      @blacklist[target.downcase] = :mention
     end
     def self.add_client_to_blacklist(target)
-      @blacklist[target] = :client
+      @blacklist[target.downcase] = :client
     end
     def self.add_hashtag_to_blacklist(target)
-      @blacklist[target] = :hashtag
+      @blacklist[target.downcase] = :hashtag
     end
     def self.remove_from_blacklist(target)
-      @blacklist.delete(target)
+      @blacklist.delete(target.downcase)
     end
     def self.import_blacklist(blacklist)
       new_list = Daybreak::DB.new blacklist
       new_list.each {|name,type| @blacklist[name] = type}
       new_list.close
     end
-
+    def self.convert_blacklist
+      dummy = {}
+      @blacklist.each do |v,k|
+        dummy[v.downcase] = k
+      end
+      @blacklist.clear
+      dummy.each do |v,k|
+        @blacklist[v] = k
+      end
+    end
     def self.save_max_id(stream)
       @pagination[stream['meta']['marker']['name']] = stream['meta']['max_id']
     end

data/lib/ayadn/descriptions.rb

@@ -13,6 +13,9 @@ module Ayadn
     def self.options_raw
       "Outputs the App.net raw JSON response"
     end
+    def self.options_extract
+      "Extract links from each object"
+    end
     def self.unified
       <<-USAGE
       Show your App.net timeline, aka the Unified Stream.
@@ -495,6 +498,20 @@ module Ayadn
       \n\n
       USAGE
     end
+    def self.delete_m
+      <<-USAGE
+      Delete a message (private message or message in a channel).
+
+      Usage:
+
+      ayadn delete_m 42666 3365251
+
+      ayadn -DM 42666 3365251
+
+      ayadn -DM my_channel_alias 3365251
+      \n\n
+      USAGE
+    end
     def self.unfollow
       <<-USAGE
       Unfollow a user.
@@ -911,6 +928,8 @@ module Ayadn
       <<-USAGE
       Adds a mention, hashtag or client to your blacklist.
 
+      You don't have to respect the case as all data is recorded downcase.
+
       Usage:
 
       ayadn blacklist add mention @shmuck
@@ -929,6 +948,8 @@ module Ayadn
       <<-USAGE
       Removes a mention, hashtag or client from your blacklist.
 
+      You don't have to respect the case as all data is recorded downcase.
+
       Usage:
 
       ayadn blacklist remove mention @shmuck
@@ -953,6 +974,18 @@ module Ayadn
       \n\n
       USAGE
     end
+    def self.blacklist_convert
+      <<-USAGE
+      Convert your current blacklist database to the new format. Useful if you used the blacklist command prior to Ayadn 10.0.13.
+
+      Usage:
+
+      ayadn blacklist convert
+
+      ayadn -K convert
+      \n\n
+      USAGE
+    end
     def self.blacklist_list
       <<-USAGE
       Lists the content of your blacklist.

data/lib/ayadn/endpoints.rb

@@ -185,6 +185,10 @@ module Ayadn
       "#{@posts_url}#{post_id}?access_token=#{Settings.user_token}"
     end
 
+    def delete_message(channel_id, message_id)
+      "#{@channels_url}/#{channel_id}/messages/#{message_id}?access_token=#{Settings.user_token}"
+    end
+
     def follow(username)
       "#{@users_url}#{username}/follow?access_token=#{Settings.user_token}"
     end

data/lib/ayadn/errors.rb

@@ -11,7 +11,7 @@ module Ayadn
       Logs.rec.debug "STACK: #{caller}"
       Logs.rec.error "--END--"
       puts "\n(error logged in #{Settings.config[:paths][:log]}/ayadn.log)\n".color(:blue)
-      raise error
+      #raise error
       exit
     end
     def self.error(status)

data/lib/ayadn/scroll.rb

@@ -7,44 +7,28 @@ module Ayadn
       @view = view
     end
 
-    def global(options)
-      options = check_raw(options)
-      loop do
-        begin
-          stream = @api.get_global(options)
-          if Databases.has_new?(stream, 'global')
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
-        rescue Interrupt
-          canceled
-        rescue => e
-          raise e
-        end
+    def method_missing(meth, options)
+      case meth.to_s
+      when 'trending', 'photos', 'checkins', 'replies', 'global', 'unified'
+        scroll_it(meth.to_s, options)
+      else
+        super
       end
     end
 
-    def unified(options)
+    def scroll_it(target, options)
       options = check_raw(options)
+      orig_target = target
       loop do
         begin
-          stream = @api.get_unified(options)
-          if Databases.has_new?(stream, 'unified')
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?   #check if there isn't lost posts
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
+          stream = get(target, options)
+          target = "explore:#{target}" if explore?(target)
+          show_if_new(stream, options, target)
+          target = orig_target if target =~ /explore/
+          options = save_then_return(stream, options)
+          pause
         rescue Interrupt
           canceled
-        rescue => e
-          raise e
         end
       end
     end
@@ -56,18 +40,11 @@ module Ayadn
       loop do
         begin
           stream = @api.get_mentions(username, options)
-          if Databases.has_new?(stream, "mentions:#{id}")
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
+          show_if_new(stream, options, "mentions:#{id}")
+          options = save_then_return(stream, options)
+          pause
         rescue Interrupt
           canceled
-        rescue => e
-          raise e
         end
       end
     end
@@ -79,18 +56,11 @@ module Ayadn
       loop do
         begin
           stream = @api.get_posts(username, options)
-          if Databases.has_new?(stream, "posts:#{id}")
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
+          show_if_new(stream, options, "posts:#{id}")
+          options = save_then_return(stream, options)
+          pause
         rescue Interrupt
           canceled
-        rescue => e
-          raise e
         end
       end
     end
@@ -100,128 +70,72 @@ module Ayadn
       loop do
         begin
           stream = @api.get_convo(post_id, options)
-          if Databases.has_new?(stream, "replies:#{post_id}")
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
+          show_if_new(stream, options, "replies:#{post_id}")
+          options = save_then_return(stream, options)
+          pause
         rescue Interrupt
           canceled
-        rescue => e
-          raise e
         end
       end
     end
 
-    def conversations(options)
+    def messages(channel_id, options)
       options = check_raw(options)
       loop do
         begin
-          stream = @api.get_conversations(options)
-          if Databases.has_new?(stream, 'explore:replies')
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
+          stream = @api.get_messages(channel_id, options)
+          show_if_new(stream, options, "channel:#{channel_id}")
+          options = save_then_return(stream, options)
+          pause
         rescue Interrupt
           canceled
-        rescue => e
-          raise e
         end
       end
     end
 
-    def trending(options)
-      options = check_raw(options)
-      loop do
-        begin
-          stream = @api.get_trending(options)
-          if Databases.has_new?(stream, 'explore:trending')
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
-        rescue Interrupt
-          canceled
-        rescue => e
-          raise e
-        end
+    private
+
+    def get(target, options)
+      case target
+      when 'global'
+        @api.get_global(options)
+      when 'unified'
+        @api.get_unified(options)
+      when 'trending'
+        @api.get_trending(options)
+      when 'photos'
+        @api.get_photos(options)
+      when 'checkins'
+        @api.get_checkins(options)
+      when 'replies'
+        @api.get_conversations(options)
       end
     end
 
-    def checkins(options)
-      options = check_raw(options)
-      loop do
-        begin
-          stream = @api.get_checkins(options)
-          if Databases.has_new?(stream, 'explore:checkins')
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
-        rescue Interrupt
-          canceled
-        rescue => e
-          raise e
-        end
+    def explore?(target)
+      case target
+      when 'trending', 'photos', 'checkins', 'replies'
+        true
+      else
+        false
       end
     end
 
-    def photos(options)
-      options = check_raw(options)
-      loop do
-        begin
-          stream = @api.get_photos(options)
-          if Databases.has_new?(stream, 'explore:photos')
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
-        rescue Interrupt
-          canceled
-        rescue => e
-          raise e
-        end
-      end
+    def pause
+      sleep Settings.options[:scroll][:timer]
     end
 
-    def messages(channel_id, options)
-      options = check_raw(options)
-      loop do
-        begin
-          stream = @api.get_messages(channel_id, options)
-          if Databases.has_new?(stream, "channel:#{channel_id}")
-            show(stream, options)
-          end
-          unless stream['meta']['max_id'].nil?
-            Databases.save_max_id(stream)
-            options = options_hash(stream)
-          end
-          sleep Settings.options[:scroll][:timer]
-        rescue Interrupt
-          canceled
-        rescue => e
-          raise e
-        end
-      end
+    def show_if_new(stream, options, target)
+      show(stream, options) if Databases.has_new?(stream, target)
     end
 
-    private
+    def save_then_return(stream, options)
+      unless stream['meta']['max_id'].nil?
+        Databases.save_max_id(stream)
+        return options_hash(stream)
+      end
+      options
+    end
 
     def check_raw(options)
       if options[:raw]