From 10c9084d3d7738903b91ed517c3ae33945010add Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 20 Nov 2022 20:59:03 +0000 Subject: [PATCH 1/3] Add first post to paths for likes, announces, bookmarks and reactions --- daemon.py | 70 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/daemon.py b/daemon.py index 75aa0f517..230f0dda1 100644 --- a/daemon.py +++ b/daemon.py @@ -8947,6 +8947,8 @@ class PubServer(BaseHTTPRequestHandler): timeline_bookmark = '#' + timeline_bookmark if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -9102,9 +9104,13 @@ class PubServer(BaseHTTPRequestHandler): minimize_all_images) actor_absolute = self._get_instance_url(calling_domain) + actor + + first_post_id = repeat_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + actor_path_str = \ actor_absolute + '/' + timeline_str + '?page=' + \ - str(page_number) + timeline_bookmark + str(page_number) + first_post_id + timeline_bookmark fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_announce_button', self.server.debug) @@ -9133,6 +9139,8 @@ class PubServer(BaseHTTPRequestHandler): timeline_bookmark = '#' + timeline_bookmark if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -9217,9 +9225,13 @@ class PubServer(BaseHTTPRequestHandler): curr_session, proxy_type) actor_absolute = self._get_instance_url(calling_domain) + actor + + first_post_id = repeat_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + actor_path_str = \ actor_absolute + '/' + timeline_str + '?page=' + \ - str(page_number) + timeline_bookmark + str(page_number) + first_post_id + timeline_bookmark fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_undo_announce_button', self.server.debug) @@ -9485,6 +9497,8 @@ class PubServer(BaseHTTPRequestHandler): actor = path.split('?like=')[0] if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -9655,9 +9669,14 @@ class PubServer(BaseHTTPRequestHandler): like_url) actor_absolute = self._get_instance_url(calling_domain) + actor + + first_post_id = like_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + actor_path_str = \ actor_absolute + '/' + timeline_str + \ - '?page=' + str(page_number) + timeline_bookmark + '?page=' + str(page_number) + first_post_id + \ + timeline_bookmark fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_like_button', self.server.debug) @@ -9686,6 +9705,8 @@ class PubServer(BaseHTTPRequestHandler): timeline_bookmark = '#' + timeline_bookmark if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -9844,9 +9865,14 @@ class PubServer(BaseHTTPRequestHandler): if self.server.iconsCache.get('like_inactive.png'): del self.server.iconsCache['like_inactive.png'] actor_absolute = self._get_instance_url(calling_domain) + actor + + first_post_id = like_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + actor_path_str = \ actor_absolute + '/' + timeline_str + \ - '?page=' + str(page_number) + timeline_bookmark + '?page=' + str(page_number) + first_post_id + \ + timeline_bookmark fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_undo_like_button', self.server.debug) @@ -9878,6 +9904,8 @@ class PubServer(BaseHTTPRequestHandler): actor = path.split('?react=')[0] if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -10068,9 +10096,14 @@ class PubServer(BaseHTTPRequestHandler): reaction_url) actor_absolute = self._get_instance_url(calling_domain) + actor + + first_post_id = reaction_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + actor_path_str = \ actor_absolute + '/' + timeline_str + \ - '?page=' + str(page_number) + timeline_bookmark + '?page=' + str(page_number) + first_post_id + \ + timeline_bookmark fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_reaction_button', self.server.debug) @@ -10099,6 +10132,8 @@ class PubServer(BaseHTTPRequestHandler): timeline_bookmark = '#' + timeline_bookmark if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -10277,9 +10312,14 @@ class PubServer(BaseHTTPRequestHandler): reaction_post_filename) actor_absolute = self._get_instance_url(calling_domain) + actor + + first_post_id = reaction_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + actor_path_str = \ actor_absolute + '/' + timeline_str + \ - '?page=' + str(page_number) + timeline_bookmark + '?page=' + str(page_number) + first_post_id + \ + timeline_bookmark fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_undo_reaction_button', self.server.debug) @@ -10412,6 +10452,8 @@ class PubServer(BaseHTTPRequestHandler): actor = path.split('?bookmark=')[0] if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -10535,9 +10577,14 @@ class PubServer(BaseHTTPRequestHandler): # self.server.project_version, None, # curr_session, proxy_type) actor_absolute = self._get_instance_url(calling_domain) + actor + + first_post_id = bookmark_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + actor_path_str = \ actor_absolute + '/' + timeline_str + \ - '?page=' + str(page_number) + timeline_bookmark + '?page=' + str(page_number) + first_post_id + \ + timeline_bookmark fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_bookmark_button', debug) @@ -10566,6 +10613,8 @@ class PubServer(BaseHTTPRequestHandler): timeline_bookmark = '#' + timeline_bookmark if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -10690,9 +10739,14 @@ class PubServer(BaseHTTPRequestHandler): print('WARN: Unbookmarked post not found: ' + bookmark_filename) actor_absolute = self._get_instance_url(calling_domain) + actor + + first_post_id = bookmark_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + actor_path_str = \ actor_absolute + '/' + timeline_str + \ - '?page=' + str(page_number) + timeline_bookmark + '?page=' + str(page_number) + first_post_id + \ + timeline_bookmark fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_undo_bookmark_button', self.server.debug) From b6d80aafcc73262813ae7beb7378dfe6ec27696f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 20 Nov 2022 21:27:12 +0000 Subject: [PATCH 2/3] Liking announces --- daemon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon.py b/daemon.py index 230f0dda1..2389a55f5 100644 --- a/daemon.py +++ b/daemon.py @@ -9670,7 +9670,7 @@ class PubServer(BaseHTTPRequestHandler): actor_absolute = self._get_instance_url(calling_domain) + actor - first_post_id = like_url.replace('/', '--') + first_post_id = like_url2.replace('/', '--') first_post_id = ';firstpost=' + first_post_id.replace('#', '--') actor_path_str = \ @@ -9866,7 +9866,7 @@ class PubServer(BaseHTTPRequestHandler): del self.server.iconsCache['like_inactive.png'] actor_absolute = self._get_instance_url(calling_domain) + actor - first_post_id = like_url.replace('/', '--') + first_post_id = like_url2.replace('/', '--') first_post_id = ';firstpost=' + first_post_id.replace('#', '--') actor_path_str = \ @@ -10097,7 +10097,7 @@ class PubServer(BaseHTTPRequestHandler): actor_absolute = self._get_instance_url(calling_domain) + actor - first_post_id = reaction_url.replace('/', '--') + first_post_id = reaction_url2.replace('/', '--') first_post_id = ';firstpost=' + first_post_id.replace('#', '--') actor_path_str = \ @@ -10313,7 +10313,7 @@ class PubServer(BaseHTTPRequestHandler): actor_absolute = self._get_instance_url(calling_domain) + actor - first_post_id = reaction_url.replace('/', '--') + first_post_id = reaction_url2.replace('/', '--') first_post_id = ';firstpost=' + first_post_id.replace('#', '--') actor_path_str = \ From 67d004b930dabfcafe9234924d974e187e28af58 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 20 Nov 2022 22:05:52 +0000 Subject: [PATCH 3/3] Mute button timeline position --- daemon.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/daemon.py b/daemon.py index 2389a55f5..524040177 100644 --- a/daemon.py +++ b/daemon.py @@ -10894,6 +10894,8 @@ class PubServer(BaseHTTPRequestHandler): page_number = 1 if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -10997,8 +10999,15 @@ class PubServer(BaseHTTPRequestHandler): path.split('?mute=')[0] fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_mute_button', self.server.debug) + + first_post_id = mute_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + self._redirect_headers(actor + '/' + - timeline_str + timeline_bookmark, + timeline_str + + '?page=' + str(page_number) + + first_post_id + + timeline_bookmark, cookie, calling_domain) def _undo_mute_button(self, calling_domain: str, path: str, @@ -11026,6 +11035,8 @@ class PubServer(BaseHTTPRequestHandler): page_number = 1 if '?page=' in path: page_number_str = path.split('?page=')[1] + if ';' in page_number_str: + page_number_str = page_number_str.split(';')[0] if '?' in page_number_str: page_number_str = page_number_str.split('?')[0] if '#' in page_number_str: @@ -11126,7 +11137,13 @@ class PubServer(BaseHTTPRequestHandler): 'http://' + i2p_domain + path.split('?unmute=')[0] fitness_performance(getreq_start_time, self.server.fitness, '_GET', '_undo_mute_button', self.server.debug) + + first_post_id = mute_url.replace('/', '--') + first_post_id = ';firstpost=' + first_post_id.replace('#', '--') + self._redirect_headers(actor + '/' + timeline_str + + '?page=' + str(page_number) + + first_post_id + timeline_bookmark, cookie, calling_domain)