instabot 0.1.70 → 0.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcce24b29e0626b0a5bd78169ddab9f35921bf1e
-  data.tar.gz: 1a8eb1ff3f0e3b9a61004703e56ad5b6d8be2a06
+  metadata.gz: b5a4f1641bd00040c9f7e813eadc920184ac9cbe
+  data.tar.gz: dbef1f5c1960256dd80f01ab50db3623ffc3004c
 SHA512:
-  metadata.gz: 83df48cbcb8673ba3270a59a1f0e497755b2a1c3b08bc5aa865d9a22c5864763b54dabc32da24779f5ab45c2dd83330ad4740efe2280dbfc37e755a66c3cee62
-  data.tar.gz: d1b8423befec9141b89e882c220efc27017b4800aac786bb3a0ab18e4e3dbdb166fc5cda561da10db75cd8dc9b991d845280264285cb57de9f6bc103ded8c935
+  metadata.gz: 40f46b5e5a278930c6ee4e96785e2db3d43db02f7ed0b4306e975b39942ee8f5ecb325f1f71db7479e50d342867515778f576b9ea731edb69cc37403c2e32b5d
+  data.tar.gz: 619d455f64c0e32bcf92a97b9d3ad6880371c198f95daa644d8674620a309bd49ec2924c17239e9cbd161d90e77cc5d065ad97839e93b1f4ec3561d7d7d1d345

data/lib/instabot/config.rb

@@ -13,24 +13,25 @@ module Config
         attr_accessor   :username, :password, :tags, :use_proxy, :proxy, :comments,
                         :print_banner, :pre_load, :wait_per_action, :infinite_tags,
                         :max_like_per_day, :max_follow_per_day, :max_unfollow_per_day,
-                        :max_comment_per_day, :unwanted_list, :white_list_users
+                        :max_comment_per_day, :unwanted_list, :white_list_users,:log_status
         def initialize
-            @infinite_tags        = true
+            @wait_per_action      = 1 * 60
             @max_comment_per_day  = 50
             @max_follow_per_day   = 50
             @max_like_per_day     = 50
             @max_unfollow_per_day = 50
             @username             = nil
             @password             = nil
+            @proxy                = nil
+            @username             = nil
+            @infinite_tags        = true
             @pre_load             = true
             @print_banner         = true
-            @proxy                = nil
-            @tags                 = %w[test hello hello_world birthday food]
-            @unwanted_list        = nil
+            @log_status           = true
             @use_proxy            = false
-            @username             = nil
-            @wait_per_action      = 1 * 60
-            @white_list_users     = nil
+            @tags                 = []
+            @unwanted_list        = []
+            @white_list_users     = []
             @comments             = [
                 %w[this the your],
                 %w[photo picture pic shot snapshot],

data/lib/instabot/core.rb

@@ -74,7 +74,8 @@ class Instabot
                 unwanted_list:        Config.options.unwanted_list,
                 use_proxy:            Config.options.use_proxy,
                 wait_per_action:      Config.options.wait_per_action,
-                white_list_users:     Config.options.white_list_users
+                white_list_users:     Config.options.white_list_users,
+                log_status:           Config.options.log_status
             }
         else
             {

data/lib/instabot/grabber.rb

@@ -50,6 +50,9 @@ module Grabber
     @user_information = {
       followers:   data.deep_find('followed_by')['count'],
       following:   data.deep_find('follows')['count'],
+      follows_viewer: data.deep_find('follows_viewer'),
+      followed_by_viewer: data.deep_find('followed_by_viewer'),
+      requested_by_viewer: data.deep_find('requested_by_viewer'),
       is_private:  data.deep_find('is_private'),
       is_verified: data.deep_find('is_verified'),
       username:    data.deep_find('username'),
@@ -78,6 +81,7 @@ module Grabber
   end
 
   def search(tags = [])
+    used_tags = []
     tags.each do |tag|
       puts '[+] '.cyan + "Searching in hashtag [##{tag}]"
       log("Searching in hashtags [##{tag}]", 'GRABBER')
@@ -88,8 +92,9 @@ module Grabber
       media_codes = data.deep_find_all('code')
       owners.map { |id| users << id['id'] }
       media_codes.map { |code| medias << code }
-      Config.options.tags.delete(tag)
+      used_tags << tag
     end
+    Config.options.tags = Config.options.tags - used_tags
     puts '[+] '.cyan + 'Total grabbed users [' + users.size.to_s.yellow + ']'
     puts '[+] '.cyan + 'Total grabbed medias [' + medias.size.to_s.yellow + ']'
     log("Total grabbed users(#{users.size}) & Total grabbed medias(#{medias.size})", 'GRABBER')

data/lib/instabot/logger.rb

@@ -21,20 +21,23 @@ module Log
     end
   end
 
+
   def write_file(filename, text = '')
     File.open("#{@logs_dir}/#{filename}", 'a+') { |f| f.print "#{text.chomp}," }
   end
 
-  def log(text = '', from = '')
-    time = Time.new.strftime('%H:%M:%S %y-%m-%d')
-    if File.exists?(@logs_dir)
-      File.open("#{@logs_dir}/logs-#{@global_time}.log", 'a+') do |log_file|
-        log_file.puts "[#{@log_counter}] [#{time}] [#{from}] -- : #{text}"
+  def log(text = '', from = '', logs_status=options[:log_status])
+    if logs_status
+      time = Time.new.strftime('%H:%M:%S %y-%m-%d')
+      if File.exists?(@logs_dir)
+        File.open("#{@logs_dir}/logs-#{@global_time}.log", 'a+') do |log_file|
+          log_file.puts "[#{@log_counter}] [#{time}] [#{from}] -- : #{text}"
+        end
+      else
+        Dir.mkdir(@logs_dir)
       end
-    else
-      Dir.mkdir(@logs_dir)
+      @log_counter += 1
     end
-    @log_counter += 1
   end
 
   def save_action_log(id = 0, type = :default)

data/lib/instabot/modes.rb

@@ -1,4 +1,3 @@
-
 # automatic module and helpers
 module Modes
   # main def and mode selector

data/lib/instabot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instabot
 version: !ruby/object:Gem::Version
-  version: 0.1.70
+  version: 0.1.73
 platform: ruby
 authors:
 - eVanilla