Following functionality

.gitignore

@@ -0,0 +1,19 @@
+*.pyc
+
+# Configuration
+conf*.yml
+conf*.yaml
+
+# Logging
+*.log
+log.log.*
+
+#virtualenv
+/bin/
+/include/
+/lib/
+/pip-selfcheck.json
+/share/
+instabotenv/
+db_data/
+

Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.6
+MAINTAINER Pyotr Ermishkin <quasiyoke@gmail.com>
+
+COPY instabot /instabot/
+COPY docker-entrypoint.sh /
+COPY instabot_runner.py /
+COPY requirements.txt /
+
+VOLUME /configuration
+
+RUN pip install -r requirements.txt
+
+CMD ["/docker-entrypoint.sh"]

README.md

@@ -1,61 +1,97 @@
-InstaBot
-========
+# InstaBot
 
-NOTE BIG UPDATE ON FUCTIONALITY; PLEASE UPDATE YOUR WORKING COPY AND FOLLOW NEW INSTRUCTIONS!
+Instagram bot written in Python 3 that cycles through specified hashtags and automatically likes pictures with those hashtags to get more followers. The bot also follows people and unfollows them after specified period of time. Unfollowed people are saved in DB to prevent following them again. To find new people to follow it uses list of followers of people you have followed.
 
-A simple Instagram bot that pulls trending top 100 hashtags and auto likes pictures with those hashtags to get more followers.
+During installation process it saves people followed by you as "followed long time ago" and unfollows them at the first start.
 
-Developed in Python and built with the mechanize library
+The bot doesn't use Instagram API so all credentials you need are your login and password.
 
-STILL IN DEVELOPMENT, CONTRIBUTIONS ARE WELCOME
+## Deployment
 
-##Requirements
-
-1. Python is installed (Tested with version 2.6.8)
-2. mechanize library is installed [Mechanize download!](http://wwwsearch.sourceforge.net/mechanize/download.html) V0.2.5
-3. PyYAML libray is installed [PyYAML download!](pyyaml.org/wiki/PyYAML) V3.11
-4. Authenticated your instagram account on [websta.me](http://websta.me/)
-5. PycURL library installed [PycURL download!](http://pycurl.sourceforge.net/) V7.19.5
-6. Registered a client for your account on [instagram](http://instagram.com/developer/clients/manage/)
-
-##Setup
-Clone this repository:
-```
-git clone https://github.com/marclave/InstaBot.git
+```sh
+docker network create \
+    --subnet=172.21.0.0/24 \
+    instabot
+docker run \
+    --name=instabot-mysql \
+    --net=instabot \
+    --ip=172.21.0.2 \
+    --env="MYSQL_ROOT_PASSWORD=ZEbMKcFQppk8m8PR3b" \
+    --env="MYSQL_DATABASE=instabot" \
+    --env="MYSQL_USER=instabot" \
+    --env="MYSQL_PASSWORD=KbWj0Eua78YGLNLf3K" \
+    --volume=`pwd`/lib:/var/lib/mysql \
+    --detach \
+    mysql:5.7
+docker build --tag=instabot .
 ```
-Follow install instructions for PycURL: [instructions](PycURL Download.md)
 
-Go to [instagram clients](http://instagram.com/developer/clients/manage/)
-Register your account for a developers client
-Retrieve your CLIENT SECRET and USER ID token under "Manage Clients"
-To retrieve your access token, go to [instagram api console](http://instagram.com/developer/api-console/)
-Run a query involving your USER ID and grab your access token from the request
+Create MySQL DB:
 
-Note: Ensure likes are part of the access scope [enable likes scope](https://instagram.com/oauth/authorize/?client_id=INSERT_CLIENTID&redirect_uri=INSERT_REDIRECTURI&response_type=code&scope=likes+basic)
+```sql
+CREATE DATABASE IF NOT EXISTS instagram CHARACTER SET utf8 COLLATE utf8_general_ci;
+CREATE USER instabot@localhost IDENTIFIED BY 'GT8H!b]5,9}A7';
+GRANT ALL ON instagram.* TO instabot@localhost;
+```
 
+Create `configuration.yml` file containing your credentials, e.g.:
 
-Modify the profile to include your information, example:
-```
-CREDENTIALS:
-  ACCESS_TOKEN: "USER_ACCESS_TOKEN"
-  CLIENT_SECRET: "USER_CLIENT_SECRET"
-MAXLIKES: 1000 <- If you dont want a max, input NO_MAX
-PERHASHTAG: 10 <- If you dont want a max, input NO_MAX
-TOP: 1 <- To use the top hashtags on Websta.me use a 1
-IP: "USER_IP_ADDRESS" <- run ipconfig or ifconfig to grab your ip address
+```yaml
+credentials:
+  username: "your_username"
+  password: "eKeFB2;AW6fS}z"
+db:
+  host: "172.21.0.2"
+  name: "instabot"
+  user: "instabot"
+  password: "KbWj0Eua78YGLNLf3K"
+following_hours: 120
+hashtags:
+  - I
+  - люблю
+  - Python
+instagram:
+  limit_sleep_time_coefficient: 1.3
+  limit_sleep_time_min: 30
+  success_sleep_time_coefficient: 0.5
+  success_sleep_time_max: 6
+  success_sleep_time_min: 4
+logging:
+  version: 1
+  formatters:
+    simple:
+      class: logging.Formatter
+      format: "%(asctime)s - %(levelname)s - %(name)s - %(message)s"
+  handlers:
+    console:
+      class: logging.StreamHandler
+      level: DEBUG
+      formatter: simple
+  loggers:
+    instabot:
+      level: DEBUG
+  root:
+    level: DEBUG
+    handlers:
+      - console
+users_to_follow_cache_size: 300
 ```
-Note: If you do not put a 1 in the value of TOP then the program will look for a text file
-called hashtags.txt.
 
-The format for this file is to have each hashtag seperated by line, example:
+Where:
 
-```
-I
-Love
-Python
-```
+* `following_hours` — how long users will stay followed.
+* `hashtags` — list of hashtags to get photos to like. Optional. By default bot won't like anything.
+* `logging` — logging setup as described in [this howto](https://docs.python.org/3/howto/logging.html).
+* `users_to_follow_cache_size` — how much users should be fetched for following. The cache is being filled in once a minute. Optional. By default bot won't follow anybody.
 
-Then run:
-```
-python InstaBot.py
+Now you may run the bot:
+
+```sh
+docker run \
+    --name=instabot \
+    --net=instabot \
+    --ip=172.21.0.10 \
+    --volume=`pwd`/configuration:/configuration \
+    --detach \
+    instabot
 ```

docker-compose.yaml

@@ -0,0 +1,13 @@
+mysql:
+  image: mysql
+  ports:
+    - "3306:3306"
+  expose:
+     - "3306"
+  environment:
+    - MYSQL_ROOT_PASSWORD=instabotisgrate
+    - MYSQL_DATABASE=instagram
+    - MYSQL_USER=instabot
+    - MYSQL_PASSWORD=GT8H!b]5,9}A7
+  volumes:
+    - ./db_data:/var/lib/mysql

docker-entrypoint.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+/instabot_runner.py install /configuration/configuration.yml
+/instabot_runner.py /configuration/configuration.yml

instabot/__main__.py

@@ -0,0 +1,5 @@
+'''instabot.__main__: executed when instabot directory is called as script.'''
+
+from .instabot import main
+
+main()

instabot/configuration.py

@@ -0,0 +1,49 @@
+import logging
+import sys
+import yaml
+
+LOGGER = logging.getLogger('instabot.configuration')
+
+
+class Configuration:
+    def __init__(self, filename):
+        try:
+            with open(filename, 'r') as f:
+                configuration = yaml.safe_load(f)
+        except (IOError, OSError, ValueError) as e:
+            sys.exit('Can\'t obtain configuration: {}'.format(e))
+        try:
+            self.db_host = configuration['db']['host']
+            self.db_name = configuration['db']['name']
+            self.db_user = configuration['db']['user']
+            self.db_password = configuration['db']['password']
+            self.following_hours = configuration['following_hours']
+            self.instagram_limit_sleep_time_coefficient = \
+                configuration['instagram']['limit_sleep_time_coefficient']
+            self.instagram_limit_sleep_time_min = \
+                configuration['instagram']['limit_sleep_time_min']
+            self.instagram_success_sleep_time_coefficient = \
+                configuration['instagram']['success_sleep_time_coefficient']
+            self.instagram_success_sleep_time_max = \
+                configuration['instagram']['success_sleep_time_max']
+            self.instagram_success_sleep_time_min = \
+                configuration['instagram']['success_sleep_time_min']
+            self.instagram_username = configuration['credentials']['username']
+            self.instagram_password = configuration['credentials']['password']
+            self.logging = configuration['logging']
+        except (KeyError, TypeError) as e:
+            sys.exit(
+                'Configuration is not fully specified. {} is missed.'
+                .format(e),
+                )
+        self.hashtags = configuration.get('hashtags', [])
+        self.users_to_follow_cache_size = configuration.get(
+            'users_to_follow_cache_size',
+            0,
+            )
+        try:
+            self.following_hours = int(self.following_hours)
+            self.users_to_follow_cache_size = \
+                int(self.users_to_follow_cache_size)
+        except ValueError as e:
+            sys.exit('Some integer value is specified wrong: {}'.format(e))