instabot 0.1.75 → 0.1.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ef6db5c38e62a1e5a352d8e88e60c001920e8a2
-  data.tar.gz: b927e8656eea81c622e75fa5cb953b9f740e544f
+  metadata.gz: f89e0b51f16a304b7fe67ed1cc3da8a3bae7d038
+  data.tar.gz: e6e624baa761e5cf465df6092c3e1e20407c185c
 SHA512:
-  metadata.gz: f55cf8bd4541db3d03e34c76cfff534910d0aec44749063f3a8b4af4c3fb83c20fa5752ee9e1eede78d4019cf802a7fe4f728ca393aaf09f7390a79043b582b9
-  data.tar.gz: 966b141b4c034c5bffe6ba23af9de88e22836efdfaceeaacc3d2e23658bfc50cc739de8f79b23c06d2019f038de85e9ceafef97263e909a0e35006979d859d17
+  metadata.gz: eb26bfbe42fa69f2b3ec8f86d1b0e52490a9e6328bb517d56c16cc2e90b217f053f48a5db2a8aca1008ed120a169bc21635648e6eeff872e4aa6b3bea242fa29
+  data.tar.gz: 16fc4a486a600f58d5ad3baef4467b3dd860b2b9bf8d0038bf9b5403b8529304abb292c9201ce25c3293ab8f2b55668d20773cbafeeba6f6a8a5c92f7054fb02

data/lib/instabot/banner.rb

@@ -10,7 +10,7 @@ module Banner
  ╚═╝╚═╝  ╚═══╝╚══════╝   ╚═╝   ╚═╝  ╚═╝╚═════╝  ╚═════╝    ╚═╝
 
         BANNER
-      puts 'An instagram bot works without instagram api '.white.bold + 'github.com/'.cyan + 'eVanilla/instabot.rb'.cyan.bold.italic
+      puts 'An instagram bot works without instagram api '.white.bold + 'github.com/'.cyan + "eVanilla/instabot.rb\n".cyan.bold.italic
     end
   end
 end

data/lib/instabot/config.rb

@@ -14,7 +14,9 @@ module Config
                         :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,
-                        :log_status, :use_tor
+                        :log_status, :use_tor, :add_tag_per_post, :unwanted_list,
+                        :white_list_users
+
         def initialize
             @wait_per_action      = 1 * 60
             @max_comment_per_day  = 50
@@ -31,9 +33,11 @@ module Config
             @log_status           = true
             @use_proxy            = false
             @use_tor              = false
+            @add_tag_per_post     = 1
             @tags                 = []
             @unwanted_list        = []
             @white_list_users     = []
+            
             @comments             = [
                 %w[this the your],
                 %w[photo picture pic shot snapshot],

data/lib/instabot/core.rb

@@ -23,16 +23,18 @@ class Instabot
     attr_accessor :users, :medias, :media_information, :user_information
 
     def initialize(mode = :default)
-        @login_mode    = mode 
-        @users         = []
-        @medias        = []
-        @log_counter   = 0
-        @login_counter = 1
-        @login_status  = false
-        @lib_dir       = "#{Dir.pwd}/lib"
-        @root_dir      = Dir.pwd.to_s
-        @logs_dir      = "#@root_dir/logs"
-        @global_time   = Time.new.strftime('%H-%M-%S--%y-%m-%d')
+        @login_mode       = mode 
+        @users            = []
+        @medias           = []
+        @log_counter      = 0
+        @login_counter    = 1
+        @login_status     = false
+        @lib_dir          = "#{Dir.pwd}/lib"
+        @root_dir         = Dir.pwd.to_s
+        @logs_dir         = "#@root_dir/logs"
+        @started_time     = Time.new.strftime('%H-%M-%S--%y-%m-%d')
+        @errors_iteration = 0 
+
         Configuration.new if @login_mode == :manual
 
         @local_stroage = {
@@ -72,12 +74,13 @@ class Instabot
                 print_banner:         Config.options.print_banner,
                 proxy:                Config.options.proxy,
                 tags:                 Config.options.tags,
-                unwanted_list:        Config.options.unwanted_list,
                 use_proxy:            Config.options.use_proxy,
                 use_tor:              Config.options.use_tor,
                 wait_per_action:      Config.options.wait_per_action,
+                log_status:           Config.options.log_status,
+                add_tag_per_post:     Config.options.add_tag_per_post,
+                unwanted_list:        Config.options.unwanted_list,
                 white_list_users:     Config.options.white_list_users,
-                log_status:           Config.options.log_status
             }
         else
             {
@@ -89,7 +92,6 @@ class Instabot
         end
     end
 
-    # bot starter
     def intro(mode)
         trap('INT') { exit! }
         print_banner

data/lib/instabot/grabber.rb

@@ -35,11 +35,13 @@ module Grabber
       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
+        if id < options[:add_tag_per_post]
+          if tag == '_' || tag == '' || tag.nil? || tag.include?('?')
+            tags.delete(tag)
+          else
+            id += 1
+            Config.options.tags << tag
+          end
         end
       end
       puts '[+] '.cyan + '[' + id.to_s.yellow + '] New tags added'

data/lib/instabot/logger.rb

@@ -30,7 +30,7 @@ module Log
     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|
+        File.open("#{@logs_dir}/logs-#{@started_time}.log", 'a+') do |log_file|
           log_file.puts "[#{@log_counter}] [#{time}] [#{from}] -- : #{text}"
         end
       else

data/lib/instabot/modes.rb

@@ -1,4 +1,4 @@
-# automatic module and helpers
+# modes module and helpers
 module Modes
   # main def and mode selector
   def mode(mode = :default)
@@ -8,38 +8,27 @@ module Modes
       log('[Auto] mode is turned on', 'MODES')
       search(options[:tags])
       @tomorrow = Time.new + 1.days
+      actions = %w[follow unfollow like comment]
       loop do
         if !maximums_are_full?
-          if !follows_in_day_are_full?
-            @maximums[:follows_in_day] += 1
-            auto_follow
-          else
-            puts '[+] '.cyan + 'Maximum follows per day'.upcase
-            log('Maximum follows per day', 'MODES')
-          end
-
-          if !unfollows_in_day_are_full?
-            @maximums[:unfollows_in_day] += 1
-            auto_unfollow
-          else
-            puts '[+] '.cyan + 'Maximum unfollows per day'.upcase
-            log('Maximum unfollows per day', 'MODES')
-          end
-
-          if !likes_in_day_are_full?
-            @maximums[:likes_in_day] += 1
-            auto_like
-          else
-            puts '[+] '.cyan + 'Maximum likes per day'.upcase
-            log('Maximum likes per day', 'MODES')
-          end
-
-          if !comments_in_day_are_full?
-            @maximums[:comments_in_day] += 1
-            auto_comment
-          else
-            puts '[+] '.cyan + 'Maximum comments per day'.upcase
-            log('Maximum comments per day', 'MODES')
+          action = actions.sample
+          case action
+          when 'follow'
+            if !follows_in_day_are_full?
+              auto_follow
+            end
+          when 'unfollow'
+            if !unfollows_in_day_are_full?
+              auto_unfollow
+            end
+          when 'like'
+            if !likes_in_day_are_full?
+              auto_like
+            end
+          when 'comment'
+            if !comments_in_day_are_full?
+              auto_comment
+            end
           end
         else
           check_date
@@ -51,6 +40,7 @@ module Modes
       log('[Clean up] mode is turned on', 'MODES')
       @local_stroage[:followed_users].each do |user|
         unfollow(user)
+        fall_in_asleep
       end
     when :default
       puts '[-] '.cyan + 'Please choose a mode'.upcase.red
@@ -60,22 +50,33 @@ module Modes
   end
 
   def auto_follow
-    all_users    = users
-    id            = 0
-    puts '[+] '.cyan + "#{all_users.size} user is ready to follow".upcase
+    all_users    = @users
+    id           = 0
+    puts '[+] '.cyan + "[follow] ".upcase.yellow.bold + "#{all_users.size} user is ready".upcase
     while @maximums[:follows_in_day] < @maximums[:max_follows_per_day]
       begin
         id += 1 if all_users[id].nil? || all_users[id] == []
         handle_user_information_data_by_user_id(all_users[id])
-        puts '[+] '.cyan + "Trying to follow user [#{all_users[id]}]"
-        follow(@user_information[:id])
-        puts '[+] '.cyan + 'User followed'.upcase.green.bold
-        @maximums[:follows_in_day] += 1
-        id                         += 1
-        fall_in_asleep
+        if !is_user_valid?(@user_information[:full_name])
+          puts '[+] '.cyan + "Trying to follow user [#{all_users[id]}]"
+          follow(@user_information[:id])
+          @users -= [all_users[id]]
+          puts '[+] '.cyan + 'User followed'.upcase.green.bold
+          @maximums[:follows_in_day] += 1
+          id                         += 1
+          fall_in_asleep
+        else
+          puts "unwanted user(#{@user_information[:full_name]}) [ignored]".yellow
+          id += 1
+        end
+        break
       rescue Exception => e
         puts "An error occured ... #{e.class} #{e.message}\n#{e.backtrace.inspect}\n[ignored]"
-        id += 1
+          # exit! if @errors_iteration > 3
+          # id                += 1
+          # @errors_iteration += 1
+          # retry
+          break
         retry
       end
     end
@@ -83,76 +84,96 @@ module Modes
 
   def auto_unfollow
     followed_users = @local_stroage[:followed_users]
-    puts '[+] '.cyan + "#{followed_users.size} user is ready to unfollow".upcase
+    puts '[+] '.cyan + "[unfollow] ".upcase.yellow.bold + "#{followed_users.size} user is ready".upcase
     id = 0
     while @maximums[:unfollows_in_day] < @maximums[:max_unfollows_per_day]
       if @local_stroage[:followed_users].size < @maximums[:max_unfollows_per_day]
-        begin
-          puts '[+] '.cyan + "Trying to unfollow user [#{followed_users[id]}]"
-          unfollow(followed_users[id])
-          puts '[+] '.cyan + 'User unfollowed'.upcase.bold.green
-          @maximums[:unfollows_in_day] += 1
-          id                           += 1
-          fall_in_asleep
-        rescue Exception => e
-          puts "An error occured ... #{e.class} #{e.message}\n#{e.backtrace.inspect}\n[ignored]"
-          id += 1
-          retry
+        if !followed_users.empty?
+          begin
+            puts '[+] '.cyan + "Trying to unfollow user [#{followed_users[id]}]"
+            unfollow(followed_users[id])
+            @local_stroage[:followed_users] -= [followed_users[id]]
+            puts '[+] '.cyan + 'User unfollowed'.upcase.bold.green
+            @maximums[:unfollows_in_day] += 1
+            id                           += 1
+            fall_in_asleep
+            break
+          rescue Exception => e
+            puts "An error occured ... #{e.class} #{e.message}\n#{e.backtrace.inspect}\n[ignored]"
+            # exit! if @errors_iteration > 3
+            # id                += 1
+            # @errors_iteration += 1
+            # retry
+            break
+          end
+        else 
+          break
         end
       else
-        puts '[+] '.cyan + '[unfollow per day] is much bigger than [follow per day]'
-        exit
+        puts '[-] '.red + '[unfollow per day] is much bigger than [follow per day]'.upcase.red.bold
+        exit!
       end
     end
   end
 
   def auto_like
-    all_medias  = medias
-    puts '[+] '.cyan + "#{all_medias.size} Media is ready to like".upcase
+    all_medias  = @medias
+    puts '[+] '.cyan + "[like] ".upcase.yellow.bold + "#{all_medias.size} Media is ready".upcase
     id      = 0
     while @maximums[:likes_in_day] < @maximums[:max_likes_per_day]
       begin
         handle_media_information_data(all_medias[id])
         puts '[+] '.cyan + "Trying to like media [#{all_medias[id]}]"
         like(@media_information[:id])
+        @medias -= [all_medias[id]]
         puts '[+] '.cyan + 'Media liked'.upcase.green.bold
         @maximums[:likes_in_day] += 1
         id                       += 1
         fall_in_asleep
+        break
       rescue Exception => e
         puts "An error occured ... #{e.class} #{e.message}\n#{e.backtrace.inspect}\n[ignored]"
-        id += 1
-        retry
+          # exit! if @errors_iteration > 3
+          # id                += 1
+          # @errors_iteration += 1
+          # retry
+          break
       end
     end
   end
 
   def auto_comment
-    all_medias  = medias
-    # puts '[+] '.cyan + "#{all_medias.size} Media is ready".upcase
+    all_medias  = @medias
+    puts '[+] '.cyan + "[comment] ".upcase.yellow.bold + "#{all_medias.size} Media is ready".upcase
     id      = 0
     while @maximums[:comments_in_day] < @maximums[:max_comments_per_day]
       begin
         handle_media_information_data(all_medias[id])
         if @media_information[:comments_disabled]
-          puts '[-]'.red + 'comments are disable' + "\t[IGNORING]".yellow
+          puts '[-]'.cyan + 'comments are disable' + "\t[ignored]".yellow
           id += 1 
-          next
+          # next
         end
         generated_comment = generate_a_comment
         puts '[+] '.cyan + "Trying to send a comment[#{generated_comment}] to media[#{all_medias[id]}]"
         comment(@media_information[:id], generated_comment)
+        @medias -= [all_medias[id]]
         puts '[+] '.cyan + 'comment has been sent'.upcase.green.bold
         @maximums[:comments_in_day] += 1
         id                          += 1
         fall_in_asleep
+        break
       rescue Exception => e
         puts "An error occured ... #{e.class} #{e.message}\n#{e.backtrace.inspect}\n[ignored]"
-        id += 1
-        retry
+          # exit! if @errors_iteration > 3
+          # id                += 1
+          # @errors_iteration += 1
+          # retry
+          break
       end
     end
   end
+
   # genrating random comment 
   def generate_a_comment
     comment = ""
@@ -160,10 +181,19 @@ module Modes
     comment
   end
 
+  def is_user_valid?(user)
+    if options[:white_list_users].include?(user)
+      options[:unwanted_list].find { |unwanted| unwanted =~ /#{user}/ } != nil 
+    else
+      return false
+    end
+  end
+
+
   def check_date
     time = (@tomorrow - Time.new).to_i # => remained time ...
     if time.zero?
-      puts '[+] '.cyan + "It's a new day"
+      puts '[+] '.cyan + "[new day]".upcase
       @local_stroage[:followed_users]   = []
       @local_stroage[:unfollowed_users] = []
       @local_stroage[:liked_medias]     = []
@@ -181,8 +211,7 @@ module Modes
     end
   end
 
-  def fall_in_asleep
-    time = options[:wait_per_action]
+  def fall_in_asleep(time=options[:wait_per_action])
     puts '[+] '.cyan + "Waiting for #{time} seconds".upcase
     sleep time
   end

data/lib/instabot/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION     = '0.1.75'.freeze
+  VERSION     = '0.1.80'.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.75
+  version: 0.1.80
 platform: ruby
 authors:
 - eVanilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2017-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,6 +126,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.5
+- !ruby/object:Gem::Dependency
+  name: socksify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+- !ruby/object:Gem::Dependency
+  name: net-telnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: An instagram bot works without instagram api, only needs your username
   and password
 email: