From 12f965f473e5e62608cd83f631332272067c8ef1 Mon Sep 17 00:00:00 2001
From: 6ea86b96 <6ea86b96@gmail.com>
Date: Sun, 30 Apr 2017 10:31:20 +0700
Subject: [PATCH] even smarter search

---
 ui/js/actions/search.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/ui/js/actions/search.js b/ui/js/actions/search.js
index b56c752cc..6bdb10592 100644
--- a/ui/js/actions/search.js
+++ b/ui/js/actions/search.js
@@ -9,10 +9,18 @@ import {
 import {
   doResolveUri,
 } from 'actions/content'
+import {
+  doNavigate,
+} from 'actions/app'
+import {
+  selectCurrentPage,
+} from 'selectors/app'
 
 export function doSearchContent(query) {
   return function(dispatch, getState) {
     const state = getState()
+    const page = selectCurrentPage(state)
+
 
     if (!query) {
       return dispatch({
@@ -25,6 +33,8 @@ export function doSearchContent(query) {
       data: { query }
     })
 
+    if(page != 'discover' && query != undefined) dispatch(doNavigate('discover'))
+
     lighthouse.search(query).then(results => {
       results.forEach(result => {
         const uri = lbryuri.build({
@@ -47,8 +57,16 @@ export function doSearchContent(query) {
 }
 
 export function doActivateSearch() {
-  return {
-    type: types.ACTIVATE_SEARCH,
+  return function(dispatch, getState) {
+    const state = getState()
+    const page = selectCurrentPage(state)
+    const query = selectSearchQuery(state)
+
+    if(page != 'discover' && query != undefined) dispatch(doNavigate('discover'))
+
+    dispatch({
+      type: types.ACTIVATE_SEARCH,
+    })
   }
 }