def update_reason(reason: str, blocker: str, blocked: str, block_level: str):
logger.debug("reason='%s',blocker='%s',blocked='%s',block_level='%s' - CALLED!", reason, blocker, blocked, block_level)
if not isinstance(reason, str) and reason is not None:
- raise ValueError(f"Parameter reason[]='{type(reason)}' is not 'str'")
+ raise ValueError(f"Parameter reason[]='{type(reason)}' is not of type 'str'")
elif not isinstance(blocker, str):
- raise ValueError(f"Parameter blocker[]='{type(blocker)}' is not 'str'")
+ raise ValueError(f"Parameter blocker[]='{type(blocker)}' is not of type 'str'")
elif blocker == "":
raise ValueError("Parameter 'blocker' is empty")
elif blocker.lower() != blocker:
raise ValueError(f"Parameter blocker='{blocker}' must be all lower-case")
elif not isinstance(blocked, str):
- raise ValueError(f"Parameter blocked[]='{type(blocked)}' is not 'str'")
+ raise ValueError(f"Parameter blocked[]='{type(blocked)}' is not of type 'str'")
elif blocked == "":
raise ValueError("Parameter 'blocked' is empty")
elif blocked.lower() != blocked:
raise ValueError(f"Parameter blocked='{blocked}' must be all lower-case")
elif not isinstance(block_level, str):
- raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not 'str'")
+ raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not of type 'str'")
elif block_level == "":
raise ValueError("Parameter 'block_level' is empty")
- elif block_level == "accept":
- raise ValueError("Accepted domains are not wanted here")
+ elif block_level in ["accept", "suspend", "silence", "nsfw", "quarantined_instances"]:
+ raise ValueError(f"block_level='{block_level}' is not wanted.")
logger.debug("Updating block reason='%s',blocker='%s',blocked='%s',block_level='%s'", reason, blocker, blocked, block_level)
database.cursor.execute(
def update_last_seen(blocker: str, blocked: str, block_level: str):
logger.debug("blocker='%s',blocked='%s',block_level='%s' - CALLED!", blocker, blocked, block_level)
if not isinstance(blocker, str):
- raise ValueError(f"Parameter blocker[]='{type(blocker)}' is not 'str'")
+ raise ValueError(f"Parameter blocker[]='{type(blocker)}' is not of type 'str'")
elif blocker == "":
raise ValueError("Parameter 'blocker' is empty")
elif blocker.lower() != blocker:
raise ValueError(f"Parameter blocker='{blocker}' must be all lower-case")
elif not isinstance(blocked, str):
- raise ValueError(f"Parameter blocked[]='{type(blocked)}' is not 'str'")
+ raise ValueError(f"Parameter blocked[]='{type(blocked)}' is not of type 'str'")
elif blocked == "":
raise ValueError("Parameter 'blocked' is empty")
elif blocked.lower() != blocked:
raise ValueError(f"Parameter blocked='{blocked}' must be all lower-case")
elif not isinstance(block_level, str):
- raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not 'str'")
+ raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not of type 'str'")
elif block_level == "":
raise ValueError("Parameter 'block_level' is empty")
- elif block_level == "accept":
- raise ValueError("Accepted domains are not wanted here")
+ elif block_level in ["accept", "suspend", "silence", "nsfw", "quarantined_instances"]:
+ raise ValueError(f"blocked='{blocked}' has unwanted block_level='{block_level}'")
database.cursor.execute(
"UPDATE blocks SET last_seen = ? WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
logger.debug("EXIT!")
-def is_instance_blocked(blocker: str, blocked: str, block_level: str) -> bool:
+def is_instance_blocked(blocker: str, blocked: str, block_level: str = None) -> bool:
logger.debug("blocker='%s',blocked='%s',block_level='%s' - CALLED!", blocker, blocked, block_level)
if not isinstance(blocker, str):
raise ValueError(f"Parameter blocker[]='{type(blocker)}' is not of type 'str'")
raise ValueError("Parameter 'blocked' is empty")
elif blocked.lower() != blocked:
raise ValueError(f"Parameter blocked='{blocked}' must be all lower-case")
- elif not isinstance(block_level, str):
+ elif not isinstance(block_level, str) and block_level is not None:
raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not of type 'str'")
elif block_level == "":
raise ValueError("Parameter 'block_level' is empty")
- elif block_level == "accept":
- raise ValueError("Accepted domains are not wanted here")
-
- database.cursor.execute(
- "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
- (
- blocker,
- blocked,
- block_level
- ),
- )
+ elif block_level in ["accept", "suspend", "silence", "nsfw", "quarantined_instances"]:
+ raise ValueError(f"blocked='{blocked}' has unwanted block_level='{block_level}'")
+
+ if block_level is None:
+ database.cursor.execute(
+ "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? LIMIT 1",
+ [
+ blocker,
+ blocked
+ ]
+ )
+ else:
+ database.cursor.execute(
+ "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
+ [
+ blocker,
+ blocked,
+ block_level
+ ]
+ )
is_blocked = database.cursor.fetchone() is not None
raise Exception(f"blocker='{blocker}' is blacklisted but function invoked")
elif blacklist.is_blacklisted(blocked):
raise Exception(f"blocked='{blocked}' is blacklisted but function invoked")
- elif block_level == "accept":
- raise ValueError("Accepted domains are not wanted here")
+ elif block_level in ["accept", "suspend", "silence", "nsfw", "quarantined_instances"]:
+ raise ValueError(f"blocked='{blocked}' has unwanted block_level='{block_level}'")
if reason is not None:
# Maybe needs cleaning
])
logger.debug("EXIT!")
+
+def valid(value: str, column: str) -> bool:
+ logger.debug("value='%s' - CALLED!", value)
+ if not isinstance(value, str):
+ raise ValueError(f"Parameter value[]='{type(value)}' is not of type 'str'")
+ elif value == "":
+ raise ValueError("Parameter 'value' is empty")
+ elif not isinstance(column, str):
+ raise ValueError(f"Parameter column[]='{type(column)}' is not of type 'str'")
+ elif column == "":
+ raise ValueError("Parameter 'column' is empty")
+
+ # Query database
+ database.cursor.execute(
+ f"SELECT {column} FROM blocks WHERE {column} = ? LIMIT 1", [value]
+ )
+
+ is_valid = database.cursor.fetchone() is not None
+
+ logger.debug("is_valid='%s' - EXIT!", is_valid)
+ return is_valid
+
+def translate_idnas(rows: list, column: str):
+ logger.debug("rows[]='%s' - CALLED!", type(rows))
+ if not isinstance(rows, list):
+ raise ValueError(f"rows[]='{type(rows)}' is not of type 'list'")
+ elif len(rows) == 0:
+ raise ValueError("Parameter 'rows' is an empty list")
+ elif not isinstance(column, str):
+ raise ValueError(f"column='{type(column)}' is not of type 'str'")
+ elif column == "":
+ raise ValueError("Parameter 'column' is empty")
+ elif column not in ["blocker", "blocked"]:
+ raise ValueError(f"column='{column}' is not supported")
+
+ logger.info("Checking/converting %d domain names ...", len(rows))
+ for row in rows:
+ logger.debug("row[]='%s'", type(row))
+
+ translated = row[column].encode("idna").decode("utf-8")
+ logger.debug("translated='%s',row[%s]='%s'", translated, column, row[column])
+
+ if translated != row[column]:
+ logger.info("Translated row[%s]='%s' to '%s'", column, row[column], translated)
+ database.cursor.execute(f"UPDATE blocks SET {column} = ? WHERE {column} = ?", [translated, row[column]])
+
+ logger.debug("Invoking commit() ...")
+ database.connection.commit()
+
+ logger.debug("EXIT!")
+
+def alias_block_level(block_level: str) -> str:
+ logger.debug("block_level='%s' - CALLED!", block_level)
+ if not isinstance(block_level, str):
+ raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not of type 'str'")
+ elif block_level == "":
+ raise ValueError("Parameter 'block_level' is empty")
+
+ if block_level == "silence":
+ logger.debug("Block level 'silence' has been changed to 'silenced'")
+ block_level = "silenced"
+ elif block_level == "suspend":
+ logger.debug("Block level 'suspend' has been changed to 'suspended'")
+ block_level = "suspended"
+ elif block_level == "nsfw":
+ logger.debug("Block level 'nsfw' has been changed to 'media_nsfw'")
+ block_level = "media_nsfw"
+ elif block_level == "quarantined_instances":
+ logger.debug("Block level 'quarantined_instances' has been changed to 'quarantined'")
+ block_level = "quarantined"
+
+ logger.debug("block_level='%s' - EXIT!", block_level)
+ return block_level
projects / fba.git / blobdiff