mirror of https://gitlab.com/bashrc2/epicyon
Convert to string
parent
75c53c8496
commit
5ebd8efd06
|
|
@ -291,7 +291,7 @@ def update_inbox_queue(self, nickname: str, message_json: {},
|
|||
return 3
|
||||
|
||||
if not valid_nickname(actor_domain, actor_nickname):
|
||||
print('INBOX: invalid nickname ' + actor_url)
|
||||
print('INBOX: invalid nickname ' + str(actor_url))
|
||||
http_400(self)
|
||||
self.server.postreq_busy = False
|
||||
return 3
|
||||
|
|
|
|||
|
|
@ -3299,7 +3299,8 @@ def _command_options() -> None:
|
|||
sys.exit()
|
||||
|
||||
if not valid_nickname(domain, nickname):
|
||||
print(nickname + ' is a reserved name. Use something different.')
|
||||
print(str(nickname) +
|
||||
' is an invalid nickname. Use something different.')
|
||||
sys.exit()
|
||||
|
||||
if not argb.password:
|
||||
|
|
@ -3349,7 +3350,8 @@ def _command_options() -> None:
|
|||
# remove preceding group indicator
|
||||
nickname = nickname[1:]
|
||||
if not valid_nickname(domain, nickname):
|
||||
print(nickname + ' is a reserved name. Use something different.')
|
||||
print(str(nickname) +
|
||||
' is an invalid nickname. Use something different.')
|
||||
sys.exit()
|
||||
if not argb.password:
|
||||
argb.password = getpass.getpass('Password: ')
|
||||
|
|
|
|||
|
|
@ -662,7 +662,7 @@ def register_account(base_dir: str, http_prefix: str, domain: str, port: int,
|
|||
if _account_exists(base_dir, nickname, domain):
|
||||
return False
|
||||
if not valid_nickname(domain, nickname):
|
||||
print('REGISTER: Nickname ' + nickname + ' is invalid')
|
||||
print('REGISTER: Nickname ' + str(nickname) + ' is invalid')
|
||||
return False
|
||||
if len(password) < 8:
|
||||
print('REGISTER: Password should be at least 8 characters')
|
||||
|
|
@ -1948,7 +1948,7 @@ def get_actor_json(host_domain: str, handle: str, http: bool, gnunet: bool,
|
|||
return None, None
|
||||
|
||||
if not valid_nickname(domain, nickname):
|
||||
print('WARN: get_actor_json invalid nickname ' + nickname)
|
||||
print('WARN: get_actor_json invalid nickname ' + str(nickname))
|
||||
return None, None
|
||||
|
||||
cached_webfingers = {}
|
||||
|
|
|
|||
4
posts.py
4
posts.py
|
|
@ -6499,7 +6499,7 @@ def download_announce(session, base_dir: str, http_prefix: str,
|
|||
return None
|
||||
if not valid_nickname(actor_domain, actor_nickname):
|
||||
print('WARN: download_announce actor invalid nickname ' +
|
||||
actor_nickname + '@' + actor_domain)
|
||||
str(actor_nickname) + '@' + str(actor_domain))
|
||||
return None
|
||||
if is_blocked(base_dir, nickname, domain,
|
||||
actor_nickname, actor_domain,
|
||||
|
|
@ -6517,7 +6517,7 @@ def download_announce(session, base_dir: str, http_prefix: str,
|
|||
return None
|
||||
if not valid_nickname(object_domain, object_nickname):
|
||||
print('WARN: download_announce object invalid nickname ' +
|
||||
object_nickname + '@' + object_domain)
|
||||
str(object_nickname) + '@' + str(object_domain))
|
||||
return None
|
||||
if is_blocked(base_dir, nickname, domain, object_nickname,
|
||||
object_domain, None, block_federated):
|
||||
|
|
|
|||
Loading…
Reference in New Issue