From b4e84dda6eb47485959ac9bb85771d23bf8ebbc0 Mon Sep 17 00:00:00 2001 From: bashrc Date: Fri, 7 Aug 2026 13:02:58 +0100 Subject: [PATCH] Remove colons from nicknames --- src/utils.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/utils.py b/src/utils.py index 980b647d2..a7b994331 100644 --- a/src/utils.py +++ b/src/utils.py @@ -1462,19 +1462,31 @@ def get_nickname_from_actor(actor: str) -> str: continue nick_str: str = actor.split(possible_path)[1].replace('@', '') if '/' not in nick_str: - return _remove_did_prefix(nick_str) + nick_str = _remove_did_prefix(nick_str) + if ':' in nick_str: + nick_str = nick_str.split(':')[0] + return nick_str nick_str = nick_str.split('/')[0] - return _remove_did_prefix(nick_str) + nick_str = _remove_did_prefix(nick_str) + if ':' in nick_str: + nick_str = nick_str.split(':')[0] + return nick_str if '/@/' not in actor: if '/@' in actor: # https://domain/@nick nick_str: str = actor.split('/@')[1] if '/' in nick_str: nick_str = nick_str.split('/')[0] - return _remove_did_prefix(nick_str) + nick_str = _remove_did_prefix(nick_str) + if ':' in nick_str: + nick_str = nick_str.split(':')[0] + return nick_str if '@' in actor: nick_str: str = actor.split('@')[0] - return _remove_did_prefix(nick_str) + nick_str = _remove_did_prefix(nick_str) + if ':' in nick_str: + nick_str = nick_str.split(':')[0] + return nick_str if '://' in actor: domain: str = actor.split('://')[1] if '/' in domain: @@ -1484,7 +1496,10 @@ def get_nickname_from_actor(actor: str) -> str: nick_str: str = actor.split('://' + domain + '/')[1] if '/' in nick_str or '.' in nick_str: return None - return _remove_did_prefix(nick_str) + nick_str = _remove_did_prefix(nick_str) + if ':' in nick_str: + nick_str = nick_str.split(':')[0] + return nick_str return None