ig_api 0.0.15 → 0.0.16

data/lib/ig_api/user.rb

@@ -1,120 +1,128 @@
-require 'ig_api/device'
-require 'ig_api/constants'
-
-module IgApi
-  class User
-    attr_reader :password, :language
-    attr_accessor :username, :config, :session, :data
-
-    def initialize(params = {})
-      @account = nil
-      @feed = nil
-
-      if params.key? :session
-        @username = params[:session].scan(/ds_user=(.*?);/)[0][0]
-      end
-
-      inject_variables(params)
-    end
-
-    def inject_variables(params)
-      params.each { |key, value| instance_variable_set(:"@#{key}", value) }
-    end
-
-    def search_for_user(username)
-      account.search_for_user(self, username)
-    end
-
-    def search_for_user_graphql(username)
-      account.search_for_graphql(self, username)
-    end
-
-    def followers(limit = Float::INFINITY, data = {})
-      IgApi::Feed.user_followers(self, data, limit)
-    end
-
-    def user_followers_graphql(limit = Float::INFINITY, data = {})
-      IgApi::Feed.user_followers_graphql(self, data, limit)
-    end
-
-    def relationship
-      unless instance_variable_defined? :@relationship
-        @relationship = Relationship.new self
-      end
-
-      @relationship
-    end
-
-    def account
-      @account = IgApi::Account.new if @account.nil?
-
-      @account
-    end
-
-    def feed
-      @feed = IgApi::Feed.new if @feed.nil?
-
-      @feed.using(self)
-    end
-
-    def thread
-      @thread = IgApi::Thread.new unless defined? @thread
-
-      @thread.using self
-    end
-
-    def md5
-      Digest::MD5.hexdigest @username
-    end
-
-    def md5int
-      (md5.to_i(32) / 10e32).round
-    end
-
-    def api
-      (18 + (md5int % 5)).to_s
-    end
-
-    # @return [string]
-    def release
-      %w[4.0.4 4.3.1 4.4.4 5.1.1 6.0.1][md5int % 5]
-    end
-
-    def dpi
-      %w[801 577 576 538 515 424 401 373][md5int % 8]
-    end
-
-    def resolution
-      %w[3840x2160 1440x2560 2560x1440 1440x2560
-         2560x1440 1080x1920 1080x1920 1080x1920][md5int % 8]
-    end
-
-    def info
-      line = Device.devices[md5int % Device.devices.count]
-      {
-        manufacturer: line[0],
-        device: line[1],
-        model: line[2]
-      }
-    end
-
-    def useragent_hash
-      agent = [api + '/' + release, dpi + 'dpi',
-               resolution, info[:manufacturer],
-               info[:model], info[:device], @language]
-
-      {
-        agent: agent.join('; '),
-        version: Constants::PRIVATE_KEY[:APP_VERSION]
-      }
-    end
-
-    def useragent
-      format('Instagram %s Android(%s)', useragent_hash[:version], useragent_hash[:agent].rstrip)
-    end
-
-    def device_id
-      'android-' + md5[0..15]
-    end
-  end
-end
+require 'ig_api/device'
+require 'ig_api/constants'
+
+module IgApi
+  class User
+    attr_reader :password, :language
+    attr_accessor :username, :config, :session, :data
+
+    def initialize(params = {})
+      @account = nil
+      @feed = nil
+
+      if params.key? :session
+        @username = params[:session].scan(/ds_user=(.*?);/)[0][0]
+
+        id = params[:session].scan(/ds_user_id=(\d+)/)[0][0]
+
+        if data.nil?
+          @data = { id: id }
+        else
+          @data[:id] = id
+        end
+      end
+
+      inject_variables(params)
+    end
+
+    def inject_variables(params)
+      params.each { |key, value| instance_variable_set(:"@#{key}", value) }
+    end
+
+    def search_for_user(username)
+      account.search_for_user(self, username)
+    end
+
+    def search_for_user_graphql(username)
+      account.search_for_graphql(self, username)
+    end
+
+    def followers(limit = Float::INFINITY, data = {})
+      IgApi::Feed.user_followers(self, data, limit)
+    end
+
+    def user_followers_graphql(limit = Float::INFINITY, data = {})
+      IgApi::Feed.user_followers_graphql(self, data, limit)
+    end
+
+    def relationship
+      unless instance_variable_defined? :@relationship
+        @relationship = Relationship.new self
+      end
+
+      @relationship
+    end
+
+    def account
+      @account = IgApi::Account.new if @account.nil?
+
+      @account
+    end
+
+    def feed
+      @feed = IgApi::Feed.new if @feed.nil?
+
+      @feed.using(self)
+    end
+
+    def thread
+      @thread = IgApi::Thread.new unless defined? @thread
+
+      @thread.using self
+    end
+
+    def md5
+      Digest::MD5.hexdigest @username
+    end
+
+    def md5int
+      (md5.to_i(32) / 10e32).round
+    end
+
+    def api
+      (18 + (md5int % 5)).to_s
+    end
+
+    # @return [string]
+    def release
+      %w[4.0.4 4.3.1 4.4.4 5.1.1 6.0.1][md5int % 5]
+    end
+
+    def dpi
+      %w[801 577 576 538 515 424 401 373][md5int % 8]
+    end
+
+    def resolution
+      %w[3840x2160 1440x2560 2560x1440 1440x2560
+         2560x1440 1080x1920 1080x1920 1080x1920][md5int % 8]
+    end
+
+    def info
+      line = Device.devices[md5int % Device.devices.count]
+      {
+        manufacturer: line[0],
+        device: line[1],
+        model: line[2]
+      }
+    end
+
+    def useragent_hash
+      agent = [api + '/' + release, dpi + 'dpi',
+               resolution, info[:manufacturer],
+               info[:model], info[:device], @language]
+
+      {
+        agent: agent.join('; '),
+        version: Constants::PRIVATE_KEY[:APP_VERSION]
+      }
+    end
+
+    def useragent
+      format('Instagram %s Android(%s)', useragent_hash[:version], useragent_hash[:agent].rstrip)
+    end
+
+    def device_id
+      'android-' + md5[0..15]
+    end
+  end
+end

data/lib/ig_api/version.rb

@@ -1,3 +1,3 @@
-module IgApi
-  VERSION = "0.0.15"
-end
+module IgApi
+  VERSION = "0.0.16"
+end

data/lib/ig_api.rb

@@ -1,12 +1,12 @@
-# frozen_string_literal: true
-
-require 'ig_api/http'
-require 'ig_api/user'
-require 'ig_api/device'
-require 'ig_api/thread'
-require 'ig_api/constants'
-require 'ig_api/relationship'
-
-# Root module
-module IgApi
+# frozen_string_literal: true
+
+require 'ig_api/http'
+require 'ig_api/user'
+require 'ig_api/device'
+require 'ig_api/thread'
+require 'ig_api/constants'
+require 'ig_api/relationship'
+
+# Root module
+module IgApi
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ig_api
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - vicoerv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler