From e1470a7d37b551ff0365dde54c2a1735b9cd0029 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 24 Jun 2020 13:33:06 +0100
Subject: [PATCH] Reminder post content includes handle

---
 daemon.py |  1 -
 posts.py  | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/daemon.py b/daemon.py
index a2920620..9cc9130a 100644
--- a/daemon.py
+++ b/daemon.py
@@ -5452,7 +5452,6 @@ class PubServer(BaseHTTPRequestHandler):
                                        filename, attachmentMediaType,
                                        fields['imageDescription'],
                                        self.server.useBlurHash,
-                                       None, None,
                                        fields['subject'],
                                        True, fields['schedulePost'],
                                        fields['eventDate'],
diff --git a/posts.py b/posts.py
index 48ca4240..79396fa8 100644
--- a/posts.py
+++ b/posts.py
@@ -1184,7 +1184,6 @@ def createReminderPost(baseDir: str,
                        saveToFile: bool, clientToServer: bool,
                        attachImageFilename: str, mediaType: str,
                        imageDescription: str, useBlurhash: bool,
-                       inReplyTo=None, inReplyToAtomUri=None,
                        subject=None, debug=False,
                        schedulePost=False,
                        eventDate=None, eventTime=None,
@@ -1194,6 +1193,13 @@ def createReminderPost(baseDir: str,
     """
     postTo = None
     postCc = None
+    domainFull = domain
+    if port:
+        if port != 80 and port != 443:
+            domainFull = domain + ':' + str(port)
+    handle = '@' + nickname + '@' + domainFull
+    if handle not in content:
+        content = handle + ' ' + content
     messageJson = \
         createPostBase(baseDir, nickname, domain, port,
                        postTo, postCc,
@@ -1201,8 +1207,13 @@ def createReminderPost(baseDir: str,
                        clientToServer,
                        attachImageFilename, mediaType,
                        imageDescription, useBlurhash,
-                       False, False, inReplyTo, inReplyToAtomUri, subject,
+                       False, False, None, None, subject,
                        schedulePost, eventDate, eventTime, location)
+    # mentioned recipients go into To rather than Cc
+    messageJson['to'] = messageJson['object']['cc']
+    messageJson['object']['to'] = messageJson['to']
+    messageJson['cc'] = []
+    messageJson['object']['cc'] = []
     if schedulePost:
         savePostToBox(baseDir, httpPrefix, messageJson['object']['id'],
                       nickname, domain, messageJson, 'scheduled')