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

Check handle format

merge-requests/30/head
Bob Mottram 2023-05-17 14:45:28 +01:00
parent 4f3ecf57c4
commit b1793ea22c
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
relationships.py
View File

@ -166,15 +166,21 @@ def get_moved_feed(base_dir: str, domain: str, port: int, path: str,
if curr_page == page_number: if curr_page == page_number:
line2_lower = handle.lower() line2_lower = handle.lower()
line2 = remove_eol(line2_lower) line2 = remove_eol(line2_lower)
nick = line2.split('@')[0] url = None
dom = line2.split('@')[1] if '@' in line2:
if not nick.startswith('!'): nick = line2.split('@')[0]
# person actor dom = line2.split('@')[1]
url = local_actor_url(http_prefix, nick, dom) if not nick.startswith('!'):
# person actor
url = local_actor_url(http_prefix, nick, dom)
else:
# group actor
url = http_prefix + '://' + dom + '/c/' + nick
else: else:
# group actor if '://' in line2:
url = http_prefix + '://' + dom + '/c/' + nick url = remove_eol(handle)
following['orderedItems'].append(url) if url:
following['orderedItems'].append(url)
if page_ctr >= follows_per_page: if page_ctr >= follows_per_page:
page_ctr = 0 page_ctr = 0
curr_page += 1 curr_page += 1
@ -453,15 +459,21 @@ def get_inactive_feed(base_dir: str, domain: str, port: int, path: str,
if curr_page == page_number: if curr_page == page_number:
line2_lower = handle.lower() line2_lower = handle.lower()
line2 = remove_eol(line2_lower) line2 = remove_eol(line2_lower)
nick = line2.split('@')[0] url = None
dom = line2.split('@')[1] if '@' in line2:
if not nick.startswith('!'): nick = line2.split('@')[0]
# person actor dom = line2.split('@')[1]
url = local_actor_url(http_prefix, nick, dom) if not nick.startswith('!'):
# person actor
url = local_actor_url(http_prefix, nick, dom)
else:
# group actor
url = http_prefix + '://' + dom + '/c/' + nick
else: else:
# group actor if '://' in line2:
url = http_prefix + '://' + dom + '/c/' + nick url = remove_eol(handle)
following['orderedItems'].append(url) if url:
following['orderedItems'].append(url)
if page_ctr >= follows_per_page: if page_ctr >= follows_per_page:
page_ctr = 0 page_ctr = 0
curr_page += 1 curr_page += 1