From a6d90d0ae6c57113e63e492a56153d4702815a30 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 7 Nov 2022 18:00:06 +0000
Subject: [PATCH] Include notes in csv export

---
 daemon.py       | 10 ++++++++--
 webapp_utils.py | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/daemon.py b/daemon.py
index a636836fe..d1c84d1c8 100644
--- a/daemon.py
+++ b/daemon.py
@@ -16518,7 +16518,10 @@ class PubServer(BaseHTTPRequestHandler):
                 self._login_headers('text/html', msglen, calling_domain)
                 self._write(msg.encode('utf-8'))
             elif csv_getreq:
-                msg = csv_following_list(following_filename)
+                msg = csv_following_list(following_filename,
+                                         self.server.base_dir,
+                                         nickname,
+                                         self.server.domain)
                 msglen = len(msg)
                 self._login_headers('text/csv', msglen, calling_domain)
                 self._write(msg.encode('utf-8'))
@@ -16553,7 +16556,10 @@ class PubServer(BaseHTTPRequestHandler):
                 self._login_headers('text/html', msglen, calling_domain)
                 self._write(msg.encode('utf-8'))
             elif csv_getreq:
-                msg = csv_following_list(followers_filename)
+                msg = csv_following_list(followers_filename,
+                                         self.server.base_dir,
+                                         nickname,
+                                         self.server.domain)
                 msglen = len(msg)
                 self._login_headers('text/csv', msglen, calling_domain)
                 self._write(msg.encode('utf-8'))
diff --git a/webapp_utils.py b/webapp_utils.py
index 23c2b5422..cd97d0318 100644
--- a/webapp_utils.py
+++ b/webapp_utils.py
@@ -99,7 +99,8 @@ def html_following_list(base_dir: str, following_filename: str) -> str:
     return ''
 
 
-def csv_following_list(following_filename: str) -> str:
+def csv_following_list(following_filename: str,
+                       base_dir: str, nickname: str, domain: str) -> str:
     """Returns a csv of handles being followed
     """
     with open(following_filename, 'r', encoding='utf-8') as following_file:
@@ -113,8 +114,16 @@ def csv_following_list(following_filename: str) -> str:
                     continue
                 if following_list_csv:
                     following_list_csv += '\n'
-                following_list_csv += following_address + ',true'
-            msg = 'Account address,Show boosts\n' + following_list_csv
+                following_list_csv += following_address + ',true,'
+                person_notes_filename = \
+                    acct_dir(base_dir, nickname, domain) + \
+                    '/notes/' + following_address + '.txt'
+                if os.path.isfile(person_notes_filename):
+                    with open(person_notes_filename, 'r',
+                              encoding='utf-8') as fp_notes:
+                        person_notes = fp_notes.read()
+                        following_list_csv += person_notes
+            msg = 'Account address,Show boosts,Notes\n' + following_list_csv
         return msg
     return ''