From e69beba5372d414cf1e33c7559851df942f3e282 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 31 May 2022 16:16:55 +0100 Subject: [PATCH] Tidying --- blog.py | 6 +++--- inbox.py | 1 - outbox.py | 1 - person.py | 19 +++++++++---------- posts.py | 32 ++++++++++++++------------------ 5 files changed, 26 insertions(+), 33 deletions(-) diff --git a/blog.py b/blog.py index e9440c1ef..130dd8880 100644 --- a/blog.py +++ b/blog.py @@ -541,7 +541,7 @@ def html_blog_page(authorized: bool, session, return blog_str + html_footer() timeline_json = \ - create_blogs_timeline(session, base_dir, + create_blogs_timeline(base_dir, nickname, domain, port, http_prefix, no_of_items, False, page_number) @@ -629,7 +629,7 @@ def html_blog_page_rss2(authorized: bool, session, return blog_rss2 + rss2footer() return blog_rss2 - timeline_json = create_blogs_timeline(session, base_dir, + timeline_json = create_blogs_timeline(base_dir, nickname, domain, port, http_prefix, no_of_items, False, @@ -677,7 +677,7 @@ def html_blog_page_rss3(authorized: bool, session, return blog_rss3 timeline_json = \ - create_blogs_timeline(session, base_dir, + create_blogs_timeline(base_dir, nickname, domain, port, http_prefix, no_of_items, False, page_number) diff --git a/inbox.py b/inbox.py index b7ed84763..203f171bf 100644 --- a/inbox.py +++ b/inbox.py @@ -4082,7 +4082,6 @@ def _inbox_after_initial(server, inbox_start_time, if is_image_media(session, base_dir, http_prefix, nickname, domain, post_json_object, - translate, yt_replace_domain, twitter_replacement_domain, allow_local_network_access, diff --git a/outbox.py b/outbox.py index 986ed6e1d..27761ed4e 100644 --- a/outbox.py +++ b/outbox.py @@ -451,7 +451,6 @@ def post_message_to_outbox(session, translate: {}, if is_image_media(session, base_dir, http_prefix, post_to_nickname, domain, message_json, - translate, yt_replace_domain, twitter_replacement_domain, allow_local_network_access, diff --git a/person.py b/person.py index ad29dee32..26fe69b3f 100644 --- a/person.py +++ b/person.py @@ -1000,45 +1000,44 @@ def person_box_json(recent_posts_cache: {}, return None if boxname == 'inbox': return create_inbox(recent_posts_cache, - session, base_dir, nickname, domain, port, + base_dir, nickname, domain, port, http_prefix, no_of_items, header_only, page_number) if boxname == 'dm': return create_dm_timeline(recent_posts_cache, - session, base_dir, nickname, domain, port, + base_dir, nickname, domain, port, http_prefix, no_of_items, header_only, page_number) if boxname in ('tlbookmarks', 'bookmarks'): - return create_bookmarks_timeline(session, base_dir, nickname, domain, + return create_bookmarks_timeline(base_dir, nickname, domain, port, http_prefix, no_of_items, header_only, page_number) if boxname == 'tlreplies': return create_replies_timeline(recent_posts_cache, - session, base_dir, nickname, domain, + base_dir, nickname, domain, port, http_prefix, no_of_items, header_only, page_number) if boxname == 'tlmedia': - return create_media_timeline(session, base_dir, nickname, domain, port, + return create_media_timeline(base_dir, nickname, domain, port, http_prefix, no_of_items, header_only, page_number) if boxname == 'tlnews': - return create_news_timeline(session, base_dir, nickname, domain, port, + return create_news_timeline(base_dir, domain, port, http_prefix, no_of_items, header_only, newswire_votes_threshold, positive_voting, voting_time_mins, page_number) if boxname == 'tlfeatures': - return create_features_timeline(session, base_dir, - nickname, domain, port, + return create_features_timeline(base_dir, nickname, domain, port, http_prefix, no_of_items, header_only, page_number) if boxname == 'tlblogs': - return create_blogs_timeline(session, base_dir, nickname, domain, port, + return create_blogs_timeline(base_dir, nickname, domain, port, http_prefix, no_of_items, header_only, page_number) if boxname == 'outbox': - return create_outbox(session, base_dir, nickname, domain, port, + return create_outbox(base_dir, nickname, domain, port, http_prefix, no_of_items, header_only, authorized, page_number) diff --git a/posts.py b/posts.py index 102d50c47..326677c69 100644 --- a/posts.py +++ b/posts.py @@ -3589,7 +3589,7 @@ def send_to_followers_thread(server, session, session_onion, session_i2p, def create_inbox(recent_posts_cache: {}, - session, base_dir: str, nickname: str, domain: str, port: int, + base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, page_number: int) -> {}: return _create_box_indexed(recent_posts_cache, @@ -3599,7 +3599,7 @@ def create_inbox(recent_posts_cache: {}, 0, False, 0, page_number) -def create_bookmarks_timeline(session, base_dir: str, +def create_bookmarks_timeline(base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, page_number: int) -> {}: @@ -3610,7 +3610,7 @@ def create_bookmarks_timeline(session, base_dir: str, def create_dm_timeline(recent_posts_cache: {}, - session, base_dir: str, nickname: str, domain: str, + base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, page_number: int) -> {}: return _create_box_indexed(recent_posts_cache, @@ -3620,7 +3620,7 @@ def create_dm_timeline(recent_posts_cache: {}, def create_replies_timeline(recent_posts_cache: {}, - session, base_dir: str, nickname: str, domain: str, + base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, page_number: int) -> {}: return _create_box_indexed(recent_posts_cache, @@ -3630,7 +3630,7 @@ def create_replies_timeline(recent_posts_cache: {}, 0, False, 0, page_number) -def create_blogs_timeline(session, base_dir: str, nickname: str, domain: str, +def create_blogs_timeline(base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, page_number: int) -> {}: return _create_box_indexed({}, base_dir, 'tlblogs', nickname, @@ -3639,7 +3639,7 @@ def create_blogs_timeline(session, base_dir: str, nickname: str, domain: str, 0, False, 0, page_number) -def create_features_timeline(session, base_dir: str, +def create_features_timeline(base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, page_number: int) -> {}: @@ -3649,7 +3649,7 @@ def create_features_timeline(session, base_dir: str, 0, False, 0, page_number) -def create_media_timeline(session, base_dir: str, nickname: str, domain: str, +def create_media_timeline(base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, page_number: int) -> {}: return _create_box_indexed({}, base_dir, 'tlmedia', nickname, @@ -3658,7 +3658,7 @@ def create_media_timeline(session, base_dir: str, nickname: str, domain: str, 0, False, 0, page_number) -def create_news_timeline(session, base_dir: str, nickname: str, domain: str, +def create_news_timeline(base_dir: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, newswire_votes_threshold: int, positive_voting: bool, voting_time_mins: int, @@ -3670,7 +3670,7 @@ def create_news_timeline(session, base_dir: str, nickname: str, domain: str, voting_time_mins, page_number) -def create_outbox(session, base_dir: str, nickname: str, domain: str, +def create_outbox(base_dir: str, nickname: str, domain: str, port: int, http_prefix: str, items_per_page: int, header_only: bool, authorized: bool, page_number: int) -> {}: @@ -3723,12 +3723,10 @@ def create_moderation(base_dir: str, nickname: str, domain: str, port: int, if len(lines) > 0: end_line_number = \ len(lines) - 1 - int(items_per_page * page_number) - if end_line_number < 0: - end_line_number = 0 + end_line_number = max(end_line_number, 0) start_line_number = \ len(lines) - 1 - int(items_per_page * (page_number - 1)) - if start_line_number < 0: - start_line_number = 0 + start_line_number = max(start_line_number, 0) line_number = start_line_number while line_number >= end_line_number: line_no_str = lines[line_number].strip('\n').strip('\r') @@ -3750,7 +3748,7 @@ def create_moderation(base_dir: str, nickname: str, domain: str, port: int, def is_image_media(session, base_dir: str, http_prefix: str, nickname: str, domain: str, - post_json_object: {}, translate: {}, + post_json_object: {}, yt_replace_domain: str, twitter_replacement_domain: str, allow_local_network_access: bool, @@ -3992,8 +3990,7 @@ def _create_box_indexed(recent_posts_cache: {}, page_str = '?page=true' if page_number: - if page_number < 1: - page_number = 1 + page_number = max(page_number, 1) try: page_str = '?page=' + str(page_number) except BaseException: @@ -4129,8 +4126,7 @@ def _create_box_indexed(recent_posts_cache: {}, # Generate first and last entries within header if total_posts_count > 0: last_page = int(total_posts_count / items_per_page) - if last_page < 1: - last_page = 1 + last_page = max(last_page, 1) box_header['last'] = \ local_actor_url(http_prefix, nickname, domain) + \ '/' + boxname + '?page=' + str(last_page)