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

[DirectMessage] Simplify the inbox query

Browse Source
This commit is contained in:
Alexei Sorokin 2020-09-02 15:12:20 +03:00
parent fc300607e5
commit 55136c1c6f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,19 +72,17 @@ 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->selectAdd('notice_id');
$attention->whereAdd('profile_id = ' . $to->getID());
$ids = $attention->find() ? $attention->fetchAll('notice_id') : [];
// get the messages // get the messages
$message = new Notice(); $message = new Notice();
$message->whereAdd('scope = ' . NOTICE::MESSAGE_SCOPE); $message->selectAdd();
$message->whereAddIn('id', $ids, 'int'); $message->selectAdd('notice.*');
$message->orderBy('created DESC, id DESC');
// fetch all notice IDs related to the user $to
$message->joinAdd(['id', 'attention:notice_id']);
$message->whereAdd('notice.scope = ' . Notice::MESSAGE_SCOPE);
$message->whereAdd('attention.profile_id = ' . $to->getID());
$message->orderBy('notice.created DESC, notice.id DESC');
if (!is_null($page) && $page >= 0) { if (!is_null($page) && $page >= 0) {
$page = ($page == 0) ? 1 : $page; $page = ($page == 0) ? 1 : $page;