ayadn 1.0.13 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 178f8d0b90c3d05a395d913d20b5ceeb8e9e4889
-  data.tar.gz: f8905a19ce739307c6dd510a8776e2ea58c1e11e
+  metadata.gz: ec4024b66d88bd66154dec00328a519791012ec6
+  data.tar.gz: 723fa86ee438661970ea213b71f69bd3f5b78e62
 SHA512:
-  metadata.gz: 7dc47ef7305ce368c37200bac11320620ed2fdd25733bba82df29e6449e750420de501b7f2d43239267d324ea4c551d90024db2d616f997bf30d7a221e97b9bd
-  data.tar.gz: 491d12154549d299528217d8561edfbf4eb6e2d44b8bac4baac906b9480d0dde2413ec8821844590bc8eb1a2ef7f349464a24d53a854a5bf238d5b5e4d015eee
+  metadata.gz: dc50e43e6f535da4b7c686aefcfb634d6406b3ac4109f1422be2ac44c2b0c536027d5cc07c4f311ce17c4c164990b718c7cac75e2c9aae03eb2440a0b1a314c3
+  data.tar.gz: 91df36971df60e26dcf8f90aa836401780af35bb70a6c40dfd1fe9aa9ba529c5792a01f06f69a78126ccb5acddb9efa3d2ae57b2d5deb03b5b8e170ecacbf9cc

data/CHANGELOG.md

@@ -1,35 +1,47 @@
-# 1.0.13
+# 1.1.0 - 'Leviathan'
+
+- Show who's writing, and who's the recipient
+- Less help text when writing, more concise
+- The blacklist works better (recorded and compared downcased)
+- New command: convert blacklist
+- Export blacklist as CSV, aliases and settings as JSON
+- New option: 'extract'. Extracts all links from results of a search by word or by hashtag, or from the 'what starred' command
+- New command: show current version
+- New command: photos stream
+- New command: delete message (private or in a channel)
+
+# 1.0.13 - 'Charlotte'
 
 - New layout for '#nowplaying'
 - Compact index.db and pagination.db if necessary
 - New api urls
 - Fix 'download file'
 
-# 1.0.12
+# 1.0.12 - 'Rolando'
 
 - Fixed an error in: authorizing an account if its folders already exists
 
-# 1.0.11
+# 1.0.11 - 'Chris'
 
 - There was a typo in the last version that caused a bug in the PM command
 
-# 1.0.10
+# 1.0.10 - 'Johannes'
 
 - Fixes the help bug (doubled commands)
 - Auto adds the @ if missing in pm
 
-# 1.0.9
+# 1.0.9 - 'Brian'
 
 - Fixes the stubborn 'nowplaying' database bug
 
-# 1.0.8
+# 1.0.8 - 'Laurent'
 
 - Better error messages/logs (specifically when HTTP errors)
 - Token is anonymized if in error logs
 - No more database error when canceling a 'nowplaying' post
 - Better mentions colorization
 
-# 1.0.7
+# 1.0.7 - 'Hugo'
 
 - Machine-only messages in channels are now viewable
 - Don't output "Downloading" if options = raw in messages view
@@ -37,28 +49,28 @@
 - Removed username in front of ">>" in Auto (in case the authd user changed)
 - Compatibility with Windows is broken
 
-# 1.0.6
+# 1.0.6 - 'Matthew'
 
 - Fixed a bug where post_max_chars was displayed instead of message_max_chars
 - Show raw JSON in messages even if no data
 
-# 1.0.5
+# 1.0.5 - 'Joel'
 
 - Fixed the colorization for mentions
 - Added tests for colorization
 
-# 1.0.4
+# 1.0.4 - 'Jeremy'
 
 - Fixed 'reply to an indexed stream' for Ruby < 2.1
 - More tests for Databases
 - Tests for Blacklist
 - Tests for Set
 
-# 1.0.3
+# 1.0.3 - 'Donny'
 
 - Fixed the bug introduced by the last bugfix (yes, I know... sigh...)
 
-# 1.0.2
+# 1.0.2 - 'Mark'
 
 - Fixed a critical bug in Reply (when the original post was a repost)
 - Tests for Databases
@@ -66,7 +78,7 @@
 - Better layout for checkins
 - Better alert message if error 429
 
-# 1.0.1
+# 1.0.1 - 'Phoenix'
 
 Release!
 

data/MANUAL.md

@@ -17,10 +17,12 @@
 			- [INDEX](#index)
 			- [NEW](#new)
 			- [RAW](#raw)
+			- [EXTRACT](#extract)
 	- [GLOBAL](#global)
 	- [CHECKINS](#checkins)
 	- [CONVERSATIONS](#conversations)
 	- [TRENDING](#trending)
+	- [PHOTOS](#photos)
 	- [MENTIONS](#mentions)
 	- [POSTS](#posts)
 	- [MESSAGES](#messages)
@@ -40,6 +42,7 @@
 	- [SEND](#send)
 - [ACTIONS](#actions)
 	- [DELETE](#delete)
+	- [DELETE MESSAGE](#delete-message)
 	- [REPOST](#repost)
 	- [UNREPOST](#unrepost)
 	- [STAR](#star)
@@ -284,8 +287,26 @@ Displays only the new posts in the stream since your last visit.
 
 Displays the raw response from the App.net API instead of the formatted Ayadn output. For debugging and learning purposes.  
 
+`ayadn --raw timeline`
+
 `ayadn -x -tl`
 
+#### EXTRACT
+
+Extracts all links from posts.
+
+`ayadn hashtag --extract instagram`
+
+`ayadn -t -e instagram`
+
+`ayadn search --extract ruby gem`  
+
+`ayadn -s -e ruby gem`  
+
+`ayadn whatstarred @ericd -e`
+
+`ayadn -was -e ericd`
+
 ## GLOBAL
 
 Display the 'Global stream'.
@@ -330,6 +351,16 @@ This is a stream of trending posts.
 
 `ayadn -tr`
 
+## PHOTOS
+
+Display the 'Photos stream'.
+
+This is a stream of posts including a picture.
+
+`ayadn photos`
+
+`ayadn -ph`  
+
 ## MENTIONS
 
 Display posts containing a mention of @username.
@@ -544,6 +575,18 @@ Delete a post.
 
 `ayadn -D 23365251`
 
+## DELETE MESSAGE
+
+Delete a message. 
+
+You have to specify channel id (or alias) then message number.
+
+`ayadn delete_m 42666 3365251`
+
+`ayadn -DM 42666 3365251`
+
+`ayadn -DM my_alias 3365251`
+
 ## REPOST
 
 Repost a post.

data/README.md

@@ -1,5 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/ayadn.svg)](http://badge.fury.io/rb/ayadn) 
 [![Build Status](https://travis-ci.org/ericdke/na.svg?branch=master)](https://travis-ci.org/ericdke/na)
+[![Flattr this](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ericdejonckheere&url=https://github.com/ericdke/na&title=Ayadn&language=&tags=github&category=software)
 
 AYADN
 =====

data/lib/ayadn/action.rb

@@ -94,7 +94,7 @@ module Ayadn
         (no_new_posts unless Databases.has_new?(stream, 'explore:replies')) if options[:new]
         Databases.save_max_id(stream)
         render_view(stream, options)
-        Scroll.new(@api, @view).conversations(options) if options[:scroll]
+        Scroll.new(@api, @view).replies(options) if options[:scroll]
       rescue => e
         Errors.global_error("action/conversations", options, e)
       ensure
@@ -164,7 +164,12 @@ module Ayadn
         doing(options)
         stream = @api.get_whatstarred(username, options)
         user_404(username) if meta_404(stream)
-        stream['data'].empty? ? no_data('whatstarred') : render_view(stream, options)
+        no_data('whatstarred') if stream['data'].empty?
+        if options[:extract]
+          view_all_stars_links(stream)
+        else
+          render_view(stream, options)
+        end
       rescue => e
         Errors.global_error("action/whatstarred", [username, options], e)
       ensure
@@ -245,6 +250,22 @@ module Ayadn
       end
     end
 
+    def delete_m(args)
+      begin
+        missing_message_id unless args.length == 2
+        message_id = args[1]
+        missing_message_id unless message_id.is_integer?
+        channel_id = get_channel_id_from_alias(args[0])
+        print Status.deleting_message(message_id)
+        resp = @api.delete_message(channel_id, message_id)
+        check_message_has_been_deleted(message_id, resp)
+      rescue => e
+        Errors.global_error("action/delete message", message_id, e)
+      ensure
+        Databases.close_all
+      end
+    end
+
     def unfollow(username)
       begin
         missing_username if username.empty?
@@ -388,7 +409,11 @@ module Ayadn
         doing(options)
         stream = @api.get_hashtag(hashtag)
         no_data('hashtag') if stream['data'].empty?
-        render_view(stream, options)
+        if options[:extract]
+          view_all_hashtag_links(stream, hashtag)
+        else
+          render_view(stream, options)
+        end
       rescue => e
         Errors.global_error("action/hashtag", [hashtag, options], e)
       ensure
@@ -401,7 +426,11 @@ module Ayadn
         doing(options)
         stream = @api.get_search(words, options)
         no_data('search') if stream['data'].empty?
-        render_view(stream, options)
+        if options[:extract]
+          view_all_search_links(stream, words)
+        else
+          render_view(stream, options)
+        end
       rescue => e
         Errors.global_error("action/search", [words, options], e)
       ensure
@@ -488,12 +517,16 @@ module Ayadn
       end
     end
 
-    def view_settings
+    def view_settings(options)
       begin
-        @view.clear_screen
-        @view.show_settings
+        if options[:raw]
+          puts Settings.options.to_json
+        else
+          @view.clear_screen
+          @view.show_settings
+        end
       rescue => e
-        Errors.global_error("action/settings", nil, e)
+        Errors.global_error("action/settings", options, e)
       ensure
         Databases.close_all
       end
@@ -698,6 +731,7 @@ module Ayadn
     def write
       begin
         writer = Post.new
+        puts Status.writing
         puts Status.post
         lines_array = writer.compose
         writer.check_post_length(lines_array)
@@ -721,6 +755,7 @@ module Ayadn
         temp = Workers.add_arobase_if_missing(username)
         username = [temp]
     		messenger = Post.new
+        puts Status.message_from(username)
     		puts Status.message
     		lines_array = messenger.compose
     		messenger.check_message_length(lines_array)
@@ -742,6 +777,7 @@ module Ayadn
     	begin
         channel_id = get_channel_id_from_alias(channel_id)
   			messenger = Post.new
+        puts Status.writing
   			puts Status.post
   			lines_array = messenger.compose
   			messenger.check_message_length(lines_array)
@@ -773,6 +809,7 @@ module Ayadn
           end
         end
         poster = Post.new
+        puts Status.writing
         puts Status.reply
         lines_array = poster.compose
         poster.check_post_length(lines_array)
@@ -802,6 +839,7 @@ module Ayadn
         @view.clear_screen
         #text_to_post = "#nowplaying '#{itunes.track}' from '#{itunes.album}' by #{itunes.artist}"
         text_to_post = "#nowplaying\nTitle: ‘#{itunes.track}’\nArtist: #{itunes.artist}\nfrom ‘#{itunes.album}’"
+        puts Status.writing
         show_nowplaying(text_to_post)
         unless STDIN.getch == ("y" || "Y")
           puts "\nCanceled.\n\n".color(:red)
@@ -933,6 +971,15 @@ module Ayadn
       end
     end
 
+    def check_message_has_been_deleted(message_id, resp)
+      if resp['meta']['code'] == 200
+        puts Status.deleted_m(message_id)
+        Logs.rec.info "Deleted message #{message_id}."
+      else
+        whine(Status.not_deleted(message_id), resp)
+      end
+    end
+
     def check_has_been_unblocked(username, resp)
       if resp['meta']['code'] == 200
         puts Status.unblocked(username)
@@ -1111,6 +1158,11 @@ module Ayadn
       exit
     end
 
+    def missing_message_id
+      puts Status.error_missing_message_id
+      exit
+    end
+
     def auto_save_followings(list)
       FileOps.save_followings_list(list) if Settings.options[:backup][:auto_save_lists]
     end
@@ -1146,5 +1198,41 @@ module Ayadn
       end
     end
 
+    def links_from_posts(stream)
+      links = []
+      worker = Workers.new
+      stream['data'].each do |post|
+        from = worker.extract_links(post)
+        from.each {|l| links << l}
+      end
+      links.uniq!
+      links
+    end
+
+    def show_links(links)
+      links.each {|l| puts "#{l}\n".color(Settings.options[:colors][:link])}
+    end
+
+    def view_all_hashtag_links(stream, hashtag)
+      links = links_from_posts(stream)
+      @view.clear_screen
+      puts "Links from posts containing hashtag '##{hashtag}': \n".color(:cyan)
+      show_links(links)
+    end
+
+    def view_all_search_links(stream, words)
+      links = links_from_posts(stream)
+      @view.clear_screen
+      puts "Links from posts containing word(s) '#{words}': \n".color(:cyan)
+      show_links(links)
+    end
+
+    def view_all_stars_links(stream)
+      links = links_from_posts(stream)
+      @view.clear_screen
+      puts "Links from your starred posts: \n".color(:cyan)
+      show_links(links)
+    end
+
   end
 end

data/lib/ayadn/alias.rb

@@ -74,14 +74,21 @@ module Ayadn
 
     desc "list", "List previously created aliases"
     long_desc Descriptions.alias_list
+    option :raw, aliases: "-x", type: :boolean, desc: "Outputs the raw list in JSON"
     def list
       begin
         init
-        puts "\e[H\e[2J"
         list = Databases.aliases
         unless list.empty? || list.nil?
-          puts Workers.new.build_aliases_list(list)
-          puts "\n"
+          if options[:raw]
+            h = {}
+            list.each {|k,v| h[k] = v}
+            puts h.to_json
+          else
+            puts "\e[H\e[2J"
+            puts Workers.new.build_aliases_list(list)
+            puts "\n"
+          end
         else
           puts Status.empty_list
         end

data/lib/ayadn/api.rb

@@ -171,6 +171,10 @@ module Ayadn
       JSON.parse(CNX.delete(Endpoints.new.delete_post(post_id)))
     end
 
+    def delete_message(channel_id, message_id)
+      JSON.parse(CNX.delete(Endpoints.new.delete_message(channel_id, message_id)))
+    end
+
     def unstar(post_id)
       JSON.parse(CNX.delete(Endpoints.new.star(post_id)))
     end

data/lib/ayadn/app.rb

@@ -54,17 +54,17 @@ module Ayadn
       Action.new.trending(options)
     end
 
-    # desc "photos", "Show the Photos Stream (-ph)"
-    # map "-ph" => :photos
-    # long_desc Descriptions.photos
-    # option :scroll, aliases: "-s", type: :boolean, desc: "Scroll the stream"
-    # option :new, aliases: "-n", type: :boolean, desc: Descriptions.options_new
-    # option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
-    # option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
-    # option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
-    # def photos
-    #   Action.new.photos(options)
-    # end
+    desc "photos", "Show the Photos Stream (-ph)"
+    map "-ph" => :photos
+    long_desc Descriptions.photos
+    option :scroll, aliases: "-s", type: :boolean, desc: "Scroll the stream"
+    option :new, aliases: "-n", type: :boolean, desc: Descriptions.options_new
+    option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
+    option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
+    option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    def photos
+      Action.new.photos(options)
+    end
 
     desc "conversations", "Show the Conversations Stream (-cq)"
     map "-cq" => :conversations
@@ -114,6 +114,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
     def whatstarred(*username)
       Action.new.whatstarred(username, options)
     end
@@ -181,6 +182,7 @@ module Ayadn
     map "-t" => :hashtag
     long_desc Descriptions.hashtag
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
     def hashtag(hashtag)
       Action.new.hashtag(hashtag, options)
     end
@@ -191,6 +193,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
     def search(*words)
       Action.new.search(words.join(","), options)
     end
@@ -198,8 +201,9 @@ module Ayadn
     desc "settings", "List current Ayadn settings (-sg)"
     map "-sg" => :settings
     long_desc Descriptions.settings
+    option :raw, aliases: "-x", type: :boolean, desc: "Outputs the raw list in JSON"
     def settings
-      Action.new.view_settings
+      Action.new.view_settings(options)
     end
 
     desc "userinfo @USERNAME", "Show detailed informations about @username (-ui)"
@@ -235,6 +239,13 @@ module Ayadn
       Action.new.delete(post_id)
     end
 
+    desc "delete_m CHANNEL MESSAGE", "Delete a message (-DM)"
+    map "-DM" => :delete_m
+    long_desc Descriptions.delete_m
+    def delete_m(*args)
+      Action.new.delete_m(args)
+    end
+
     desc "unfollow @USERNAME", "Unfollow @username (-UF)"
     map "-UF" => :unfollow
     long_desc Descriptions.unfollow
@@ -427,5 +438,16 @@ module Ayadn
       end
     end
 
+    desc "version", "Show the current Ayadn version (-v)"
+    map "-v" => :version
+    def version
+      puts "\nAYADN\n".color(:red)
+      puts "Version:\t".color(:cyan) + "#{VERSION}\n".color(:green)
+      puts "Changelog:\t".color(:cyan) + "https://github.com/ericdke/na/blob/master/CHANGELOG.md\n".color(:yellow)
+      puts "Readme:\t\t".color(:cyan) + "https://github.com/ericdke/na/blob/master/README.md".color(:yellow)
+      puts "Manual:\t\t".color(:cyan) + "https://github.com/ericdke/na/blob/master/MANUAL.md".color(:yellow)
+      puts "\n"
+    end
+
   end
 end