mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-08 01:16:52 +02:00
Code Issues Releases Wiki Activity

Only pin to top if viewing a tag with no other filters

Browse Source
This commit is contained in:
Toby Zerner
2018-01-11 12:28:35 +10:30
parent b58f97fd5e
commit 8bfaff339e
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php
View File

@@ -49,16 +49,16 @@ class PinStickiedDiscussionsToTop
// discussions to the top no matter what. // discussions to the top no matter what.
$gambits = $search->getActiveGambits(); $gambits = $search->getActiveGambits();
foreach ($gambits as $gambit) { if ($count = count($gambits)) {
if ($gambit instanceof TagGambit) { if ($count === 1 && $gambits[0] instanceof TagGambit) {
if (! is_array($query->orders)) { if (! is_array($query->orders)) {
$query->orders = []; $query->orders = [];
} }
array_unshift($query->orders, ['column' => 'is_sticky', 'direction' => 'desc']); array_unshift($query->orders, ['column' => 'is_sticky', 'direction' => 'desc']);
return;
} }
return;
} }
// Otherwise, if we are viewing "all discussions", only pin stickied // Otherwise, if we are viewing "all discussions", only pin stickied
@@ -66,33 +66,31 @@ class PinStickiedDiscussionsToTop
// performant way we create another query which will select all // performant way we create another query which will select all
// stickied discussions, marry them into the main query, and then // stickied discussions, marry them into the main query, and then
// reorder the unread ones up to the top. // reorder the unread ones up to the top.
if (empty($gambits)) { $sticky = clone $query;
$sticky = clone $query; $sticky->where('is_sticky', true);
$sticky->where('is_sticky', true); $sticky->orders = null;
$sticky->orders = null;
$query->union($sticky); $query->union($sticky);
$read = $query->newQuery() $read = $query->newQuery()
->selectRaw(1) ->selectRaw(1)
->from('users_discussions as sticky') ->from('users_discussions as sticky')
->whereRaw('sticky.discussion_id = id') ->whereRaw('sticky.discussion_id = id')
->where('sticky.user_id', '=', $search->getActor()->id) ->where('sticky.user_id', '=', $search->getActor()->id)
->whereRaw('sticky.read_number >= last_post_number'); ->whereRaw('sticky.read_number >= last_post_number');
// Add the bindings manually (rather than as the second // Add the bindings manually (rather than as the second
// argument in orderByRaw) for now due to a bug in Laravel which // argument in orderByRaw) for now due to a bug in Laravel which
// would add the bindings in the wrong order. // would add the bindings in the wrong order.
$query->orderByRaw('is_sticky and not exists ('.$read->toSql().') and last_time > ? desc') $query->orderByRaw('is_sticky and not exists ('.$read->toSql().') and last_time > ? desc')
->addBinding(array_merge($read->getBindings(), [$search->getActor()->read_time ?: 0]), 'union'); ->addBinding(array_merge($read->getBindings(), [$search->getActor()->read_time ?: 0]), 'union');
$query->unionOrders = array_merge($query->unionOrders, $query->orders); $query->unionOrders = array_merge($query->unionOrders, $query->orders);
$query->unionLimit = $query->limit; $query->unionLimit = $query->limit;
$query->unionOffset = $query->offset; $query->unionOffset = $query->offset;
$query->limit = $sticky->limit = $query->offset + $query->limit; $query->limit = $sticky->limit = $query->offset + $query->limit;
$query->offset = $sticky->offset = null; $query->offset = $sticky->offset = null;
}
} }
} }
} }