Merge branch 'main' into tapd-added

maigret/resources/data.json

@@ -118,6 +118,7 @@
             "usernameUnclaimed": "noonewouldeverusethis7"
         },
         "24open": {
+            "disabled": true,
             "tags": [
                 "dating",
                 "ru",
@@ -609,8 +610,13 @@
             ],
             "regexCheck": "^[^\\.]+$",
             "checkType": "message",
-            "absenceStrs": "Leaderboard",
-            "alexaRank": 4875,
+            "presenseStrs": [
+                "Profile"
+            ],
+            "absenceStrs": [
+                "You are being"
+            ],
+            "alexaRank": 5317,
             "url": "https://www.alltrails.com/members/{username}",
             "urlMain": "https://www.alltrails.com/",
             "usernameClaimed": "blue",
@@ -10197,8 +10203,10 @@
                 "ru"
             ],
             "checkType": "message",
-            "absenceStrs": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d \u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u0434\u043b\u044f \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430.",
-            "alexaRank": 419265,
+            "absenceStrs": [
+                "\u0417\u0430\u043f\u0440\u0430\u0448\u0438\u0432\u0430\u0435\u043c\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442"
+            ],
+            "alexaRank": 427429,
             "url": "https://www.prizyvnik.info/members/?username={username}",
             "urlMain": "https://www.prizyvnik.info",
             "usernameClaimed": "blue",
@@ -12141,7 +12149,7 @@
                 "us"
             ],
             "headers": {
-                "authorization": "Bearer BQBi0R02vlk96QfQoocy9k3T2JR8c3MOBEoh50OJsM0018HDphfsClmHbTBG2QyQuHiqJ00nqSXN6C4zo3g"
+                "authorization": "Bearer BQC38O_gP1qY7X8Ui7RsgyutAuZ2QissgeFgsDEX6siaE_dAFmzV0mWMSziGB_dLErQwtfJZa7qM9IsmNHI"
             },
             "errors": {
                 "Spotify is currently not available in your country.": "Access denied in your country, use proxy/vpn"
@@ -13952,6 +13960,7 @@
             "usernameUnclaimed": "noonewouldeverusethis7"
         },
         "Volgogradru": {
+            "disabled": true,
             "tags": [
                 "ru"
             ],

maigret/submit.py

@@ -183,12 +183,15 @@ async def submit_dialog(db, url_exists, cookie_file):
 
     # check for existence
     matched_sites = list(filter(lambda x: domain_raw in x.url_main + x.url, db.sites))
+
     if matched_sites:
         print(f'Sites with domain "{domain_raw}" already exists in the Maigret database!')
         status = lambda s: '(disabled)' if s.disabled else ''
         url_block = lambda s: f'\n\t{s.url_main}\n\t{s.url}'
         print('\n'.join([f'{site.name} {status(site)}{url_block(site)}' for site in matched_sites]))
-        return False
+
+        if input(f'Do you want to continue? [yN] ').lower() in 'n':
+            return False
 
     url_mainpage = extract_mainpage_url(url_exists)