From 82abddd2896179ef726aa2497a9a77a477e3783f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Sat, 2 Mar 2024 17:24:29 +0000
Subject: [PATCH] Move hashtag function

---
 daemon_get.py         | 40 ++--------------------------------------
 daemon_get_hashtag.py | 41 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/daemon_get.py b/daemon_get.py
index 8ba23bec3..e86290267 100644
--- a/daemon_get.py
+++ b/daemon_get.py
@@ -70,7 +70,6 @@ from webapp_moderation import html_moderation
 from webapp_moderation import html_account_info
 from webapp_calendar import html_calendar_delete_confirm
 from webapp_calendar import html_calendar
-from webapp_hashtagswarm import get_hashtag_categories_feed
 from webapp_hashtagswarm import html_search_hashtag_category
 from webapp_minimalbutton import set_minimal
 from webapp_minimalbutton import is_minimal
@@ -223,6 +222,7 @@ from daemon_get_nodeinfo import get_nodeinfo
 from daemon_get_hashtag import hashtag_search_rss2
 from daemon_get_hashtag import hashtag_search_json2
 from daemon_get_hashtag import hashtag_search2
+from daemon_get_hashtag import get_hashtag_categories_feed2
 
 # Blogs can be longer, so don't show many per page
 MAX_POSTS_IN_BLOGS_FEED = 4
@@ -1332,7 +1332,7 @@ def daemon_http_get(self) -> None:
                         self.server.debug)
 
     if self.path == '/categories.xml':
-        _get_hashtag_categories_feed(self, calling_domain, self.path,
+        get_hashtag_categories_feed2(self, calling_domain, self.path,
                                      self.server.base_dir,
                                      proxy_type,
                                      getreq_start_time,
@@ -4691,42 +4691,6 @@ def _show_conversation_thread(self, authorized: bool,
     return True
 
 
-def _get_hashtag_categories_feed(self, calling_domain: str, path: str,
-                                 base_dir: str, proxy_type: str,
-                                 getreq_start_time,
-                                 debug: bool,
-                                 curr_session) -> None:
-    """Returns the hashtag categories feed
-    """
-    curr_session = \
-        establish_session("get_hashtag_categories_feed",
-                          curr_session, proxy_type,
-                          self.server)
-    if not curr_session:
-        http_404(self, 27)
-        return
-
-    hashtag_categories = None
-    msg = \
-        get_hashtag_categories_feed(base_dir, hashtag_categories)
-    if msg:
-        msg = msg.encode('utf-8')
-        msglen = len(msg)
-        set_headers(self, 'text/xml', msglen,
-                    None, calling_domain, True)
-        write2(self, msg)
-        if debug:
-            print('Sent rss2 categories feed: ' +
-                  path + ' ' + calling_domain)
-        fitness_performance(getreq_start_time, self.server.fitness,
-                            '_GET', '_get_hashtag_categories_feed', debug)
-        return
-    if debug:
-        print('Failed to get rss2 categories feed: ' +
-              path + ' ' + calling_domain)
-    http_404(self, 28)
-
-
 def _get_newswire_feed(self, calling_domain: str, path: str,
                        proxy_type: str, getreq_start_time,
                        debug: bool, curr_session) -> None:
diff --git a/daemon_get_hashtag.py b/daemon_get_hashtag.py
index 0bec7ca2f..475e8114a 100644
--- a/daemon_get_hashtag.py
+++ b/daemon_get_hashtag.py
@@ -9,7 +9,9 @@ __module_group__ = "Core"
 
 import json
 import urllib.parse
+from session import establish_session
 from httpcodes import http_400
+from httpcodes import http_404
 from httpcodes import write2
 from httpheaders import login_headers
 from httpheaders import redirect_headers
@@ -17,11 +19,12 @@ from httpheaders import set_headers
 from blocking import is_blocked_hashtag
 from utils import convert_domains
 from utils import get_nickname_from_actor
+from fitnessFunctions import fitness_performance
 from webapp_utils import html_hashtag_blocked
 from webapp_search import html_hashtag_search
 from webapp_search import hashtag_search_rss
 from webapp_search import hashtag_search_json
-from fitnessFunctions import fitness_performance
+from webapp_hashtagswarm import get_hashtag_categories_feed
 
 
 def hashtag_search_rss2(self, calling_domain: str,
@@ -227,3 +230,39 @@ def hashtag_search2(self, calling_domain: str,
     fitness_performance(getreq_start_time, self.server.fitness,
                         '_GET', '_hashtag_search',
                         self.server.debug)
+
+
+def get_hashtag_categories_feed2(self, calling_domain: str, path: str,
+                                 base_dir: str, proxy_type: str,
+                                 getreq_start_time,
+                                 debug: bool,
+                                 curr_session) -> None:
+    """Returns the hashtag categories feed
+    """
+    curr_session = \
+        establish_session("get_hashtag_categories_feed",
+                          curr_session, proxy_type,
+                          self.server)
+    if not curr_session:
+        http_404(self, 27)
+        return
+
+    hashtag_categories = None
+    msg = \
+        get_hashtag_categories_feed(base_dir, hashtag_categories)
+    if msg:
+        msg = msg.encode('utf-8')
+        msglen = len(msg)
+        set_headers(self, 'text/xml', msglen,
+                    None, calling_domain, True)
+        write2(self, msg)
+        if debug:
+            print('Sent rss2 categories feed: ' +
+                  path + ' ' + calling_domain)
+        fitness_performance(getreq_start_time, self.server.fitness,
+                            '_GET', '_get_hashtag_categories_feed', debug)
+        return
+    if debug:
+        print('Failed to get rss2 categories feed: ' +
+              path + ' ' + calling_domain)
+    http_404(self, 28)