friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Add parent to private message notifications 

- Fix item id for Diaspora private message notification
This commit is contained in:
Hypolite Petovan 2018-12-30 01:10:10 -05:00
parent 5abc22f6c5
commit 3095d4aa70
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Protocol/DFRN.php
View File

@ -1870,6 +1870,7 @@ class DFRN
"to_email" => $importer["email"], "to_email" => $importer["email"],
"uid" => $importer["importer_uid"], "uid" => $importer["importer_uid"],
"item" => $msg, "item" => $msg,
"parent" => $msg["parent-uri"],
"source_name" => $msg["from-name"], "source_name" => $msg["from-name"],
"source_link" => $importer["url"], "source_link" => $importer["url"],
"source_photo" => $importer["thumb"], "source_photo" => $importer["thumb"],

26
src/Protocol/Diaspora.php
View File

@ -1824,6 +1824,8 @@ class Diaspora
'created' => $msg_created_at 'created' => $msg_created_at
]); ]);
$message_id = DBA::lastInsertId();
DBA::unlock(); DBA::unlock();
DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]); DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
@ -1834,8 +1836,9 @@ class Diaspora
"language" => $importer["language"], "language" => $importer["language"],
"to_name" => $importer["username"], "to_name" => $importer["username"],
"to_email" => $importer["email"], "to_email" => $importer["email"],
"uid" =>$importer["uid"], "uid" => $importer["uid"],
"item" => ["id" => $conversation["id"], "title" => $subject, "subject" => $subject, "body" => $body], "item" => ["id" => $message_id, "title" => $subject, "subject" => $subject, "body" => $body],
"parent" => $conversation["id"],
"source_name" => $person["name"], "source_name" => $person["name"],
"source_link" => $person["url"], "source_link" => $person["url"],
"source_photo" => $person["photo"], "source_photo" => $person["photo"],
@ -2081,9 +2084,28 @@ class Diaspora
'created' => $created_at 'created' => $created_at
]); ]);
$message_id = DBA::lastInsertId();
DBA::unlock(); DBA::unlock();
DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]); DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
notification([
"type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
"to_name" => $importer["username"],
"to_email" => $importer["email"],
"uid" => $importer["uid"],
"item" => ["id" => $message_id, "title" => $conversation["subject"], "subject" => $conversation["subject"], "body" => $body],
"parent" => $conversation["id"],
"source_name" => $person["name"],
"source_link" => $person["url"],
"source_photo" => $person["photo"],
"verb" => ACTIVITY_POST,
"otype" => "mail"
]);
return true; return true;
} }