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

Tidying

merge-requests/30/head
Bob Mottram 2024-04-10 11:35:36 +01:00
parent b4120ce638
commit 2f69fe40f0
1 changed files with 9 additions and 12 deletions

21
daemon_post_search.py
View File

@ -101,10 +101,17 @@ def receive_search_query(self, calling_domain: str, cookie: str,
print('search_str: ' + search_str) print('search_str: ' + search_str)
if search_for_emoji: if search_for_emoji:
search_str = ':' + search_str + ':' search_str = ':' + search_str + ':'
my_posts_endings = ( my_posts_endings = (
' history', ' in sent', ' in outbox', ' in outgoing', ' history', ' in sent', ' in outbox', ' in outgoing',
' in sent items', ' in sent posts', ' in outgoing posts', ' in sent items', ' in sent posts', ' in outgoing posts',
' in my history', ' in my outbox', ' in my posts') ' in my history', ' in my outbox', ' in my posts')
bookmark_endings = (
' in my saved items', ' in my saved posts',
' in my bookmarks', ' in my saved', ' in my saves',
' in saved posts', ' in saved items', ' in bookmarks',
' in saved', ' in saves', ' bookmark')
if search_str.startswith('#'): if search_str.startswith('#'):
nickname = get_nickname_from_actor(actor_str) nickname = get_nickname_from_actor(actor_str)
if not nickname: if not nickname:
@ -266,17 +273,8 @@ def receive_search_query(self, calling_domain: str, cookie: str,
self.server.postreq_busy = False self.server.postreq_busy = False
return return
elif (search_str.startswith('-') or elif (search_str.startswith('-') or
search_str.endswith(' in my saved items') or string_ends_with(search_str, bookmark_endings)):
search_str.endswith(' in my saved posts') or # bookmark search
search_str.endswith(' in my bookmarks') or
search_str.endswith(' in my saved') or
search_str.endswith(' in my saves') or
search_str.endswith(' in saved posts') or
search_str.endswith(' in saved items') or
search_str.endswith(' in bookmarks') or
search_str.endswith(' in saved') or
search_str.endswith(' in saves') or
search_str.endswith(' bookmark')):
possible_endings = ( possible_endings = (
' in my bookmarks' ' in my bookmarks'
' in my saved posts' ' in my saved posts'
@ -294,7 +292,6 @@ def receive_search_query(self, calling_domain: str, cookie: str,
if search_str.endswith(poss_ending): if search_str.endswith(poss_ending):
search_str = search_str.replace(poss_ending, '') search_str = search_str.replace(poss_ending, '')
break break
# bookmark search
nickname = get_nickname_from_actor(actor_str) nickname = get_nickname_from_actor(actor_str)
if not nickname: if not nickname:
self.send_response(400) self.send_response(400)