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

Person options shows for both following and followed accounts

merge-requests/30/head
Bob Mottram 2023-10-08 12:59:59 +01:00
parent 17c567b989
commit c5fc11ab56
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon.py
View File

@ -128,6 +128,7 @@ from followerSync import update_followers_sync_cache
from follow import pending_followers_timeline_json from follow import pending_followers_timeline_json
from follow import follower_approval_active from follow import follower_approval_active
from follow import is_following_actor from follow import is_following_actor
from follow import is_follower_of_person
from follow import get_following_feed from follow import get_following_feed
from follow import send_follow_request from follow import send_follow_request
from follow import unfollow_account from follow import unfollow_account
@ -4971,14 +4972,19 @@ class PubServer(BaseHTTPRequestHandler):
return return
profile_path_str = path.replace('/searchhandle', '') profile_path_str = path.replace('/searchhandle', '')
# are we already following the searched for handle? # are we already following or followed by the searched
if not remote_only and \ # for handle?
is_following_actor(base_dir, nickname, domain, search_str): search_nickname = get_nickname_from_actor(search_str)
search_domain, search_port = \
get_domain_from_actor(search_str)
search_follower = \
is_follower_of_person(base_dir, nickname, domain,
search_nickname, search_domain)
search_following = \
is_following_actor(base_dir, nickname, domain, search_str)
if not remote_only and (search_follower or search_following):
# get the actor # get the actor
if not has_users_path(search_str): if not has_users_path(search_str):
search_nickname = get_nickname_from_actor(search_str)
search_domain, search_port = \
get_domain_from_actor(search_str)
if not search_nickname or not search_domain: if not search_nickname or not search_domain:
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()