botinsta 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c12d05858b8f49816a4619aaf56654763dc15168a72ec7c90e9abfe8c1b1a78
-  data.tar.gz: 99af2f029b4fc83d1a8333172d42d4976e879db72aae4f67cf985296ff92dd11
+  metadata.gz: 35dc6b56dac3eb29498b327a357a0de793869e6b292a21f246ee7124be359826
+  data.tar.gz: 8ae761a8f914882f7dbceaeba56133f1e9f3896f0e72d0a4163cd7d23f4e9f77
 SHA512:
-  metadata.gz: cc30b084e633a2be656fa32d37dacc8759ab7901d6369191349e8658ef036f798ed578b95993c55e6b916c4a0e042c9c0a292fa2387c7254d0d85b4e88b8516d
-  data.tar.gz: b2d53a7a4d6a7481d47596bba8a7d78b901c43dd730e8868175fa868d577e7be282fa9e3cf19e5c3909f7d4898ff68833541416526c06fb317e65cfd4f5d1676
+  metadata.gz: cb3716427be71e812ad14c3a4eaec24eabe2066f210aeff92a043e14577ed9279ed8ec223a1bdf454a23769f3ed98a88cf8572cb4d88bf4525a34824b98c91b5
+  data.tar.gz: cb5d9e1c63d95e601ef50e9cae053180e0c7a8f8f47a198c206ed07b44d41c45165e16e963e43ec722db2a8ba3210b673d563c6232cf7fd13df76d2e54e4345a

data/example/example.rb

@@ -3,10 +3,15 @@ require 'botinsta'
 bot = Botinsta.new ({ username: 'YOUR_USERNAME',
                       password: 'YOUR_PASSWORD',
                       tags:              ['photography','vsco','b&w'],
-                      likes_per_tag:     60,
                       tag_blacklist:     ['nsfw','sexy','hot'],
+                      likes_per_tag:     60,
                       unfollows_per_run: 200,
-                      follows_per_tag:   10
+                      follows_per_tag:   10,
+                      unfollow_threshold:  { seconds: 0,
+                                             minutes: 0,
+                                             hours:   1,
+                                             days:    0
+                      }
 })
 
 bot.start

data/lib/botinsta.rb

@@ -5,6 +5,8 @@ require 'mechanize'
 require 'sequel'
 require 'sqlite3'
 require 'nokogiri'
+require 'rb-readline'
+require 'pry'
 
 require_relative 'botinsta/class_methods'
 
@@ -14,26 +16,32 @@ class Botinsta
 
   include ClassMethods
 
-  DEFAULT_PARAMETERS = { tags:              %w[photography fotografia vsco],
-                         tag_blacklist:     %w[nsfw hot sexy],
-                         user_blacklist:    [],
-                         likes_per_tag:     10,
-                         unfollows_per_run: 200,
-                         follows_per_tag:   50
+  DEFAULT_PARAMETERS = { tags:                %w[photography fotografia vsco],
+                         tag_blacklist:       %w[nsfw hot sexy],
+                         user_blacklist:      [],
+                         likes_per_tag:       10,
+                         follows_per_tag:     50,
+                         unfollows_per_run:   200,
+                         unfollow_threshold:  { seconds: 0,
+                                                minutes: 0,
+                                                hours:   1,
+                                                days:    0
+                         }
   }.freeze
 
   def initialize(**params)
 
     params = DEFAULT_PARAMETERS.merge(params)
 
-    @username           = params[:username]
-    @password           = params[:password]
-    @tags               = params[:tags]
-    @tag_blacklist      = params[:tag_blacklist]
-    @user_blacklist     = params[:user_blacklist]
-    @likes_per_tag      = params[:likes_per_tag]
-    @follows_per_tag    = params[:follows_per_tag]
-    @unfollows_per_run  = params[:unfollows_per_run]
+    @username             = params[:username]
+    @password             = params[:password]
+    @tags                 = params[:tags]
+    @tag_blacklist        = params[:tag_blacklist]
+    @user_blacklist       = params[:user_blacklist]
+    @likes_per_tag        = params[:likes_per_tag]
+    @follows_per_tag      = params[:follows_per_tag]
+    @unfollows_per_run    = params[:unfollows_per_run]
+    @unfollow_threshold   = params[:unfollow_threshold]
 
     @total_likes        = 0
     @total_follows      = 0

data/lib/botinsta/class_methods.rb

@@ -8,7 +8,8 @@ require_relative 'modes'
 require_relative 'pages'
 require_relative 'requests'
 
-
+# This is just a wrap up module
+# for other modules and classes. To include them all at once!
 module ClassMethods
 
   include Actions

data/lib/botinsta/data/media_data.rb

@@ -11,7 +11,7 @@ class MediaData
     @is_video           = data.deep_find('is_video')
     @comments_disabled  = data.deep_find('comments_disabled')
     @text               = data.deep_find('text')
-    @tags               = @text.scan(/#[a-zA-Z0-9]+/)
+    @tags               = @text.nil? ? [] : @text.scan(/#[a-zA-Z0-9]+/)
     @shortcode          = data.deep_find('shortcode')
 
   end

data/lib/botinsta/helpers.rb

@@ -145,12 +145,19 @@ module Helpers
     @table_follows.where(user_id: user_id).delete
   end
 
-  # Calculates if a day is past since the first follow entry in the database.
+  # Calculates whether the given threshold is past or not to
+  # start unfollowing users from the database.
   #
   # @param last_time [Time] a Time instance, used with @last_follow_time.
   # @return [Boolean] true if a day is past since
   #   the first follow entry in the database, false otherwise.
-  def one_day_past?(last_time)
-    ((Time.now - last_time) / 86_400) >= 1
+  def unfollow_threshold_past?(last_time)
+    days    = @unfollow_threshold[:days]    ||= 0
+    hours   = @unfollow_threshold[:hours]   ||= 0
+    minutes = @unfollow_threshold[:minutes] ||= 0
+    seconds = @unfollow_threshold[:seconds] ||= 0
+
+    total_in_seconds = days * 86_400 + hours * 3600 + minutes * 60 + seconds
+    ((Time.now - last_time) / total_in_seconds) >= 1
   end
 end

data/lib/botinsta/modes.rb

@@ -17,7 +17,7 @@ module Modes
           get_first_page_data(tag)
           is_first_page = false
           break if @page.medias_empty?
-        elsif like_count == @page.media_count && @page.has_next_page?
+        elsif @page.next_page?
           get_next_page_data(tag)
         end
         @page.medias.each do |media|
@@ -45,7 +45,7 @@ module Modes
           end
 
           # Here is the code for unfollowing users
-          if !@table_follows.empty? && one_day_past?(@last_follow_time) && @total_unfollows != @unfollows_per_run
+          if !@table_follows.empty? && unfollow_threshold_past?(@last_follow_time) && @total_unfollows != @unfollows_per_run
             if unfollow_user(@first_db_entry[:user_id])
               @total_unfollows += 1
               print_success_message(action: :unfollow, number: @total_unfollows,

data/lib/botinsta/pages.rb

@@ -50,7 +50,7 @@ module Pages
   # @param (see #set_query_id)
   def get_next_page_data(tag)
     print_time_stamp
-    puts 'Getting the next page for the tag '.colorize(:red) + "#{tag}"
+    puts 'Getting the next page for the tag '.colorize(:blue) + "#{tag}"
     next_page_link =  "https://www.instagram.com/graphql/query/?query_hash=#{@query_id}&"\
                       "variables={\"tag_name\":\"#{tag}\"," \
                       "\"first\":10,\"after\":\"#{@page.end_cursor}\"}"

data/lib/botinsta/version.rb

@@ -1,3 +1,3 @@
 class Botinsta
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botinsta
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - andreyuhai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize