instabot 0.1.60 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65c19805d01e7d5cf548a2e0ddbddb22c140d23
-  data.tar.gz: fdfd65e986e357492c3fca461d8f88cb01a5b9e6
+  metadata.gz: dcce24b29e0626b0a5bd78169ddab9f35921bf1e
+  data.tar.gz: 1a8eb1ff3f0e3b9a61004703e56ad5b6d8be2a06
 SHA512:
-  metadata.gz: 2ef72eecc7d4e9dbea93ee788be2ba6f8195afeae5dd1592fc9ce390b88b66162e836ab3164c9fc30be01d84a68c6a3ede9a7f0eea9c297cc4202502c213ca07
-  data.tar.gz: 0ca74a86ac3ca1a7c2cb94bc589e035a6ab05bb03907ab682b97428a3c0edd77bf06edaed3e2b1953dfd9a6cea79ce74cd9653eae0d56e0c3c82734871cd3e37
+  metadata.gz: 83df48cbcb8673ba3270a59a1f0e497755b2a1c3b08bc5aa865d9a22c5864763b54dabc32da24779f5ab45c2dd83330ad4740efe2280dbfc37e755a66c3cee62
+  data.tar.gz: d1b8423befec9141b89e882c220efc27017b4800aac786bb3a0ab18e4e3dbdb166fc5cda561da10db75cd8dc9b991d845280264285cb57de9f6bc103ded8c935

data/lib/instabot.rb

@@ -1,10 +1,10 @@
-require 'instabot/create_protocol'
-require 'instabot/version'
-require 'instabot/actions'
-require 'instabot/grabber'
-require 'instabot/banner'
-require 'instabot/logger'
-require 'instabot/config'
-require 'instabot/login'
-require 'instabot/modes'
-require 'instabot/core'
+require_relative 'instabot/create_protocol'
+require_relative 'instabot/version'
+require_relative 'instabot/actions'
+require_relative 'instabot/grabber'
+require_relative 'instabot/banner'
+require_relative 'instabot/logger'
+require_relative 'instabot/config'
+require_relative 'instabot/login'
+require_relative 'instabot/modes'
+require_relative 'instabot/core'

data/lib/instabot/core.rb

@@ -19,7 +19,7 @@ class Instabot
     include Log
     include Protocol
 
-    attr_accessor :users, :medias, :informations
+    attr_accessor :users, :medias, :media_information, :user_information
 
     def initialize(mode = :default)
         @login_mode    = mode 

data/lib/instabot/create_protocol.rb

@@ -2,7 +2,7 @@ module Protocol
   def create_mechanic
     @agent                  = Mechanize.new
     @agent.max_history      = 2
-    @agent.ca_file          = './cacert.pem' # Because i'm using windows and... you know... ._.
+    # @agent.ca_file          = './cacert.pem' # Because i use windows and... you know... ._.
     @agent.user_agent_alias = ['Mac Mozilla', 'Mac Safari', 'Windows IE 6', 'Windows IE 7', 'Windows IE 8', 'Windows IE 9', 'Windows Mozilla', 'Windows Chrome'].sample
     if options[:use_proxy]
       proxy = options[:proxy]

data/lib/instabot/grabber.rb

@@ -1,7 +1,9 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
 module Grabber
-  def get_user_informations(user_id)
-    puts '[+] '.cyan + "Trying to get user (#{user_id}) informations"
-    log("Trying to get user (#{user_id}) informations", 'GRABBER')
+  def handle_user_information_data_by_user_id(user_id)
+    puts '[+] '.cyan + "Trying to get user (#{user_id}) information"
+    log("Trying to get user (#{user_id}) information", 'GRABBER')
     user_page = "https://www.instagram.com/web/friendships/#{user_id}/follow/"
     response  = get_page(user_page)
     last_page = response.uri.to_s
@@ -9,25 +11,57 @@ module Grabber
     response  = @agent.get("https://instagram.com/#{username}/?__a=1")
     data      = parse_response(response.body)
 
-    @informations = {
+    set_user_information(data)
+  end
+
+  def handle_user_information_data_by_user_name(username)
+    puts '[+] '.cyan + "Trying to get user (#{username}) information"
+    log("Trying to get user (#{username}) information", 'GRABBER')
+    response  = @agent.get("https://instagram.com/#{username}/?__a=1")
+    data      = parse_response(response.body)
+
+    set_user_information(data)
+  end
+
+  def handle_media_information_data(media_id)
+    puts '[+] '.cyan + "Trying to get media (#{media_id}) information"
+    log("Trying to get media (#{media_id}) information", 'GRABBER')
+    response = @agent.get("https://www.instagram.com/p/#{media_id}/?__a=1")
+    data     = parse_response(response.body)
+
+    set_media_information(data)
+
+    unless @infinite_tags == true
+      tags = @media_information[:text].encode('UTF-8', invalid: :replace, undef: :replace, replace: '?').split(/\W+/)
+      id   = 0
+      tags.each do |tag|
+        if tag == '_' || tag == '' || tag.nil?
+          tags.delete(tag)
+        else
+          id += 1
+          Config.options.tags << tag
+        end
+      end
+      puts '[+] '.cyan + '[' + id.to_s.yellow + '] New tags added'
+    end
+  end
+
+  def set_user_information(data)
+    @user_information = {
       followers:   data.deep_find('followed_by')['count'],
       following:   data.deep_find('follows')['count'],
       is_private:  data.deep_find('is_private'),
       is_verified: data.deep_find('is_verified'),
       username:    data.deep_find('username'),
-      posts:       data.deep_find('media')['count'],
+      media_count:       data.deep_find('media')['count'],
+      medias:       data.deep_find('media')['nodes'],
       full_name:   data.deep_find('full_name'),
       id:          data.deep_find('id')
-    }
+    }.with_indifferent_access
   end
 
-  def get_media_informations(media_id)
-    puts '[+] '.cyan + "Trying to get media (#{media_id}) informations"
-    log("Trying to get media (#{media_id}) informations", 'GRABBER')
-    response = @agent.get("https://www.instagram.com/p/#{media_id}/?__a=1")
-    data     = parse_response(response.body)
-
-    @informations = {
+  def set_media_information(data)
+    @media_information = {
       id:                  data.deep_find('id'),
       full_name:           data.deep_find('full_name'),
       owner:               data.deep_find('owner')['username'],
@@ -40,21 +74,7 @@ module Grabber
       is_verified:         data.deep_find('is_verified'),
       requested_by_viewer: data.deep_find('requested_by_viewer'),
       text:                data.deep_find('text') 
-    }
-
-    unless @infinite_tags == true
-      tags = @informations[:text].encode('UTF-8', invalid: :replace, undef: :replace, replace: '?').split(/\W+/)
-      id   = 0
-      tags.each do |tag|
-        if tag == '_' || tag == '' || tag.nil?
-          tags.delete(tag)
-        else
-          id += 1
-          Config.options.tags << tag
-        end
-      end
-      puts '[+] '.cyan + '[' + id.to_s.yellow + '] New tags added'
-    end
+    }.with_indifferent_access
   end
 
   def search(tags = [])

data/lib/instabot/modes.rb

@@ -67,9 +67,9 @@ module Modes
     while @maximums[:follows_in_day] < @maximums[:max_follows_per_day]
       begin
         id += 1 if all_users[id].nil? || all_users[id] == []
-        get_user_informations(all_users[id])
+        handle_user_information_data_by_user_id(all_users[id])
         puts '[+] '.cyan + "Trying to follow user [#{all_users[id]}]"
-        follow(@informations[:id])
+        follow(@user_information[:id])
         puts '[+] '.cyan + 'User followed'.upcase.green.bold
         @maximums[:follows_in_day] += 1
         id                         += 1
@@ -113,9 +113,9 @@ module Modes
     id      = 0
     while @maximums[:likes_in_day] < @maximums[:max_likes_per_day]
       begin
-        get_media_informations(all_medias[id])
+        handle_media_information_data(all_medias[id])
         puts '[+] '.cyan + "Trying to like media [#{all_medias[id]}]"
-        like(@informations[:id])
+        like(@media_information[:id])
         puts '[+] '.cyan + 'Media liked'.upcase.green.bold
         @maximums[:likes_in_day] += 1
         id                       += 1
@@ -134,15 +134,15 @@ module Modes
     id      = 0
     while @maximums[:comments_in_day] < @maximums[:max_comments_per_day]
       begin
-        get_media_informations(all_medias[id])
-        if @informations[:comments_disabled]
+        handle_media_information_data(all_medias[id])
+        if @media_information[:comments_disabled]
           puts '[-]'.red + 'comments are disable' + "\t[IGNORING]".yellow
           id += 1 
           next
         end
         generated_comment = generate_a_comment
         puts '[+] '.cyan + "Trying to send a comment[#{generated_comment}] to media[#{all_medias[id]}]"
-        comment(@informations[:id], generated_comment)
+        comment(@media_information[:id], generated_comment)
         puts '[+] '.cyan + 'comment has been sent'.upcase.green.bold
         @maximums[:comments_in_day] += 1
         id                          += 1
@@ -208,4 +208,4 @@ module Modes
       likes_in_day_are_full? && follows_in_day_are_full? &&
       unfollows_in_day_are_full? && comments_in_day_are_full?
   end
-end
+end

data/lib/instabot/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION     = '0.1.60'.freeze
+  VERSION     = '0.1.70'.freeze
   SUMMARY     = 'Ruby instagram bot'.freeze
   DESCRIPTION = 'An instagram bot works without instagram api, only needs your username and password'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instabot
 version: !ruby/object:Gem::Version
-  version: 0.1.60
+  version: 0.1.70
 platform: ruby
 authors:
 - eVanilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler