ayadn 3.0 → 4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 669aa931c86f3c1503fcb018d9ae061c4807f821
-  data.tar.gz: 9e0b95916d303a4f163a751db01533a6cc95ba5f
+  metadata.gz: a6ebd67992a3895ceefe25d38e32281b3f40a340
+  data.tar.gz: 79aa8fc478f5610abc5295c8b54fc80d24becb4c
 SHA512:
-  metadata.gz: 94b1ffcc7e1ef7c8350b02da3e56f28e0164a2b13ef63ecf2ece988c36fd70ebec9edf690b6aef921707da2ef385e9fbebe7bad0667ababde8656d9d1dd6297c
-  data.tar.gz: 4ce0e8e000c1306678ebaddcc5d2a6dcae772e8cb3bdc3c866d9679d93920b8f5dbf48896899022e5c38a5c6d821509095c5f684a6964b78a23dde3a37e77a1a
+  metadata.gz: 5bb3f4b17dcb074d1ed73a080e54c125f5c9640db70c71bf719e0a3bd189298f8f84cca6dc0df626436526467ebb722c1c53444e8de6c3f7a853252112fdc4b8
+  data.tar.gz: a1b6c4e8d91571e74088b0ce64eaf6b1a009e1ec6356df0a1dc8411eeaf61fdc5d833a1df151bf004d74d1b6bc1a9cd7db22466a82d0cfe30d133d8af53addb4

data/.travis.yml

@@ -2,10 +2,7 @@ language: ruby
 cache: bundler
 
 rvm:
-  - "2.2.3"
-  - "2.2.0"
-  - "2.1.0"
-  - "2.0.0"
+  - "2.3.0"
 
 script: 'bundle exec rake spec'
 

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 4.0- 2016-05-01 - 'Mr. Robot'
+
+- Fixed: when possible, unauthorizing a user keeps the current user logged
+- Fixed: inconsistencies in the 'set' command
+- Fixed: malformed address for checkins in some cases
+- Fixed: a case where changing the root URL was ignored
+- Fixed: typos in descriptions
+- Fixed: occasional crash in the 'random' stream
+- New: documentation for developing with the Ayadn codebase
+- Deprecated: 'movie' and 'tvshow' commands (we don't have access to imdb anymore)
+- Code cleanup
+
 ## 3.0 - 2015-11-07 - 'Edge Of Tomorrow'
 
 - New: option to set an alternative base URL for the API calls
@@ -36,10 +48,6 @@
 
 - Fix: bug in add/remove user/mention to the blacklist
 
-## 2.0.8 - 2015-02-11
-
-*ignored*
-
 ## 2.0.7 - 2015-02-04 - 'Diacritics'
 
 - Fix: users list if an element isn't in UTF8

data/README.md

@@ -1,6 +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)
+[![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
 =====
@@ -15,7 +15,6 @@ With Ayadn, you can use all the features of App.net from the console without any
 - write fast single-line or complex multi-line posts
 - embed pictures in posts
 - embed online video in posts
-- embed movie poster in posts
 - view/scroll the Global stream with spammers filtered out
 - view/scroll posts from specific users or posts mentioning a user
 - follow/unfollow users, star/repost/mute/block/unstar/etc 
@@ -26,8 +25,6 @@ With Ayadn, you can use all the features of App.net from the console without any
 - list and download your files
 - view (and write to) all your channels including Broadcasts, Patter, Ohai, etc
 - 'nowplaying' from iTunes, Deezer or Last.fm, with album art and store link
-- 'movie' creates a post from a movie title with poster, plot, and link
-- 'tvshow' creates a post from a TV show title with poster, plot, and link
 - view/send private messages
 - view geolocation data in streams
 - create silent black lists of users, mentions, clients or hashtags

data/ayadn.gemspec

@@ -28,8 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "terminal-table", "~> 1.4"
   spec.add_dependency "pinboard", "~> 0.1"
   spec.add_dependency "unicode_utils", "~> 1.4"
-  spec.add_dependency "spotlite", "~> 0.8"
-  spec.add_dependency "tvdb_party", "~> 0.7"
   spec.add_dependency "amalgalite", "~> 1.3"
   spec.add_dependency "fast_cache", "~> 1.0"
 

data/doc/01-index.md

@@ -11,7 +11,6 @@ With Ayadn, you can use all the features of App.net from the console without any
 - write fast single-line or complex multi-line posts
 - embed pictures in posts
 - embed online video in posts
-- embed movie poster in posts
 - view/scroll the Global stream with spammers filtered out
 - view/scroll posts from specific users or posts mentioning a user
 - follow/unfollow users, star/repost/mute/block/unstar/etc 
@@ -22,8 +21,6 @@ With Ayadn, you can use all the features of App.net from the console without any
 - list and download your files
 - view (and write to) all your channels including Broadcasts, Patter, Ohai, etc
 - 'nowplaying' from iTunes, Deezer or Last.fm, with album art and store link
-- 'movie' creates a post from a movie title with poster, plot, and link
-- 'tvshow' creates a post from a TV show title with poster, plot, and link
 - view/send private messages
 - view geolocation data in streams
 - create silent black lists of users, mentions, clients or hashtags

data/doc/02-install.md

@@ -49,11 +49,7 @@ Ayadn depends upon these Gems:
         pinboard (export to Pinboard)
         rainbow (text UI utilities)
         rest-client (networking)
-        spotlite (IMDb access)
         terminal-table (text UI utilities)
         thor (commands and options parsing)
-        tvdb_party (TVDb access)
         unicode_utils (text utilities)
-        daybreak (Ruby data store)
 
-*Note: the "daybreak" dependency is only needed for 1.x to 2.x migrations. Deprecated since Ayadn 3.0.*

data/doc/06-post.md

@@ -164,19 +164,3 @@ ayadn pm @ericd -Y https://www.youtube.com/watch?v=Ei8CFin00PY
 ```
 
 *Note: unfortunately, very few App.net clients treat video embedding properly. So I would advise to include the video URL in the text body anyway, for better compatibility.*
-
-# EMBED MOVIE POSTER
-
-You can embed a movie poster in a normal post with option `-M`.
-
-This is compatible with other options, eg embedding other images.
-
-*Warning: contrary to the `movie` command, this option doesn't check with the user if the movie is valid. The poster is retrieved from IMDb and is automatically embedded in the post.*
-
-Examples:
-
-```
-ayadn -P "I'll be back" -M terminator
-ayadn -W -M truman show -E ~/Pics/my_face.jpg
-ayadn -R 23362460 -M the dark knight
-```  

data/doc/18-develop.md

@@ -0,0 +1,165 @@
+# DEVELOP
+
+Ayadn is an Open Source project under the MIT license.
+
+You can develop with Ayadn in several ways: build your own Ayadn-based client, add features to the official one, fix bugs, etc.
+
+## First step
+
+The [repository](https://github.com/ericdke/na) doesn't always have a development branch. If it has one, use it - otherwise it means the previous one has been merged or dismissed and you have to fork the master branch.
+
+The first step in any case is to [fork](https://help.github.com/articles/fork-a-repo/) then clone the repository:
+
+    $ git clone git@github.com:you/na.git && cd na
+
+Run Bundler to ensure you have the proper dependencies installed:
+
+    $ bundle
+
+If you have the Ayadn Gem already installed, the currently logged in user will be used:
+
+    $ ./bin/ayadn -tl
+
+Otherwise you will have to authorize first:
+
+    $ ./bin/ayadn -auth
+
+Then for the Ayadn credentials itself, they're not included in the repository, so you will have to make a new `lib/ids.rb` file following this template:
+
+<pre>
+    <code class="ruby">
+# encoding: utf-8
+module Ayadn
+  class Settings
+    # Mandatory
+    CLIENT_ID = "xxx"
+  end
+  class Endpoints
+    # Mandatory
+    CALLBACK_URL = "http://yourdomain.com/appname.html"
+  end
+  class NowPlaying
+    # Optional
+    AFFILIATE_SUFFIX = "&at=xxx&ct=appname"
+    DEEZER_APP_ID = "xxx"
+    DEEZER_AUTH_URL = "http://yourdomain.com/deezer.html"
+  end
+end
+    </code>
+</pre>
+
+*Be careful to not modify your `.gitignore` file, these credentials should always be ignored and its contents never be accessible from any public location.*
+
+## Tests
+
+### RSPEC
+
+Ayadn has a set of *rspec* unit tests.
+
+They're convenient but far from perfect, so you're welcome to improve them or add new ones (some classes like `FileOps` or `CNX` notably lack testing at the moment).
+
+Ayadn tests include mock data (adapted from real data) like stream and user JSON responses, and also a dedicated SQLite mock file.
+
+Just launch `rspec` to run the battery of tests:
+
+    $ rspec
+
+### Debug
+
+For live simulations and debug sessions, launch *irb* or *pry* then require `ayadn`:
+
+    $ pry
+    pry(main)> require_relative "lib/ayadn"
+
+Then, to be "live", initialize the `Action` class:
+
+    pry(main)> action = Ayadn::Action.new
+
+You can now issue commands to Ayadn, for example:
+
+    pry(main)> action.userinfo ["me"], {"raw"=>true}
+
+*Be careful to use a test account when using Ayadn live like this...*
+
+## Pull requests
+
+You've added a feature or fixed a bug? Awesome! You're a hero!
+
+Now you just have to open a Pull Request and wait until I examine your proposition and give you feedback.
+
+## Make your own version
+
+If you want to use (parts of) this codebase to create your own version of Ayadn, you will have to fill in several identifiers before release:
+
+- Ayadn's client id
+- Ayadn's callback URL for authentication
+
+Optionally, if you keep those features:
+
+- NowPlaying's iTunes affiliate suffix
+- Deezer App id
+- Deezer callback URL for authentication
+
+**You will also have to create a new application in your App.net dashboard.**
+
+*Don't forget to follow the License's rules before release. And although not mandatory, I'll be glad if you send me a message about your work. :)*
+
+## Dive In
+
+It's always hard to dive in an unknown codebase.
+
+It's even more difficult when this codebase has a lot of legacy code and most of it is mediocre.
+
+Unfortunately Ayadn is like that. ¯\(ツ)/¯ 
+
+It was my first "big" app when I started developing in Ruby, so the code reflects that and suffers from the "lasagna syndrome": layers of new code upon layers of old code during years of development.
+
+The biggest issue with the current codebase is not the code quality but its architecture, which is, to be polite, far from ideal, and not even really based on OOP principles - there's a lot of purely imperative code and other atrocities.
+
+That being said, I believe my nomenclature for most methods and properties is self-explanatory enough, and there's comments where the code is a bit hairy or unclear.
+
+As for the architecture, here's a brief overview.
+
+### CLI
+
+The first important step of the control flow is the `app.rb` class which intercepts the commands from the CLI.
+
+This class inherits from `Thor` and only serves the purpose of being an interface for the CLI. Thor handles the IO of arguments and options, and also generates descriptions and help for the CLI commands.
+
+From there, most commands will pass options and commands to the main dispatcher, the `Action` class (`action.rb`).
+
+It initializes the user account credentials from the SQLite database and creates the main objects.
+
+This is why you have to initialize `Action` yourself to use a live account if you're not using the CLI via `App`.
+
+Follow what `Action`'s `initialize` does to understand the init process - it's scattered but easy to grasp.
+
+### Action
+
+The `Action` class launches the commands themselves (all commands that needed to have the credentials initialized).
+
+Most of the commands in `Action` actually launch instances of the `Stream` class - other commands are implemented in `Action` itself or in topical classes like `Set` or `BlackList`.
+
+### API
+
+The `Endpoints` class holds all necessary endpoints and URLs.
+
+The `API` class uses them to get the JSON responses from the ADN servers (using the `CNX` class for networking) and return a parsed version as a Ruby Hash. This class also handles the generation of query URLs from passed arguments.
+
+Most commands will create custom Ayadn objects from these hashes, like `StreamObject` or `UserObject`, but for legacy reasons this is not how the global architecture works, and there's still places where the Hashes are used directly instead of handling custom objects.
+
+### Main classes
+
+The most used classes are the "God" classes `Workers`, `View` and `Status`.
+
+`Workers` holds all utilities and workforce operations.
+
+`View` creates colored and formatted text outputs.
+
+`Status` holds all text messages: interface, errors, statuses, help, etc.
+
+The `Workers` and `View` classes could really appreciate a rework and some DRY refactoring... but they currently work pretty well without known bugs so it's already something I suppose. ;)
+
+
+
+

data/lib/ayadn/action.rb

@@ -10,10 +10,10 @@ module Ayadn
 
     def initialize
       @api = API.new
-      @view = View.new
-      @workers = Workers.new
-      @status = Status.new
-      @check = Check.new
+      @status = Status.new      
+      @workers = Workers.new(@status)
+      @view = View.new(@status, @workers)
+      @check = Check.new(@status)
       Settings.load_config
       Settings.get_token
       Settings.init_config
@@ -21,93 +21,32 @@ module Ayadn
       Databases.open_databases
     end
 
-    def method_missing(meth, options)
-      case meth.to_s
-      when 'unified', 'checkins', 'global', 'trending', 'photos', 'conversations', 'interactions'
-        begin
-          Settings.options[:timeline][:compact] = true if options[:compact] == true
-          stream = Stream.new(@api, @view, @workers)
-          stream.send(meth.to_sym, options)
-        rescue => e
-          Errors.global_error({error: e, caller: caller, data: [meth, options]})
-        end
-      else
-        super
-      end
-    end
-
-    def mentions(username, options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.mentions(username, options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [username, options]})
-      end
-    end
-
-    def posts(username, options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.posts(username, options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [username, options]})
-      end
-    end
-
-    def whatstarred(username, options)
+    # Uses method_missing to template a single method for several streams
+    def method_missing(meth, *args)
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.whatstarred(username, options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [username, options]})
-      end
-    end
-
-    def whoreposted(post_id, options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.whoreposted(post_id, options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [post_id, options]})
-      end
-    end
-
-    def whostarred(post_id, options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.whostarred(post_id, options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [post_id, options]})
-      end
-    end
-
-    def convo(post_id, options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.convo(post_id, options)
+        options = if args.size > 1
+          args[1]
+        else
+          args[0]
+        end
+        Settings.options.timeline.compact = true if options[:compact]
+        Settings.global.force = true if options[:force]
+        stream = Stream.new(@api, @view, @workers, @check, @status)
+        case meth
+        when :mentions, :posts, :whatstarred, :whoreposted, :whostarred, :convo, :followings, :followers, :messages
+          stream.send(meth, args[0], options)
+        when :unified, :checkins, :global, :trending, :photos, :conversations, :interactions, :muted, :blocked, :random_posts
+          stream.send(meth, options)
+        end
       rescue => e
-        Errors.global_error({error: e, caller: caller, data: [post_id, options]})
+        Errors.global_error({error: e, caller: caller, data: [meth, options]})
       end
     end
 
     def delete(post_ids, options = {})
       begin
-        ids = post_ids.select { |post_id| post_id.is_integer? }
-        if ids.empty?
-          @status.error_missing_post_id
-          exit
-        end
-        if options[:force]
-          Settings.global[:force] = true
-        else
-          ids.map! { |post_id| @workers.get_real_post_id(post_id) }
-        end
+        ids = get_posts_ids_or_exit(post_ids) { @status.error_missing_post_id }
+        ids = get_real_posts_ids_or_force(options, ids)
         puts "\n"
         ids.each do |post_id|
           @status.deleting_post(post_id)
@@ -127,11 +66,7 @@ module Ayadn
         end
         channel = args[0]
         args.shift
-        ids = args.select {|message_id| message_id.is_integer?}
-        if ids.empty?
-          @status.error_missing_message_id
-          exit
-        end
+        ids = get_posts_ids_or_exit(args) { @status.error_missing_message_id }
         channel_id = @workers.get_channel_id_from_alias(channel)
         puts "\n"
         ids.each do |message_id|
@@ -146,8 +81,8 @@ module Ayadn
 
     def unfollow(usernames)
       begin
-        @check.no_username(usernames)
-        users = @workers.all_but_me(usernames)
+        # Verify CLI input, remove current user from list (you never know) to avoid API error
+        users = get_all_usernames_but_me(usernames)
         puts "\n"
         @status.unfollowing(users.join(','))
         users.each do |user|
@@ -161,8 +96,7 @@ module Ayadn
 
     def follow(usernames)
       begin
-        @check.no_username(usernames)
-        users = @workers.all_but_me(usernames)
+        users = get_all_usernames_but_me(usernames)
         puts "\n"
         @status.following(users.join(','))
         users.each do |user|
@@ -176,8 +110,7 @@ module Ayadn
 
     def unmute(usernames)
       begin
-        @check.no_username(usernames)
-        users = @workers.all_but_me(usernames)
+        users = get_all_usernames_but_me(usernames)
         puts "\n"
         @status.unmuting(users.join(','))
         users.each do |user|
@@ -191,8 +124,7 @@ module Ayadn
 
     def mute(usernames)
       begin
-        @check.no_username(usernames)
-        users = @workers.all_but_me(usernames)
+        users = get_all_usernames_but_me(usernames)
         puts "\n"
         @status.muting(users.join(','))
         users.each do |user|
@@ -206,8 +138,7 @@ module Ayadn
 
     def unblock(usernames)
       begin
-        @check.no_username(usernames)
-        users = @workers.all_but_me(usernames)
+        users = get_all_usernames_but_me(usernames)
         puts "\n"
         @status.unblocking(users.join(','))
         users.each do |user|
@@ -221,8 +152,7 @@ module Ayadn
 
     def block(usernames)
       begin
-        @check.no_username(usernames)
-        users = @workers.all_but_me(usernames)
+        users = get_all_usernames_but_me(usernames)
         puts "\n"
         @status.blocking(users.join(','))
         users.each do |user|
@@ -236,22 +166,18 @@ module Ayadn
 
     def repost(post_ids, options = {})
       begin
-        ids = post_ids.select { |post_id| post_id.is_integer? }
-        if ids.empty?
-          @status.error_missing_post_id
-          exit
-        end
-        if options[:force]
-          Settings.global[:force] = true
-        else
-          ids.map! { |post_id| @workers.get_real_post_id(post_id) }
-        end
+        ids = get_posts_ids_or_exit(post_ids) { @status.error_missing_post_id }
+        ids = get_real_posts_ids_or_force(options, ids)
         puts "\n"
         ids.each do |post_id|
           @status.reposting(post_id)
+          # Retrieve the post we want to repost
           resp = @api.get_details(post_id)
+          # Verify it hasn't been already reposted by us
           @check.already_reposted(resp)
+          # Maybe the post is already a repost by someone else?
           id = @workers.get_original_id(post_id, resp)
+          # Repost then verify it has been done
           @check.has_been_reposted(id, @api.repost(id))
         end
       rescue => e
@@ -261,16 +187,8 @@ module Ayadn
 
     def unrepost(post_ids, options = {})
       begin
-        ids = post_ids.select { |post_id| post_id.is_integer? }
-        if ids.empty?
-          @status.error_missing_post_id
-          exit
-        end
-        if options[:force]
-          Settings.global[:force] = true
-        else
-          ids.map! { |post_id| @workers.get_real_post_id(post_id) }
-        end
+        ids = get_posts_ids_or_exit(post_ids) { @status.error_missing_post_id }
+        ids = get_real_posts_ids_or_force(options, ids)
         puts "\n"
         ids.each do |post_id|
           @status.unreposting(post_id)
@@ -287,16 +205,8 @@ module Ayadn
 
     def unstar(post_ids, options = {})
       begin
-        ids = post_ids.select { |post_id| post_id.is_integer? }
-        if ids.empty?
-          @status.error_missing_post_id
-          exit
-        end
-        if options[:force]
-          Settings.global[:force] = true
-        else
-          ids.map! { |post_id| @workers.get_real_post_id(post_id) }
-        end
+        ids = get_posts_ids_or_exit(post_ids) { @status.error_missing_post_id }
+        ids = get_real_posts_ids_or_force(options, ids)
         puts "\n"
         ids.each do |post_id|
           @status.unstarring(post_id)
@@ -316,16 +226,8 @@ module Ayadn
 
     def star(post_ids, options = {})
       begin
-        ids = post_ids.select { |post_id| post_id.is_integer? }
-        if ids.empty?
-          @status.error_missing_post_id
-          exit
-        end
-        if options[:force]
-          Settings.global[:force] = true
-        else
-          ids.map! { |post_id| @workers.get_real_post_id(post_id) }
-        end
+        ids = get_posts_ids_or_exit(post_ids) { @status.error_missing_post_id }
+        ids = get_real_posts_ids_or_force(options, ids)
         puts "\n"
         ids.each do |post_id|
           @status.starring(post_id)
@@ -341,7 +243,6 @@ module Ayadn
 
     def hashtag(hashtag, options)
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
         search = Search.new(@api, @view, @workers)
         search.hashtag(hashtag, options)
       rescue => e
@@ -351,7 +252,6 @@ module Ayadn
 
     def search(words, options)
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
         search = Search.new(@api, @view, @workers)
         search.find(words, options)
       rescue => e
@@ -359,53 +259,12 @@ module Ayadn
       end
     end
 
-    def followings(username, options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.followings(username, options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [username, options]})
-      end
-    end
-
-    def followers(username, options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.followers(username, options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [username, options]})
-      end
-    end
-
-    def muted(options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.muted(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [options]})
-      end
-    end
-
-    def blocked(options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.blocked(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [options]})
-      end
-    end
-
     def view_settings(options)
       begin
         if options[:raw]
-          jj JSON.parse(Settings.config.to_json)
-          jj JSON.parse(Settings.options.to_json)
+          jj JSON.parse(Settings.options.to_h.to_json)
         else
-          Settings.options[:timeline][:compact] = true if options[:compact] == true
+          Settings.options.timeline.compact = true if options[:compact]
           @view.show_settings
         end
       rescue => e
@@ -429,7 +288,7 @@ module Ayadn
 
     def userinfo(username, options = {})
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
+        Settings.options.timeline.compact = true if options[:compact]
         @check.no_username(username)
         usernames = @workers.add_arobases_to_usernames(username)
         usernames.each.with_index do |username, index|
@@ -437,11 +296,11 @@ module Ayadn
             @view.show_raw(@api.get_user(username), options)
           else
             @view.downloading if index == 0
-            stream = @api.get_user(username)
-            @check.no_user(stream, username)
-            @check.same_username(stream) ? token = @api.get_token_info['data'] : token = nil
+            user_object = UserObject.new(@api.get_user(username), username)
+            # Is it us? If yes, get *our* info
+            @check.same_username(user_object) ? token = @api.get_token_info['data'] : token = nil
             @view.clear_screen if index == 0
-            @view.infos(stream['data'], token)
+            @view.infos(user_object, token)
           end
         end
       rescue => e
@@ -452,12 +311,8 @@ module Ayadn
     def postinfo(post_id, options)
       begin
         @check.bad_post_id(post_id)
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        if options[:force]
-          Settings.global[:force] = true
-        else
-          post_id = @workers.get_real_post_id(post_id)
-        end
+        Settings.options.timeline.compact = true if options[:compact]
+        post_id = get_real_post_id_or_force(options, post_id)
         details = lambda { @api.get_details(post_id, options) }
         if options[:raw]
           @view.show_raw(details.call, options)
@@ -465,32 +320,36 @@ module Ayadn
         end
         @view.clear_screen
         response = details.call
-        @check.no_post(response, post_id)
-        resp = response['data']
+        @check.no_details(response, post_id)
+
+        post_object = PostObject.new(response["data"])
 
-        if resp["is_deleted"] == true
-          @status.user_404(resp["id"])
+        if post_object.is_deleted
+          @status.user_404(post_object.id)
           Errors.global_error({error: "user 404", caller: caller, data: [post_id, options]})
         end
 
-        response = @api.get_user("@#{resp['user']['username']}")
-        @check.no_user(response, response['data']['username'])
-        stream = response['data']
+        response = @api.get_user("@#{post_object.user.username}")
+        user_object = UserObject.new(response, post_object.user.username)
+
         @status.post_info
-        @view.show_simple_post([resp], options)
-        puts "\n" if Settings.options[:timeline][:compact] == true
+        @view.show_simple_post([post_object], options)
+        puts "\n" if Settings.options.timeline.compact
         @status.say_info "author"
-        puts "\n" unless Settings.options[:timeline][:compact] == true
-        if response['data']['username'] == Settings.config[:identity][:username]
-          @view.show_userinfos(stream, @api.get_token_info['data'], true)
+        puts "\n" unless Settings.options.timeline.compact
+        # Is it us? ...
+        if user_object.username == Settings.config.identity.username
+          @view.show_userinfos(post_object.user, @api.get_token_info['data'], true)
         else
-          @view.show_userinfos(stream, nil, true)
+          @view.show_userinfos(post_object.user, nil, true)
         end
-        if resp['repost_of']
+
+        if !post_object.repost_of.nil?
           @status.repost_info
-          Errors.repost(post_id, resp['repost_of']['id'])
-          @view.show_simple_post([resp['repost_of']], options)
-          puts "\n" if Settings.options[:timeline][:compact] == true
+          # If we ask infos for a reposted post, fetch the original instead
+          Errors.repost(post_id, post_object.repost_of.id)
+          @view.show_simple_post([post_object.repost_of], options)
+          puts "\n" if Settings.options.timeline.compact
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [post_id, options]})
@@ -526,6 +385,7 @@ module Ayadn
 
     def channels options
       begin
+        # Input could be channel IDs or channel aliases
         channels = if options[:id]
           channel_id = options[:id].map {|id| @workers.get_channel_id_from_alias(id)}
           lambda { @api.get_channel(channel_id, options) }
@@ -533,42 +393,32 @@ module Ayadn
           lambda { @api.get_channels }
         end
         if options[:raw]
-          @view.show_raw(channels.call)
+          @view.show_direct_raw(channels.call)
           exit
         else
           @view.downloading
           resp = channels.call
           @view.clear_screen
-          @view.show_channels(resp, options)
+          channels = resp["data"].map { |ch| ChannelObject.new(ch) }
+          @view.show_channels(channels, options)
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [options]})
       end
     end
 
-    def messages(channel_id, options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.messages(channel_id, options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [channel_id, options]})
-      end
-    end
-
     def messages_unread(options)
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        if options[:silent]
-          Settings.options[:marker][:messages] = false
-        end
+        Settings.options.timeline.compact = true if options[:compact]
+        Settings.options.marker.messages = false if options[:silent] # Option to not mark the messages as read
         puts "\n"
         @status.say_nocolor :searching, "channels with unread PMs"
-        response = @api.get_channels
+        channels_objects = @api.get_channels['data'].map { |obj| ChannelObject.new(obj) }
         unread_channels = []
-        response['data'].map do |ch|
-          if ch['type'] == "net.app.core.pm" && ch['has_unread'] == true
-            unread_channels << ch['id']
+        channels_objects.each do |ch|
+          # Channels can be of many types, PMs are only one type
+          if ch.type == "net.app.core.pm" && ch.has_unread
+            unread_channels << ch.id
           end
         end
         if unread_channels.empty?
@@ -578,6 +428,7 @@ module Ayadn
         unread_messages = {}
         unread_channels.reverse.each do |id|
           @status.say_nocolor :downloading, "messages from channel #{id}"
+          # Find the last time we've done this
           since = Databases.find_last_id_from("channel:#{id}")
           unless since.nil?
             api_options = {count: 20, since_id: since}
@@ -585,18 +436,19 @@ module Ayadn
             api_options = {count: 20}
           end
           ch = @api.get_messages(id, api_options)
+          # Find the last message seen and the last message in the channel
           last_read_id = ch['meta']['marker']['last_read_id'].to_i
           last_message_id = ch['meta']['max_id']
-          messages = []
-          ch['data'].each do |msg|
-            messages << msg if msg['id'].to_i > last_read_id
-          end
+          messages = ch['data'].map { |msg| msg if msg['id'].to_i > last_read_id }
           unread_messages[id] = [messages, last_message_id]
         end
-        if Settings.options[:marker][:messages] == true
+        # If we want to mark the messages as read
+        if Settings.options.marker.messages
           unread_messages.each do |k,v|
             name = "channel:#{k}"
+            # Save the reading position locally
             Databases.pagination_insert(name, v[1])
+            # Mark as read
             resp = @api.update_marker(name, v[1])
             res = JSON.parse(resp)
             if res['meta']['code'] != 200
@@ -609,9 +461,10 @@ module Ayadn
         @view.clear_screen
         unread_messages.each do |k,v|
           @status.unread_from_channel(k)
-          @view.show_posts(v[0])
+          messages_objects = v[0].map { |post_hash| PostObject.new(post_hash) }
+          @view.show_messages(messages_objects)
         end
-        puts "\n" if Settings.options[:timeline][:compact]
+        puts "\n" if Settings.options.timeline.compact
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [options]})
       end
@@ -628,29 +481,32 @@ module Ayadn
       end
       begin
         @check.bad_post_id(post_id)
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        if options[:force]
-          Settings.global[:force] = true
-        else
-          post_id = @workers.get_real_post_id(post_id)
-        end
+        Settings.options.timeline.compact = true if options[:compact]
+        post_id = get_real_post_id_or_force(options, post_id)
         @view.downloading
-        resp = @api.get_details(post_id)['data']
+        # Get the details from the post we want to send to Pinboard
+        # resp = @api.get_details(post_id)['data']
         @view.clear_screen
-        links = @workers.extract_links(resp)
-        resp['text'].nil? ? text = "" : text = resp['text']
+        # Extract links from the post
+        post_object = PostObject.new(@api.get_details(post_id)['data'])
+        links = @workers.extract_links(post_object)
+        # In case the post has no text, to prevent an error
+        post_object.text.nil? ? text = "" : text = post_object.text
+        # The first tag is always "ADN"
         usertags << "ADN"
-        handle = "@" + resp['user']['username']
+        handle = "@" + post_object.user.username
         post_text = "From: #{handle} -- Text: #{text} -- Links: #{links.join(" ")}"
         pinner = Ayadn::PinBoard.new
         unless pinner.has_credentials_file?
+          # No Pinboard account registered? Ask for one.
           @status.no_pin_creds
-          pinner.ask_credentials
+          pinner.ask_credentials(@status)
           @status.pin_creds_saved
         end
+        # Get stored credentials
         credentials = pinner.load_credentials
         maker = Struct.new(:username, :password, :url, :tags, :text, :description)
-        bookmark = maker.new(credentials[0], credentials[1], resp['canonical_url'], usertags.join(","), post_text, resp['canonical_url'])
+        bookmark = maker.new(credentials[0], credentials[1], post_object.canonical_url, usertags.join(","), post_text, post_object.canonical_url)
         @status.saving_pin
         pinner.pin(bookmark)
         @status.done
@@ -663,7 +519,7 @@ module Ayadn
       begin
         @view.clear_screen
         @status.auto
-        Post.new.auto_readline
+        Post.new(@status).auto_readline
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [options]})
       end
@@ -671,18 +527,8 @@ module Ayadn
 
     def post(args, options)
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        writer = Post.new
-        if options[:poster] # Returns the same options hash + poster embed
-          settings = options.dup
-          options = NowWatching.new.get_poster(settings[:poster], settings)
-        end
-        text = args.join(" ")
-        writer.post_size_error(text) if writer.post_size_ok?(text) == false
-        @view.clear_screen
-        @status.posting
-        resp = writer.post({options: options, text: text})
-        save_and_view(resp)
+        Settings.options.timeline.compact = true if options[:compact]
+        post_and_show(Post.new(@status), args.join(" "), options)
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args, options]})
       end
@@ -690,112 +536,91 @@ module Ayadn
 
     def write(options)
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        writer = Post.new
+        Settings.options.timeline.compact = true if options[:compact]
+        writer = Post.new(@status)
         @status.writing
         @status.post
-        lines_array = writer.compose
-        text = lines_array.join("\n")
-        writer.post_size_error(text) if writer.post_size_ok?(text) == false
-        @view.clear_screen
-        @status.posting
-        if options[:poster]
-          settings = options.dup
-          options = NowWatching.new.get_poster(settings[:poster], settings)
-        end
-        resp = writer.post({options: options, text: text})
-        save_and_view(resp)
+        text = writer.compose.join("\n")
+        post_and_show(writer, text, options)
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [text, options]})
       end
     end
 
     def pmess(username, options = {})
-    	begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        if options[:silent]
-          Settings.options[:marker][:messages] = false
-        end
+      begin
+        Settings.options.timeline.compact = true if options[:compact]
+        Settings.options.marker.messages = false if options[:silent]
         @check.no_username(username)
         username = [@workers.add_arobase(username)]
-    		writer = Post.new
+        writer = Post.new(@status)
         @status.message_from(username)
-    		@status.message
-    		lines_array = writer.compose
-        text = lines_array.join("\n")
-        writer.message_size_error(text) if writer.message_size_ok?(text) == false
-    		@view.clear_screen
+        @status.message
+        text = writer.compose.join("\n")
+        writer.message_size_error(text) if !writer.message_size_ok?(text)
+        @view.clear_screen
         @status.posting
-        if options[:poster]
-          settings = options.dup
-          options = NowWatching.new.get_poster(settings[:poster], settings)
-        end
         resp = writer.pm({options: options, text: text, username: username})
-        if Settings.options[:marker][:messages] == true
+        post_object = PostObject.new(resp["data"])
+        if Settings.options.marker.messages
           if resp['meta']['code'] == 200
-            data = resp['data']
-            name = "channel:#{data['channel_id']}"
-            Databases.pagination_insert(name, data['id'])
-            marked = @api.update_marker(name, data['id'])
+            name = "channel:#{post_object.channel_id}"
+            Databases.pagination_insert(name, post_object.id)
+            marked = @api.update_marker(name, post_object.id)
             updated = JSON.parse(marked)
             if updated['meta']['code'] != 200
-              raise "couldn't update channel #{data['channel_id']} as read"
+              raise "couldn't update channel #{post_object.channel_id} as read"
             end
           end
         end
-        FileOps.save_message(resp) if Settings.options[:backup][:messages]
-    		@view.clear_screen
-    		@status.yourmessage(username[0])
-    		@view.show_posted(resp)
-    	rescue => e
+        FileOps.save_message(resp) if Settings.options.backup.messages
+        @view.clear_screen
+        @status.yourmessage(username[0])
+        @view.show_simple_post([post_object])
+      rescue => e
         Errors.global_error({error: e, caller: caller, data: [username, options]})
-    	end
+      end
     end
 
     def reply(post_id, options = {})
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
+        Settings.options.timeline.compact = true if options[:compact]
         @check.bad_post_id(post_id)
-        if options[:force]
-          Settings.global[:force] = true
-        else
-          post_id = @workers.get_real_post_id(post_id)
-        end
-      	@status.replying_to(post_id)
-      	replied_to = @api.get_details(post_id)
-        @check.no_post(replied_to, post_id)
+        post_id = get_real_post_id_or_force(options, post_id)
+        @status.replying_to(post_id)
+        replied_to = @api.get_details(post_id)
+        @check.no_details(replied_to, post_id)
+        # API specifies to always reply to the original post of a reposted post. We offer the user an option to not.
         unless options[:noredirect]
           post_id = @workers.get_original_id(post_id, replied_to)
         end
         if replied_to['data']['repost_of']
           if post_id == replied_to['data']['repost_of']['id']
             replied_to = @api.get_details(post_id)
-            @check.no_post(replied_to, post_id)
+            @check.no_details(replied_to, post_id)
           end
         end
         # ----
-        writer = Post.new
+        writer = Post.new(@status)
         @status.writing
         @status.reply
-        lines_array = writer.compose
-        text = lines_array.join("\n")
-        # text length is tested in Post class for the reply command
+        text = writer.compose.join("\n")
+        # Text length is tested in Post class for the reply command
         @view.clear_screen
-        replied_to = @workers.build_posts([replied_to['data']])
-        if options[:poster]
-          settings = options.dup
-          options = NowWatching.new.get_poster(settings[:poster], settings)
-        end
+        replied_to = @workers.build_posts([PostObject.new(replied_to['data'])])[0]
         resp = writer.reply({options: options, text: text, id: post_id, reply_to: replied_to})
-        FileOps.save_post(resp) if Settings.options[:backup][:posts]
+        FileOps.save_post(resp) if Settings.options.backup.posts
         # ----
+        # "options" from CLI is immutable, we have to make a copy to add items
         options = options.dup
         unless resp['data']['reply_to'].nil?
           options[:reply_to] = resp['data']['reply_to'].to_i
         end
         options[:post_id] = resp['data']['id'].to_i
-        @view.render(@api.get_convo(post_id), options)
-        puts "\n" if Settings.options[:timeline][:compact] == true && !options[:raw]
+        stream = @api.get_convo(post_id)
+        stream_object = StreamObject.new(stream)
+        @view.render(stream_object, options)
+        puts "\n" if Settings.options.timeline.compact && !options[:raw]
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [post_id, options]})
       end
@@ -803,48 +628,41 @@ module Ayadn
 
     def send_to_channel(channel_id, options = {})
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        if options[:silent]
-          Settings.options[:marker][:messages] = false
-        end
+        Settings.options.timeline.compact = true if options[:compact]
+        Settings.options.marker.messages = false if options[:silent]
         channel_id = @workers.get_channel_id_from_alias(channel_id)
-        writer = Post.new
+        writer = Post.new(@status)
         @status.writing
         @status.message
-        lines_array = writer.compose
-        text = lines_array.join("\n")
-        writer.message_size_error(text) if writer.message_size_ok?(text) == false
+        text = writer.compose.join("\n")
+        writer.message_size_error(text) if !writer.message_size_ok?(text)
         @view.clear_screen
         @status.posting
-        if options[:poster]
-          settings = options.dup
-          options = NowWatching.new.get_poster(settings[:poster], settings)
-        end
         resp = writer.message({options: options, id: channel_id, text: text})
-        if Settings.options[:marker][:messages] == true
+        post_object = PostObject.new(resp["data"])
+        if Settings.options.marker.messages
           if resp['meta']['code'] == 200
-            data = resp['data']
-            name = "channel:#{data['channel_id']}"
-            Databases.pagination_insert(name, data['id'])
-            marked = @api.update_marker(name, data['id'])
+            name = "channel:#{post_object.channel_id}"
+            Databases.pagination_insert(name, post_object.id)
+            marked = @api.update_marker(name, post_object.id)
             updated = JSON.parse(marked)
             if updated['meta']['code'] != 200
-              raise "couldn't update channel #{data['channel_id']} as read"
+              raise "couldn't update channel #{post_object.channel_id} as read"
             end
           end
         end
-        FileOps.save_message(resp) if Settings.options[:backup][:messages]
+        FileOps.save_message(resp) if Settings.options.backup.messages
         @view.clear_screen
         @status.yourpost
-        @view.show_posted(resp)
+        @view.show_simple_post([post_object])
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [channel_id, options]})
       end
     end
 
     def nowplaying(options = {})
-      Settings.options[:timeline][:compact] = true if options[:compact] == true
-      np = NowPlaying.new(@api, @view, @workers, options)
+      Settings.options.timeline.compact = true if options[:compact]
+      np = NowPlaying.new(@api, @view, @workers, @status, options)
       if options[:lastfm]
         np.lastfm(options)
       elsif options[:deezer]
@@ -854,62 +672,54 @@ module Ayadn
       end
     end
 
-    def nowwatching(args, options = {})
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        if args.empty?
-          @status.error_missing_title
-          exit
-        end
-        nw = NowWatching.new(@view)
-        nw.post(args, options)
-      rescue ArgumentError => e
-        @status.no_movie
-      rescue => e
-        @status.wtf
-        Errors.global_error({error: e, caller: caller, data: [args, options]})
-      end
+    private
+
+    def save_and_view(resp)
+      FileOps.save_post(resp) if Settings.options.backup.posts
+      @view.clear_screen
+      @status.yourpost
+      puts "\n\n"
+      @view.show_posted(resp)
     end
 
-    def tvshow(args, options = {})
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        if args.empty?
-          @status.error_missing_title
-          exit
-        end
-        client = TvShow.new
-        show_obj = if options[:alt]
-          client.find_alt(args.join(' '))
-        else
-          client.find(args.join(' '))
-        end
-        candidate = client.create_details(show_obj)
-        candidate.ok ? candidate.post(options) : candidate.cancel
-      rescue => e
-        @status.wtf
-        Errors.global_error({error: e, caller: caller, data: [args, options]})
+    def get_posts_ids_or_exit ids
+      int_ids = ids.select { |post_id| post_id.is_integer? }
+      if int_ids.empty?
+        yield
+        exit
       end
+      int_ids
     end
 
-    def random_posts(options)
-      begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
-        stream = Stream.new(@api, @view, @workers)
-        stream.random_posts(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [@max_id, @random_post_id, @resp, options]})
+    def get_all_usernames_but_me usernames
+      @check.no_username(usernames)
+      @workers.all_but_me(usernames)
+    end
+
+    def get_real_posts_ids_or_force options, posts_ids
+      if options[:force]
+        Settings.global.force = true
+        posts_ids
+      else
+        posts_ids.map { |post_id| @workers.get_real_post_id(post_id) }
       end
     end
 
-    private
+    def get_real_post_id_or_force options, post_id
+      if options[:force]
+        Settings.global.force = true
+        post_id
+      else
+        @workers.get_real_post_id(post_id)
+      end
+    end
 
-    def save_and_view(resp)
-      FileOps.save_post(resp) if Settings.options[:backup][:posts]
+    def post_and_show writer, text, options
+      writer.post_size_error(text) if !writer.post_size_ok?(text)
       @view.clear_screen
-      @status.yourpost
-      puts "\n\n"
-      @view.show_posted(resp)
+      @status.posting
+      resp = writer.post({options: options, text: text})
+      save_and_view(resp)
     end
 
   end