src/fedi_api.py

@@ -1,5 +1,6 @@
 from config import instance
 import time
+import json
 import requests
 from loguru import logger
 
@@ -34,6 +35,7 @@ def get_notifications():
             logger.info('Retrying get notificatios...')
 
 
+
 def mark_as_read_notification(id_notification):
     success = 0
     while success == 0:
@@ -49,7 +51,6 @@ def mark_as_read_notification(id_notification):
 
 
 def get_status_context(status_id):
-    retry = 0
     success = 0
     while success == 0:
         try:
@@ -57,13 +58,10 @@ def get_status_context(status_id):
             r.raise_for_status()
             success = 1
             return r.json()
-        except Exception as E:
+        except:
             logger.exception(f'Ошибка получения контекста треда {status_id}')
             time.sleep(30)
             logger.info('Повторный запрос треда...')
-            retry += 1
-            if retry > 5:
-                raise IOError(f'Фетчинг треда поломан! {E}')
         
 
 def get_status(status_id):
@@ -80,6 +78,7 @@ def get_status(status_id):
             logger.info(f'Retrying get status {status_id}')
 
 
+
 def post_status(text, reply_to_status_id=None, poll_options=None, poll_expires=345600, attachments=None):
     poll = None
     if poll_options is not None:
@@ -137,3 +136,4 @@ def mute_user(acct_id=str, acct=str, duration=None):
             logger.exception(f'Ошибка глушения {acct}')
             time.sleep(5)
             logger.info(f'Повторное глушение {acct}...')
+

src/fmn_database.py

@@ -113,3 +113,4 @@ def reset_poll():
     '''Сброс содержимого предложки-опроса'''
     c.execute("DELETE FROM poll")
     conn.commit()
+

src/fmn_poll.py

@@ -108,3 +108,4 @@ def create_tie_breaker(count_tie=1):
     else:
         poll_expires = 4*60*60
     tie_poll = create_poll_movies("TIE BREAKER!!!\n\nВыбираем из победителей!", poll_expires)
+

src/fmn_states_db.py

@@ -3,7 +3,6 @@ from loguru import logger
 
 states_file = 'fmn_states.json'
 
-
 class states_stor:
     states = None
 

src/listener_context.py

@@ -3,10 +3,13 @@ from src.fedi_api import get_status_context, get_status, post_status, mute_user
 from src.kinopoisk_api import get_kinopoisk_movie_to_imdb
 from src.imdb_datasets_worker import get_title_by_id
 from src.fmn_database import add_movie_to_poll, get_already_watched, get_suggested_movies_count
-from src.fmn_states_db import states_stor
+from src.fmn_states_db import states_stor, write_states
 from src.fmn_poll import create_poll_movies, get_winner_movie
 import re
 import time
+from datetime import datetime
+from dateutil.parser import parse as dateutilparse
+from dateutil.relativedelta import relativedelta, TU
 from collections import Counter
 from loguru import logger
 
@@ -55,7 +58,7 @@ def scan_context_thread():
         else:
             endings = int(stop_thread_scan) - time_now
             logger.debug(f'Осталось до закрытия сбора: {endings}')
-        if reserve_time:  # Reduce instance load
+        if reserve_time: # Reduce instance load
             time.sleep(30)
         get_thread_time = time.time()
         descendants = get_status_context(status_id)['descendants']
@@ -69,10 +72,6 @@ def scan_context_thread():
 
         for status in descendants:
             id_st = status['id']
-            visibility = status['visibility']
-            if visibility == 'direct':
-                # Игнорируем личку
-                continue
             in_reply_acct = status['in_reply_to_account_id']
             in_reply_id = status['in_reply_to_id']
             muted = status['muted']
@@ -80,14 +79,14 @@ def scan_context_thread():
             acct_id = status['account']['id']
             content = status['pleroma']['content']['text/plain']
 
-            if id_st in replyed:  # Игнорировать уже отвеченное
+            if id_st in replyed: # Игнорировать уже отвеченное
                 continue
             if muted is True:
                 continue
-            if fail_limit[acct] >= max_fail_limit:  # Игнорировать пользователя если он превысил fail limit
+            if fail_limit[acct] >= max_fail_limit: # Игнорировать пользователя если он превысил fail limit
                 mute_user(acct_id, acct, int(states.get('max_mute_time')) - time_now)
                 logger.warning(f'{acct} игнорируется - превышение fail limit')
-                break  # Нужно обновить тред, чтобы muted на заглушенном стал True
+                break # Нужно обновить тред, чтобы muted на заглушенном стал True
 
             parsed_result = parse_links(content)
             parsed_result_imdb = parse_links_imdb(content)
@@ -108,10 +107,6 @@ def scan_context_thread():
 
             message_writer = []
             success = False
-            if parsed_result and parsed_result_imdb:
-                post_status('❌ Не смешивайте IMDB и кинопоиск в одном посте, пожалуйста.', id_st)
-                fail_limit[acct] += 1
-                continue
             if parsed_result is not None:
                 print(parsed_result)
                 suggested_movies = get_kinopoisk_movie_to_imdb(parsed_result)
@@ -128,6 +123,7 @@ def scan_context_thread():
                     fail_limit[acct] += 1
                     continue
 
+
             for movie in suggested_movies:
                 logger.debug(str(movie))
                 if movie[index_type] == "404":
@@ -159,7 +155,7 @@ def scan_context_thread():
                         fail_limit[acct] += 1
                         break
                         
-                    if get_already_watched(name, name_ru, year) is True:
+                    if get_already_watched(name, name_ru, year) == True:
                         message_writer.append(f"ℹ️ Этот фильм уже был на FMN: {movie_string}")
                         logger.info(f'Попытка предложить уже просмотренный фильм: {acct} {name} {name_ru} {year}')
                         fail_limit[acct] += 1
@@ -185,3 +181,5 @@ def scan_context_thread():
                 post_status('\n'.join(message_writer) + message, id_st)
 
         time.sleep(30)
+
+

src/listener_mention.py

@@ -2,8 +2,7 @@ from src.fedi_api import get_notifications, mark_as_read_notification, post_stat
 from src.fmn_states_db import write_states, states_stor
 from config import admins_bot, limit_movies_per_user, limit_all_movies_poll, hour_poll_posting, fmn_next_watching_hour
 
-import threading
+import threading, time
-import time
 from datetime import datetime
 from dateutil.parser import parse as dateutilparse
 from dateutil.relativedelta import relativedelta, TU, SU
@@ -20,8 +19,7 @@ def get_control_mention():
         now_hour = time_now.hour
         if now_week not in (0, 6):
             continue
-        if now_week == 6 and now_hour < fmn_next_watching_hour:
+        if now_week == 6 and now_hour < fmn_next_watching_hour: # Предотвращение работы в холстую до начала сеанса
-            # Предотвращение работы в холстую до начала сеанса
             continue
         post_exists = states.get('last_thread_id')
         if post_exists:
@@ -34,7 +32,7 @@ def get_control_mention():
             seen = i['pleroma']['is_seen']
             acct_mention = i['account']['acct']
             reply_to_id = i['status']['in_reply_to_id']
-            if acct_mention in admins_bot and seen is False and reply_to_id is None and now_week in (0, 6):
+            if acct_mention in admins_bot and seen == False and reply_to_id == None and now_week in (0, 6):
                 logger.success(f'Найдено упоминание от {acct_mention}')
                 st_id = i['status']['id']
                 st_date = i['status']['created_at']
@@ -85,7 +83,7 @@ def start_collect_movies_text(movies_accept_time=str, next_movie_watching=str):
     '''.replace('\t', '')
     return text
 
-
 def run_scan_notif():
     scan_notif = threading.Thread(target=get_control_mention, daemon=True)
     scan_notif.start()
+