merge-requests/30/head
Bob Mottram 2024-04-08 16:43:20 +01:00
parent 52ab97b03b
commit 46553b7d62
2 changed files with 22 additions and 13 deletions

View File

@ -3691,7 +3691,8 @@ def daemon_http_get(self) -> None:
proxy_type, proxy_type,
cookie, self.server.debug, cookie, self.server.debug,
curr_session, curr_session,
self.server.translate): self.server.translate,
self.server.account_timezone):
self.server.getreq_busy = False self.server.getreq_busy = False
return return
@ -3794,7 +3795,8 @@ def daemon_http_get(self) -> None:
proxy_type, proxy_type,
cookie, self.server.debug, cookie, self.server.debug,
curr_session, curr_session,
self.server.translate): self.server.translate,
self.server.account_timezone):
self.server.getreq_busy = False self.server.getreq_busy = False
return return
@ -3813,7 +3815,8 @@ def daemon_http_get(self) -> None:
proxy_type, proxy_type,
cookie, self.server.debug, cookie, self.server.debug,
curr_session, curr_session,
self.server.translate): self.server.translate,
self.server.account_timezone):
self.server.getreq_busy = False self.server.getreq_busy = False
return return

View File

@ -56,7 +56,8 @@ def _show_post_from_file(self, post_filename: str, liked_by: str,
getreq_start_time, getreq_start_time,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
debug: str, include_create_wrapper: bool, debug: str, include_create_wrapper: bool,
curr_session, translate: {}) -> bool: curr_session, translate: {},
account_timezone: {}) -> bool:
"""Shows an individual post from its filename """Shows an individual post from its filename
""" """
if not os.path.isfile(post_filename): if not os.path.isfile(post_filename):
@ -91,9 +92,8 @@ def _show_post_from_file(self, post_filename: str, liked_by: str,
remove_post_interactions(pjo, True) remove_post_interactions(pjo, True)
if request_http(self.headers, debug): if request_http(self.headers, debug):
timezone = None timezone = None
if self.server.account_timezone.get(nickname): if account_timezone.get(nickname):
timezone = \ timezone = account_timezone.get(nickname)
self.server.account_timezone.get(nickname)
mitm = False mitm = False
if os.path.isfile(post_filename.replace('.json', '') + if os.path.isfile(post_filename.replace('.json', '') +
@ -186,7 +186,8 @@ def show_individual_post(self, ssml_getreq: bool, authorized: bool,
getreq_start_time, getreq_start_time,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
debug: str, debug: str,
curr_session, translate: {}) -> bool: curr_session, translate: {},
account_timezone: {}) -> bool:
"""Shows an individual post """Shows an individual post
""" """
liked_by = None liked_by = None
@ -266,7 +267,8 @@ def show_individual_post(self, ssml_getreq: bool, authorized: bool,
getreq_start_time, getreq_start_time,
proxy_type, cookie, debug, proxy_type, cookie, debug,
include_create_wrapper, include_create_wrapper,
curr_session, translate) curr_session, translate,
account_timezone)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, self.server.fitness,
'_GET', 'show_individual_post', '_GET', 'show_individual_post',
debug) debug)
@ -434,7 +436,8 @@ def show_individual_at_post(self, ssml_getreq: bool, authorized: bool,
getreq_start_time, getreq_start_time,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
debug: str, debug: str,
curr_session, translate) -> bool: curr_session, translate: {},
account_timezone: {}) -> bool:
"""get an individual post from the path /@nickname/statusnumber """get an individual post from the path /@nickname/statusnumber
""" """
if '/@' not in path: if '/@' not in path:
@ -520,7 +523,8 @@ def show_individual_at_post(self, ssml_getreq: bool, authorized: bool,
getreq_start_time, getreq_start_time,
proxy_type, cookie, debug, proxy_type, cookie, debug,
include_create_wrapper, include_create_wrapper,
curr_session, translate) curr_session, translate,
account_timezone)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, self.server.fitness,
'_GET', 'show_individual_at_post', '_GET', 'show_individual_at_post',
debug) debug)
@ -944,7 +948,8 @@ def show_notify_post(self, authorized: bool,
getreq_start_time, getreq_start_time,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
debug: str, debug: str,
curr_session, translate: {}) -> bool: curr_session, translate: {},
account_timezone: {}) -> bool:
"""Shows an individual post from an account which you are following """Shows an individual post from an account which you are following
and where you have the notify checkbox set on person options and where you have the notify checkbox set on person options
""" """
@ -977,7 +982,8 @@ def show_notify_post(self, authorized: bool,
getreq_start_time, getreq_start_time,
proxy_type, cookie, debug, proxy_type, cookie, debug,
include_create_wrapper, include_create_wrapper,
curr_session, translate) curr_session, translate,
account_timezone)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, self.server.fitness,
'_GET', 'show_notify_post', '_GET', 'show_notify_post',
debug) debug)