access_token

Author: vlddm

src/constants.py

@@ -2,9 +2,7 @@
 
 from __future__ import unicode_literals
 
-VK_PUBLIC_WALL_URL = 'https://api.vk.com/method/wall.get?domain={0}&count=10&v=5.53&access_token=4a53b9544a53b9544a53b9546b4a310f4144a534a53b95410bfd115ea469a861df8c613'
-
-VK_PRIVATE_WALL_URL = 'https://api.vk.com/method/wall.get?domain={0}&count=10&access_token={2}&v=5.53'
+VK_WALL_URL = 'https://api.vk.com/method/wall.get?domain={0}&count=10&access_token={1}&v=5.53'
 
 VK_POST_URL = 'https://vk.com/{0}?w=wall{1}_{2}'
 

src/vk_fetcher.py

@@ -10,18 +10,13 @@
 logger = logging.getLogger('vk_fetcher')
 
 
-def fetch(public_walls, private_walls, last_fetch_time, access_token):
+def fetch(public_walls, last_fetch_time, access_token):
     logger.debug('fetch(%s, %s)', public_walls, last_fetch_time)
 
     posts = []
 
     if public_walls is not None:
         for wall in public_walls:
-            posts.extend(_get_wall_posts(wall, last_fetch_time, None))
-            time.sleep(1)
-
-    if private_walls is not None:
-        for wall in private_walls:
             posts.extend(_get_wall_posts(wall, last_fetch_time, access_token))
             time.sleep(1)
 
@@ -31,8 +26,7 @@ def _get_wall_posts(wall, last_fetch_time, access_token):
     logger.debug('_get_wall_posts(%s, %s)', wall, last_fetch_time)
 
     new_posts = []
-    url = constants.VK_PUBLIC_WALL_URL.format(wall) if access_token is None \
-        else constants.VK_PRIVATE_WALL_URL.format(wall, access_token)
+    url = constants.VK_WALL_URL.format(wall, access_token) 
 
     requests_ok = False
     for num in range(1,5):

src/vk_to_telegram.py

@@ -18,11 +18,10 @@ def _read_config(config_file):
     config_json = json.loads(open(config_file).read())
 
     public_walls = config_json['public_walls'] if 'public_walls' in config_json else None
-    private_walls = config_json['private_walls'] if 'private_walls' in config_json else None
     bot_token = config_json['telegram_bot_token']
     user_ids = config_json['user_ids']
     access_token = config_json['vk_access_token'] if 'vk_access_token' in config_json else None
-    return public_walls, private_walls, bot_token, user_ids, access_token
+    return public_walls, bot_token, user_ids, access_token
 
 
 def main(argv):
@@ -45,7 +44,7 @@ def main(argv):
     config_file = realpath(args[0])
 
     logfile = config_file.replace('json', 'log')
-    logging.basicConfig(format='%(asctime)s %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s', datefmt='%m/%d/%Y %H:%M:%S %Z', filename=logfile, level=logging.INFO)
+    logging.basicConfig(format='%(asctime)s %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s', datefmt='%m/%d/%Y %H:%M:%S %Z', filename=logfile, level=logging.WARNING)
     logger = logging.getLogger('vk_to_telegram')
     storagefile = config_file.replace('json', 'last_check')
 
@@ -67,10 +66,10 @@ def main(argv):
 
     try:
 
-        public_walls, private_walls, bot_token, user_ids, access_token = _read_config(config_file)
+        public_walls, bot_token, user_ids, access_token = _read_config(config_file)
         while True:
             fetch_time = int(time.time())
-            posts = vk_fetcher.fetch(public_walls, private_walls, last_fetch_time, access_token)
+            posts = vk_fetcher.fetch(public_walls, last_fetch_time, access_token)
             last_fetch_time = fetch_time
             with open(storagefile, "w") as text_file:
                     text_file.write(str(fetch_time) + "\n")