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

Change function name to avoid static analysis confusion

merge-requests/30/head
Bob Mottram 2024-02-20 11:26:06 +00:00
parent ac735e2d91
commit 781db96120
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon.py
View File

@ -262,7 +262,7 @@ from webapp_search import html_skills_search
from webapp_search import html_history_search from webapp_search import html_history_search
from webapp_search import html_hashtag_search from webapp_search import html_hashtag_search
from webapp_search import html_hashtag_search_remote from webapp_search import html_hashtag_search_remote
from webapp_search import rss_hashtag_search from webapp_search import hashtag_search_rss
from webapp_search import hashtag_search_json from webapp_search import hashtag_search_json
from webapp_search import html_search_emoji from webapp_search import html_search_emoji
from webapp_search import html_search_shared_items from webapp_search import html_search_shared_items
@ -9843,19 +9843,10 @@ class PubServer(BaseHTTPRequestHandler):
nickname = \ nickname = \
get_nickname_from_actor(actor) get_nickname_from_actor(actor)
hashtag_str = \ hashtag_str = \
rss_hashtag_search(nickname, hashtag_search_rss(nickname,
domain, port, domain, port,
self.server.recent_posts_cache,
self.server.max_recent_posts,
self.server.translate,
base_dir, hashtag, base_dir, hashtag,
MAX_POSTS_IN_FEED, curr_session,
self.server.cached_webfingers,
self.server.person_cache,
http_prefix, http_prefix,
self.server.project_version,
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.system_language) self.server.system_language)
if hashtag_str: if hashtag_str:
msg = hashtag_str.encode('utf-8') msg = hashtag_str.encode('utf-8')

10
webapp_search.py
View File

@ -1278,15 +1278,9 @@ def html_hashtag_search_remote(nickname: str, domain: str, port: int,
return hashtag_search_form return hashtag_search_form
def rss_hashtag_search(nickname: str, domain: str, port: int, def hashtag_search_rss(nickname: str, domain: str, port: int,
recent_posts_cache: {}, max_recent_posts: int,
translate: {},
base_dir: str, hashtag: str, base_dir: str, hashtag: str,
posts_per_page: int, http_prefix: str,
session, cached_webfingers: {}, person_cache: {},
http_prefix: str, project_version: str,
yt_replace_domain: str,
twitter_replacement_domain: str,
system_language: str) -> str: system_language: str) -> str:
"""Show an rss feed for a hashtag """Show an rss feed for a hashtag
""" """