mirror of https://gitlab.com/bashrc2/epicyon
Tidying
parent
1bdedf9146
commit
c855fbb034
15
src/utils.py
15
src/utils.py
|
|
@ -1474,23 +1474,19 @@ def get_nickname_from_actor(actor: str) -> str:
|
||||||
nick_str: str = actor.split(possible_path)[1].replace('@', '')
|
nick_str: str = actor.split(possible_path)[1].replace('@', '')
|
||||||
if '/' not in nick_str:
|
if '/' not in nick_str:
|
||||||
nick_str = _remove_did_prefix(nick_str)
|
nick_str = _remove_did_prefix(nick_str)
|
||||||
nick_str = _tidy_nickname(nick_str)
|
return _tidy_nickname(nick_str)
|
||||||
return nick_str
|
|
||||||
nick_str = nick_str.split('/')[0]
|
nick_str = nick_str.split('/')[0]
|
||||||
nick_str = _tidy_nickname(nick_str)
|
return _tidy_nickname(nick_str)
|
||||||
return nick_str
|
|
||||||
if '/@/' not in actor:
|
if '/@/' not in actor:
|
||||||
if '/@' in actor:
|
if '/@' in actor:
|
||||||
# https://domain/@nick
|
# https://domain/@nick
|
||||||
nick_str: str = actor.split('/@')[1]
|
nick_str: str = actor.split('/@')[1]
|
||||||
if '/' in nick_str:
|
if '/' in nick_str:
|
||||||
nick_str = nick_str.split('/')[0]
|
nick_str = nick_str.split('/')[0]
|
||||||
nick_str = _tidy_nickname(nick_str)
|
return _tidy_nickname(nick_str)
|
||||||
return nick_str
|
|
||||||
if '@' in actor:
|
if '@' in actor:
|
||||||
nick_str: str = actor.split('@')[0]
|
nick_str: str = actor.split('@')[0]
|
||||||
nick_str = _tidy_nickname(nick_str)
|
return _tidy_nickname(nick_str)
|
||||||
return nick_str
|
|
||||||
if '://' in actor:
|
if '://' in actor:
|
||||||
domain: str = actor.split('://')[1]
|
domain: str = actor.split('://')[1]
|
||||||
if '/' in domain:
|
if '/' in domain:
|
||||||
|
|
@ -1500,8 +1496,7 @@ def get_nickname_from_actor(actor: str) -> str:
|
||||||
nick_str: str = actor.split('://' + domain + '/')[1]
|
nick_str: str = actor.split('://' + domain + '/')[1]
|
||||||
if '/' in nick_str or '.' in nick_str:
|
if '/' in nick_str or '.' in nick_str:
|
||||||
return None
|
return None
|
||||||
nick_str = _tidy_nickname(nick_str)
|
return _tidy_nickname(nick_str)
|
||||||
return nick_str
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue