]> git.mxchange.org Git - fba.git/blobdiff - fba/networks/pleroma.py
projects / fba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Continued:
[fba.git] / fba / networks / pleroma.py
diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index c2481ce82a53d3de892cb9ed490408e7728f9c52..0d2960429066af06a8c1f987eb26b81a1f11e1ea 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -113,29 +113,29 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                         logger.debug("blocked='%s' is a fake domain - SKIPPED!", blocked)
                         continue
                     elif blocked.count("*") > 0:
-                        logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                        instances.set_has_obfucation(domain, True)
+                        logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                        instances.set_has_obfuscation(domain, True)
 
                         # Obscured domain name with no hash
-                        row = instances.deobfucate("*", blocked)
+                        row = instances.deobfuscate("*", blocked)
 
                         logger.debug("row[]='%s'", type(row))
                         if row is None:
-                            logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                            logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                             continue
 
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                         blocked = row[0]
                     elif blocked.count("?") > 0:
-                        logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                        instances.set_has_obfucation(domain, True)
+                        logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                        instances.set_has_obfuscation(domain, True)
 
                         # Obscured domain name with no hash
-                        row = instances.deobfucate("?", blocked)
+                        row = instances.deobfuscate("?", blocked)
 
                         logger.debug("row[]='%s'", type(row))
                         if row is None:
-                            logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                            logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                             continue
 
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
@@ -174,35 +174,35 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                 logger.debug("blocked='%s' is a fake domain - SKIPPED!", blocked)
                 continue
             elif blocked.count("*") > 0:
-                logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                instances.set_has_obfucation(domain, True)
+                logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                instances.set_has_obfuscation(domain, True)
 
                 # Obscured domain name with no hash
-                row = instances.deobfucate("*", blocked)
+                row = instances.deobfuscate("*", blocked)
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                    logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                 blocked = row[0]
             elif blocked.count("?") > 0:
-                logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                instances.set_has_obfucation(domain, True)
+                logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                instances.set_has_obfuscation(domain, True)
 
                 # Obscured domain name with no hash
-                row = instances.deobfucate("?", blocked)
+                row = instances.deobfuscate("?", blocked)
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                    logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                 blocked = row[0]
 
-            logger.debug("blocked='%s' - DEOBFUCATED!", blocked)
+            logger.debug("blocked='%s' - DEobfuscatED!", blocked)
             if not utils.is_domain_wanted(blocked):
                 logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                 continue
@@ -263,35 +263,35 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                     logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                     continue
                 elif blocked.count("*") > 0:
-                    logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                    instances.set_has_obfucation(domain, True)
+                    logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                    instances.set_has_obfuscation(domain, True)
 
                     # Obscured domain name with no hash
-                    row = instances.deobfucate("*", blocked)
+                    row = instances.deobfuscate("*", blocked)
 
                     logger.debug("row[]='%s'", type(row))
                     if row is None:
-                        logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                        logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                         continue
 
                     logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                     blocked = row[0]
                 elif blocked.count("?") > 0:
-                    logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                    instances.set_has_obfucation(domain, True)
+                    logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                    instances.set_has_obfuscation(domain, True)
 
                     # Obscured domain name with no hash
-                    row = instances.deobfucate("?", blocked)
+                    row = instances.deobfuscate("?", blocked)
 
                     logger.debug("row[]='%s'", type(row))
                     if row is None:
-                        logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                        logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                         continue
 
                     logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                     blocked = row[0]
 
-                logger.debug("blocked='%s' - DEOBFUCATED!", blocked)
+                logger.debug("blocked='%s' - DEobfuscatED!", blocked)
                 if not utils.is_domain_wanted(blocked):
                     logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                     continue
@@ -326,29 +326,29 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                 logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                 continue
             elif blocked.count("*") > 0:
-                logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                instances.set_has_obfucation(domain, True)
+                logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                instances.set_has_obfuscation(domain, True)
 
                 # Obscured domain name with no hash
-                row = instances.deobfucate("*", blocked)
+                row = instances.deobfuscate("*", blocked)
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                    logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                 blocked = row[0]
             elif blocked.count("?") > 0:
-                logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                instances.set_has_obfucation(domain, True)
+                logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                instances.set_has_obfuscation(domain, True)
 
                 # Obscured domain name with no hash
-                row = instances.deobfucate("?", blocked)
+                row = instances.deobfuscate("?", blocked)
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                    logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
@@ -390,35 +390,35 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                         logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                         continue
                     elif blocked.count("*") > 0:
-                        logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                        instances.set_has_obfucation(domain, True)
+                        logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                        instances.set_has_obfuscation(domain, True)
 
                         # Obscured domain name with no hash
-                        row = instances.deobfucate("*", blocked)
+                        row = instances.deobfuscate("*", blocked)
 
                         logger.debug("row[]='%s'", type(row))
                         if row is None:
-                            logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                            logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                             continue
 
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                         blocked = row[0]
                     elif blocked.count("?") > 0:
-                        logger.debug("domain='%s' uses obfucated domains, marking ...", domain)
-                        instances.set_has_obfucation(domain, True)
+                        logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
+                        instances.set_has_obfuscation(domain, True)
 
                         # Obscured domain name with no hash
-                        row = instances.deobfucate("?", blocked)
+                        row = instances.deobfuscate("?", blocked)
 
                         logger.debug("row[]='%s'", type(row))
                         if row is None:
-                            logger.warning("Cannot deobfucate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
+                            logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
                             continue
 
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                         blocked = row[0]
 
-                    logger.debug("blocked='%s' - DEOBFUCATED!", blocked)
+                    logger.debug("blocked='%s' - DEobfuscatED!", blocked)
                     if not utils.is_domain_wanted(blocked):
                         logger.warning("blocked='%s' is not wanted - SKIPPED!", blocked)
                         continue
Personal clone of "fedi-block-api", if you like to use the command fetch_instances_social you need to get an API key from https://instances.social .