GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[DirectMessage] Update inboxMessages() to stop fetching replies

Browse Source 
This is yet to be supported in the plugin.
This commit is contained in:
t3nma 2020-07-28 05:48:43 +01:00 committed by Diogo Peralta Cordeiro
parent 58d7ab4d13
commit 8b0abc0382
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/DirectMessage/lib/models/MessageModel.php
View File

@ -72,24 +72,14 @@ class MessageModel
*/ */
public static function inboxMessages(User $to, ?int $page = null) public static function inboxMessages(User $to, ?int $page = null)
{ {
// fetch all notice IDs related to the user $to
$attention = new Attention(); $attention = new Attention();
$attention->selectAdd('notice_id'); $attention->selectAdd('notice_id');
$attention->whereAdd('profile_id = ' . $to->getID()); $attention->whereAdd('profile_id = ' . $to->getID());
$ids = $attention->find() ? $attention->fetchAll('notice_id') : []; $ids = $attention->find() ? $attention->fetchAll('notice_id') : [];
$reply = new Reply(); // get the messages
$reply->selectAdd('notice_id');
$reply->whereAdd('profile_id = ' . $to->getID());
if ($reply->find()) {
$ids = array_unique(
array_merge($ids, $reply->fetchAll('notice_id'))
);
} else if (empty($ids)) {
return null;
}
$message = new Notice(); $message = new Notice();
$message->whereAdd('scope = ' . NOTICE::MESSAGE_SCOPE); $message->whereAdd('scope = ' . NOTICE::MESSAGE_SCOPE);