search all territories by default + more intuitive search filters

api/resolvers/search.js

@@ -7,14 +7,16 @@ function queryParts (q) {
 
   const queryArr = q.replace(regex, '').trim().split(/\s+/)
   const url = queryArr.find(word => word.startsWith('url:'))
-  const nym = queryArr.find(word => word.startsWith('nym:'))
+  const nym = queryArr.find(word => word.startsWith('@'))
-  const exclude = [url, nym]
+  const territory = queryArr.find(word => word.startsWith('~'))
+  const exclude = [url, nym, territory]
   const query = queryArr.filter(word => !exclude.includes(word)).join(' ')
 
   return {
     quotes: [...q.matchAll(regex)].map(m => m[1]),
     nym,
     url,
+    territory,
     query
   }
 }
@@ -169,7 +171,7 @@ export default {
         items
       }
     },
-    search: async (parent, { q, sub, cursor, sort, what, when, from: whenFrom, to: whenTo }, { me, models, search }) => {
+    search: async (parent, { q, cursor, sort, what, when, from: whenFrom, to: whenTo }, { me, models, search }) => {
       const decodedCursor = decodeCursor(cursor)
       let sitems = null
       let termQueries = []
@@ -193,7 +195,7 @@ export default {
           break
       }
 
-      const { query: _query, quotes, nym, url } = queryParts(q)
+      const { query: _query, quotes, nym, url, territory } = queryParts(q)
       let query = _query
 
       const isUrlSearch = url && query.length === 0 // exclusively searching for an url
@@ -206,11 +208,11 @@ export default {
       }
 
       if (nym) {
-        whatArr.push({ wildcard: { 'user.name': `*${nym.slice(4).toLowerCase()}*` } })
+        whatArr.push({ wildcard: { 'user.name': `*${nym.slice(1).toLowerCase()}*` } })
       }
 
-      if (sub) {
+      if (territory) {
-        whatArr.push({ match: { 'sub.name': sub } })
+        whatArr.push({ match: { 'sub.name': territory.slice(1) } })
       }
 
       termQueries.push({

components/hidden-wallet-summary.js

@@ -16,7 +16,7 @@ export default function HiddenWalletSummary ({ abbreviate, fixedWidth }) {
   return (
     <span
       ref={ref} style={{ width: fixedWidth ? width : undefined }}
-      className='d-inline-block text-monospace' align='right' onPointerEnter={() => setHover(true)} onPointerLeave={() => setHover(false)}
+      className='text-monospace' align='right' onPointerEnter={() => setHover(true)} onPointerLeave={() => setHover(false)}
     >
       {hover ? (abbreviate ? abbrNum(me.privates?.sats) : numWithUnits(me.privates?.sats, { abbreviate: false, format: true })) : '******'}
     </span>

components/navigation/common.js

@@ -70,7 +70,7 @@ export function Back () {
 
   return (
     <a
-      role='button' tabIndex='0' className='nav-link p-0 me-3' onClick={() => {
+      role='button' tabIndex='0' className='nav-link p-0 me-2' onClick={() => {
         if (back) {
           router.back()
         } else {

components/navigation/sticky-bar.js

@@ -21,8 +21,6 @@ export default function StickyBar ({ prefix, sub, path, topNavKey, dropNavKey })
     }
   }, [ref?.current, sticky?.current])
 
-  if (path.endsWith('/search')) return null
-
   return (
     <>
       <div ref={ref} style={{ position: 'relative', top: '50px' }} />

components/search.module.css

@@ -1,13 +1,11 @@
 .searchSection {
-    position: sticky;
-    top: 0;
-    border-bottom: 1px solid var(--theme-toolbarActive);
     background-color: var(--bs-body-bg);
     z-index: 1;
 }
 
 .searchContainer {
     position: relative;
+    padding-bottom: 0.5rem;
 }
 
 .search {

next.config.js

@@ -177,7 +177,7 @@ module.exports = withPlausibleProxy()({
         source: '/~:sub/:slug*',
         destination: '/~/:slug*?sub=:sub'
       },
-      ...['/', '/post', '/search', '/rss', '/recent/:slug*', '/top/:slug*'].map(source => ({ source, destination: '/~' + source }))
+      ...['/', '/post', '/rss', '/recent/:slug*', '/top/:slug*'].map(source => ({ source, destination: '/~' + source }))
     ]
   },
   async redirects () {

pages/search.js

@@ -3,7 +3,7 @@ import { getGetServerSideProps } from '@/api/ssrApollo'
 import { useRouter } from 'next/router'
 import { SUB_SEARCH } from '@/fragments/subs'
 import Items from '@/components/items'
-import styles from './search.module.css'
+import styles from '@/styles/search.module.css'
 
 export const getServerSideProps = getGetServerSideProps({
   query: SUB_SEARCH,
@@ -31,16 +31,16 @@ export default function Index ({ ssrData }) {
             <div className={styles.box}>
               <div className={styles.header}>
                 <div className='text-muted text-center' style={{ fontFamily: 'lightning', fontSize: '2rem', opacity: '0.75' }}>
-                  more filters
+                  filters
                 </div>
               </div>
               <div className={styles.body}>
-                <div className={styles.inner}>
+                <ul className={styles.inner}>
-                  <div><b>nym:</b>&#8203;<em>sn</em> - limit results by stacker nym</div>
+                  <li><b>@</b>&#8203;<em>nym</em> - limit to results authored by nym</li>
-                  <div><b>url:</b>&#8203;<em>stacker&#8203;.news</em> - limit to specific site</div>
+                  <li><b>~</b>&#8203;<em>territory</em> - limit to results from territory</li>
-                  <div><b>"</b>exact phrase<b>"</b> - demand results contain exact phrase</div>
+                  <li><b>url:</b>&#8203;<em>stacker&#8203;.news</em> - limit to link posts from a specific url</li>
-                  <div>you are searching <em>{variables.sub || 'home'}</em><br /><em>home</em> searches show results from all</div>
+                  <li><b>"</b><em>exact phrase</em><b>"</b> - limit to results that contain an exact phrase</li>
-                </div>
+                </ul>
               </div>
             </div>
           </div>

styles/search.module.css

@@ -7,7 +7,6 @@
 .box {
   border: 1px solid var(--theme-borderColor);
   border-radius: 10px;
-  box-shadow: 2px 2px 10px var(--theme-borderColor);
   min-width: 50%;
   display: flex;
   flex-direction: column;
@@ -20,10 +19,13 @@
   align-self: center;
 }
 .inner {
-  padding: 0.5rem 0;
+  padding-right: 2rem;
+  padding-bottom: 1rem;
+  padding-top: 1rem;
+  padding-inline-start: 3rem;
   display: flex;
   flex-direction: column;
 }
-.inner > div {
+.inner > li {
-  padding: 5px 2rem;
+  padding: 0.25rem 0;
 }