Issue 7285: Perform duplicate check for item URI also with AP

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 0a80773c739f8126c6fe8a8c09f039c87d760f8c..fe4429e0008b8bf8741d5edde312e52e03be1015 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -185,7 +185,6 @@ function message_content(App $a)
                        );
                        if (DBA::isResult($r)) {
                                $parent = $r[0]['parent-uri'];
-                               $convid = $r[0]['convid'];
 
                                if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
                                        info(L10n::t('Conversation removed.') . EOL);
@@ -230,7 +229,6 @@ function message_content(App $a)
 
                        if (DBA::isResult($r)) {
                                $prename = $r[0]['name'];
-                               $preurl = $r[0]['url'];
                                $preid = $r[0]['id'];
                                $preselect = [$preid];
                        } else {
@@ -339,6 +337,13 @@ function message_content(App $a)
                        $messages = DBA::toArray($messages_stmt);
 
                        DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
+
+                       if ($message['convid']) {
+                               // Clear Diaspora private message notifications
+                               DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['convid'], 'uid' => local_user()]);
+                       }
+                       // Clear DFRN private message notifications
+                       DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]);
                } else {
                        $messages = false;
                }
@@ -379,7 +384,7 @@ function message_content(App $a)
 
                        $from_name_e = $message['from-name'];
                        $subject_e = $message['title'];
-                       $body_e = Smilies::replace(BBCode::convert($message['body']));
+                       $body_e = BBCode::convert($message['body']);
                        $to_name_e = $message['name'];
 
                        $contact = Contact::getDetailsByURL($message['from-url']);
@@ -495,7 +500,7 @@ function get_messages($uid, $start, $limit)
 
 function render_messages(array $msg, $t)
 {
-       $a = get_app();
+       $a = \get_app();
 
        $tpl = Renderer::getMarkupTemplate($t);
        $rslt = '';