Extra options for reaction emoji links

daemon.py

@@ -8353,7 +8353,7 @@ class PubServer(BaseHTTPRequestHandler):
                                     self.server.signingPrivateKeyPem,
                                     self.server.CWlists,
                                     self.server.listsEnabled,
-                                    self.server.defaultTimeline)
+                                    timelineStr, pageNumber)
         msg = msg.encode('utf-8')
         msglen = len(msg)
         self._set_headers('text/html', msglen,

webapp_post.py

@@ -2197,7 +2197,7 @@ def htmlEmojiReactionPicker(cssCache: {},
                             themeName: str, systemLanguage: str,
                             maxLikeCount: int, signingPrivateKeyPem: str,
                             CWlists: {}, listsEnabled: str,
-                            defaultTimeline: str) -> str:
+                            boxName: str, pageNumber: int) -> str:
     """Returns the emoji picker screen
     """
     reactedToPostStr = \
@@ -2235,6 +2235,9 @@ def htmlEmojiReactionPicker(cssCache: {},
             emojiContentEncoded = urllib.parse.quote_plus(emojiContent)
             emojiUrl = \
                 baseUrl + '?react=' + postId + \
+                '?actor=' + postJsonObject['actor'] + \
+                '?tl=' + boxName + \
+                '?page=' + str(pageNumber) + \
                 '?emojreact=' + emojiContentEncoded
             emojiLabel = '<label class="rlab">' + emojiContent + '</label>'
             emojiPicksStr += \
@@ -2257,7 +2260,8 @@ def htmlEmojiReactionPicker(cssCache: {},
     # banner
     headerStr += \
         '<header>\n' + \
-        '<a href="/users/' + nickname + '/' + defaultTimeline + '" title="' + \
+        '<a href="/users/' + nickname + '/' + boxName + \
+        '?page=' + str(pageNumber) + '" title="' + \
         translate['Switch to timeline view'] + '" alt="' + \
         translate['Switch to timeline view'] + '">\n'
     headerStr += '<img loading="lazy" class="timeline-banner" ' + \