indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

If searching for someone you already follow then show their person options screen

merge-requests/30/head
Bob Mottram 2020-12-30 11:27:16 +00:00
parent 7fbdb2445f
commit 3b23ae5927
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
daemon.py
View File

@ -87,6 +87,7 @@ from inbox import runInboxQueueWatchdog
from inbox import savePostToInboxQueue from inbox import savePostToInboxQueue
from inbox import populateReplies from inbox import populateReplies
from inbox import getPersonPubKey from inbox import getPersonPubKey
from follow import isFollowingActor
from follow import getFollowingFeed from follow import getFollowingFeed
from follow import sendFollowRequest from follow import sendFollowRequest
from follow import unfollowAccount from follow import unfollowAccount
@ -2419,6 +2420,7 @@ class PubServer(BaseHTTPRequestHandler):
domain: str, domainFull: str, domain: str, domainFull: str,
port: int, searchForEmoji: bool, port: int, searchForEmoji: bool,
onionDomain: str, i2pDomain: str, onionDomain: str, i2pDomain: str,
GETstartTime, GETtimings: {},
debug: bool) -> None: debug: bool) -> None:
"""Receive a search query """Receive a search query
""" """
@ -2570,27 +2572,41 @@ class PubServer(BaseHTTPRequestHandler):
self.server.POSTbusy = False self.server.POSTbusy = False
return return
profilePathStr = path.replace('/searchhandle', '') profilePathStr = path.replace('/searchhandle', '')
profileStr = \
htmlProfileAfterSearch(self.server.cssCache, # are we already following the searched for handle?
self.server.recentPostsCache, if isFollowingActor(baseDir, nickname, domain,
self.server.maxRecentPosts, searchStr):
self.server.translate, # TODO
baseDir, self._showPersonOptions(callingDomain, profilePathStr,
profilePathStr, baseDir, httpPrefix,
httpPrefix, domain, domainFull,
nickname, GETstartTime, GETtimings,
domain, onionDomain, i2pDomain,
port, cookie, debug)
searchStr, return
self.server.session, else:
self.server.cachedWebfingers, showPublishedDateOnly = self.server.showPublishedDateOnly
self.server.personCache, profileStr = \
self.server.debug, htmlProfileAfterSearch(self.server.cssCache,
self.server.projectVersion, self.server.recentPostsCache,
self.server.YTReplacementDomain, self.server.maxRecentPosts,
self.server.showPublishedDateOnly, self.server.translate,
self.server.defaultTimeline, baseDir,
self.server.peertubeInstances) profilePathStr,
httpPrefix,
nickname,
domain,
port,
searchStr,
self.server.session,
self.server.cachedWebfingers,
self.server.personCache,
self.server.debug,
self.server.projectVersion,
self.server.YTReplacementDomain,
showPublishedDateOnly,
self.server.defaultTimeline,
self.server.peertubeInstances)
if profileStr: if profileStr:
msg = profileStr.encode('utf-8') msg = profileStr.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -12820,6 +12836,7 @@ class PubServer(BaseHTTPRequestHandler):
searchForEmoji, searchForEmoji,
self.server.onionDomain, self.server.onionDomain,
self.server.i2pDomain, self.server.i2pDomain,
POSTstartTime, {},
self.server.debug) self.server.debug)
return return