Use function arguments

merge-requests/30/head
Bob Mottram 2024-02-29 11:54:46 +00:00
parent 09bf62e9fa
commit 9ff214c9c9
1 changed files with 11 additions and 18 deletions

View File

@ -4428,10 +4428,10 @@ class PubServer(BaseHTTPRequestHandler):
users_path = path.replace('/searchhandle', '') users_path = path.replace('/searchhandle', '')
actor_str = \ actor_str = \
get_instance_url(calling_domain, get_instance_url(calling_domain,
self.server.http_prefix, http_prefix,
self.server.domain_full, domain_full,
self.server.onion_domain, onion_domain,
self.server.i2p_domain) + \ i2p_domain) + \
users_path users_path
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
try: try:
@ -4733,11 +4733,9 @@ class PubServer(BaseHTTPRequestHandler):
search_str.endswith(';') or \ search_str.endswith(';') or \
search_str.endswith('.'): search_str.endswith('.'):
actor_str = \ actor_str = \
get_instance_url(calling_domain, get_instance_url(calling_domain, http_prefix,
self.server.http_prefix, domain_full, onion_domain,
self.server.domain_full, i2p_domain) + \
self.server.onion_domain,
self.server.i2p_domain) + \
users_path users_path
self._redirect_headers(actor_str + '/search', self._redirect_headers(actor_str + '/search',
cookie, calling_domain) cookie, calling_domain)
@ -4921,10 +4919,8 @@ class PubServer(BaseHTTPRequestHandler):
return return
actor_str = \ actor_str = \
get_instance_url(calling_domain, get_instance_url(calling_domain,
self.server.http_prefix, http_prefix, domain_full,
self.server.domain_full, onion_domain, i2p_domain) + \
self.server.onion_domain,
self.server.i2p_domain) + \
users_path users_path
self._redirect_headers(actor_str + '/search', self._redirect_headers(actor_str + '/search',
cookie, calling_domain) cookie, calling_domain)
@ -5003,11 +4999,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.postreq_busy = False self.server.postreq_busy = False
return return
actor_str = \ actor_str = \
get_instance_url(calling_domain, get_instance_url(calling_domain, http_prefix,
self.server.http_prefix, domain_full, onion_domain, i2p_domain) + \
self.server.domain_full,
self.server.onion_domain,
self.server.i2p_domain) + \
users_path users_path
self._redirect_headers(actor_str + '/' + self._redirect_headers(actor_str + '/' +
self.server.default_timeline, self.server.default_timeline,