From 27ed9ab636062d5b10d75a0cb736e4c6af88fa07 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 26 Jun 2015 12:21:47 +0930
Subject: [PATCH] Update gambit for search API

---
 extensions/sticky/src/Handlers/StickySearchModifier.php | 2 +-
 extensions/sticky/src/StickyGambit.php                  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/extensions/sticky/src/Handlers/StickySearchModifier.php b/extensions/sticky/src/Handlers/StickySearchModifier.php
index fec49b9e7..021a17cc2 100755
--- a/extensions/sticky/src/Handlers/StickySearchModifier.php
+++ b/extensions/sticky/src/Handlers/StickySearchModifier.php
@@ -13,7 +13,7 @@ class StickySearchModifier
     public function reorderSearch(DiscussionSearchWillBePerformed $event)
     {
         if ($event->criteria->sort === null) {
-            $query = $event->searcher->query();
+            $query = $event->searcher->getQuery();
 
             if (!is_array($query->orders)) {
                 $query->orders = [];
diff --git a/extensions/sticky/src/StickyGambit.php b/extensions/sticky/src/StickyGambit.php
index 84c3c2f7d..7dd2262d5 100644
--- a/extensions/sticky/src/StickyGambit.php
+++ b/extensions/sticky/src/StickyGambit.php
@@ -10,7 +10,7 @@ class StickyGambit extends GambitAbstract
      *
      * @var string
      */
-    protected $pattern = 'sticky:(true|false)';
+    protected $pattern = 'is:sticky';
 
     /**
      * Apply conditions to the searcher, given matches from the gambit's
@@ -20,10 +20,8 @@ class StickyGambit extends GambitAbstract
      * @param \Flarum\Core\Search\SearcherInterface $searcher
      * @return void
      */
-    public function conditions($matches, SearcherInterface $searcher)
+    protected function conditions(SearcherInterface $searcher, array $matches, $negate)
     {
-        $sticky = $matches[1] === 'true';
-
-        $searcher->query()->where('is_sticky', $sticky);
+        $searcher->getQuery()->where('is_sticky', ! $negate);
     }
 }