ayadn 4.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6ebd67992a3895ceefe25d38e32281b3f40a340
-  data.tar.gz: 79aa8fc478f5610abc5295c8b54fc80d24becb4c
+  metadata.gz: 02a0cccf2fa086175db55a6fea0e5bdff7212108
+  data.tar.gz: 3ca2e5ca712ed2c72dc81983f785d7ff2debe8b5
 SHA512:
-  metadata.gz: 5bb3f4b17dcb074d1ed73a080e54c125f5c9640db70c71bf719e0a3bd189298f8f84cca6dc0df626436526467ebb722c1c53444e8de6c3f7a853252112fdc4b8
-  data.tar.gz: a1b6c4e8d91571e74088b0ce64eaf6b1a009e1ec6356df0a1dc8411eeaf61fdc5d833a1df151bf004d74d1b6bc1a9cd7db22466a82d0cfe30d133d8af53addb4
+  metadata.gz: 0ecb46003bc51d754efbbe0b06f11952267c9c0f68837c24813382e1df6674eef56bddb605b4ad4d70a6271dfe0ded668e1a1d1052061a3e5a07ac4f6e902c42
+  data.tar.gz: eac8e64ac9316910d854e6dcacbc505b9a6caba55e32e8f7deda2d1a0926766d75f9c87f580f3d55e32a1b0322f6a2cfd341a12199d6657aec75d0d8900ba936

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 4.0- 2016-05-01 - 'Mr. Robot'
+## 4.0.1 - 2016-09-03 - 'Halt And Catch Fire'
+
+- Fixed: crash when attempting to access a deleted channel
+
+## 4.0 - 2016-05-01 - 'Mr. Robot'
 
 - Fixed: when possible, unauthorizing a user keeps the current user logged
 - Fixed: inconsistencies in the 'set' command

data/lib/ayadn/action.rb

@@ -399,7 +399,8 @@ module Ayadn
           @view.downloading
           resp = channels.call
           @view.clear_screen
-          channels = resp["data"].map { |ch| ChannelObject.new(ch) }
+          data = resp["data"] 
+          channels = data.map { |ch| ChannelObject.new(ch) }
           @view.show_channels(channels, options)
         end
       rescue => e

data/lib/ayadn/channel_object.rb

@@ -45,23 +45,26 @@ module Ayadn
   	attr_reader :input, :pagination_id, :is_inactive, :readers, :you_muted, :you_can_edit, :has_unread, :editors, :annotations, :recent_message_id, :writers, :you_subscribed, :owner, :type, :id, :counts, :recent_message
 
     def initialize hash
-      @input = hash
-      @pagination_id = @input["pagination_id"]
-      @is_inactive = @input["is_inactive"]
-      @readers = ChannelReadersObject.new(@input["readers"])
-      @you_muted = @input["you_muted"]
-      @you_can_edit = @input["you_can_edit"]
-      @has_unread = @input["has_unread"]
-      @editors = ChannelEditorsObject.new(@input["editors"])
-      @annotations = @input["annotations"].map { |ann| PostAnnotationObject.new(ann) }
-      @recent_message_id = @input["recent_message_id"]
-      @writers = ChannelEditorsObject.new(@input["writers"])
-      @you_subscribed = @input["you_subscribed"]
-      @owner = @input["owner"].nil? ? nil : UserObject.new(@input["owner"])
-      @type = @input["type"]
-      @id = @input["id"]
-      @counts = ChannelCountsObject.new(@input["counts"])
-      @recent_message = @input["recent_message"].nil? ? nil : PostObject.new(@input["recent_message"])
+        @input = hash
+        @pagination_id = @input["pagination_id"]
+        @is_inactive = @input["is_inactive"]
+        @readers = ChannelReadersObject.new(@input["readers"])
+        @you_muted = @input["you_muted"]
+        @you_can_edit = @input["you_can_edit"]
+        @has_unread = @input["has_unread"]
+        @editors = ChannelEditorsObject.new(@input["editors"])
+        @annotations = @input["annotations"].map { |ann| PostAnnotationObject.new(ann) }
+        @recent_message_id = @input["recent_message_id"]
+        @writers = ChannelEditorsObject.new(@input["writers"])
+        @you_subscribed = @input["you_subscribed"]
+        if @input["owner"].nil?
+          return
+        end
+        @owner = UserObject.new(@input["owner"])
+        @type = @input["type"]
+        @id = @input["id"]
+        @counts = ChannelCountsObject.new(@input["counts"])
+        @recent_message = @input["recent_message"].nil? ? nil : PostObject.new(@input["recent_message"])
     end
 
   end

data/lib/ayadn/user_object.rb

@@ -82,35 +82,35 @@ module Ayadn
     attr_accessor :input, :you_muted, :you_can_subscribe, :is_following, :is_follower, :timezone, :you_follow, :counts, :canonical_url, :id, :locale, :type, :annotations, :username, :avatar_image, :description, :is_muted, :follows_you, :you_can_follow, :name, :created_at, :you_blocked, :cover_image, :verified_domain, :meta
 
     def initialize hash, username = nil
-      @input = hash['data'].nil? ? hash : hash['data']
-      @meta = UserMetaObject.new(hash, username)
-      @you_muted = @input["you_muted"]
-      @you_can_subscribe = @input["you_can_subscribe"]
-      @is_follower = @input["is_follower"]
-      @is_following = @input["is_following"]
-      @timezone = @input["timezone"]
-      @you_follow = @input["you_follow"]
-      @counts = UserCountsObject.new(@input) unless @input.empty?
-      @canonical_url = @input["canonical_url"]
-      @id = @input["id"]
-      @locale = @input["locale"]
-      @type = @input["type"]
-      if !@input["annotations"].nil?
-        @annotations = @input["annotations"].map { |hash| UserAnnotationObject.new(hash) }
-      else
-        @annotations = []
-      end
-      @username = @input["username"]
-      @avatar_image = AvatarImageObject.new(@input) unless @input.empty?
-      @description = UserDescriptionObject.new(@input) unless @input.empty?
-      @is_muted = @input["is_muted"]
-      @follows_you = @input["follows_you"]
-      @you_can_follow = @input["you_can_follow"]
-      @name = @input["name"].to_s.force_encoding("UTF-8")
-      @created_at = @input["created_at"]
-      @you_blocked = @input["you_blocked"]
-      @cover_image = CoverImageObject.new(@input) unless @input.empty?
-      @verified_domain = @input["verified_domain"]
+        @input = hash['data'].nil? ? hash : hash['data']
+        @meta = UserMetaObject.new(hash, username)
+        @you_muted = @input["you_muted"]
+        @you_can_subscribe = @input["you_can_subscribe"]
+        @is_follower = @input["is_follower"]
+        @is_following = @input["is_following"]
+        @timezone = @input["timezone"]
+        @you_follow = @input["you_follow"]
+        @counts = UserCountsObject.new(@input) unless @input.empty?
+        @canonical_url = @input["canonical_url"]
+        @id = @input["id"]
+        @locale = @input["locale"]
+        @type = @input["type"]
+        if !@input["annotations"].nil?
+          @annotations = @input["annotations"].map { |hash| UserAnnotationObject.new(hash) }
+        else
+          @annotations = []
+        end
+        @username = @input["username"]
+        @avatar_image = AvatarImageObject.new(@input) unless @input.empty?
+        @description = UserDescriptionObject.new(@input) unless @input.empty?
+        @is_muted = @input["is_muted"]
+        @follows_you = @input["follows_you"]
+        @you_can_follow = @input["you_can_follow"]
+        @name = @input["name"].to_s.force_encoding("UTF-8")
+        @created_at = @input["created_at"]
+        @you_blocked = @input["you_blocked"]
+        @cover_image = CoverImageObject.new(@input) unless @input.empty?
+        @verified_domain = @input["verified_domain"]
     end
   end
 end

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "4.0"
+  VERSION = "4.0.1"
 end

data/lib/ayadn/workers.rb

@@ -335,6 +335,7 @@ module Ayadn
       no_user = {}
       api = API.new
       stream.each do |ch|
+        next if ch.id.nil?
         unless ch.writers.user_ids.empty?
           @status.say_cyan :parsing, "channel #{ch.id}"
           usernames = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: '4.0'
+  version: 4.0.1
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor