handling of leading backslash in search and defaults to mastodon.soci…

…al instance for trending when using single user masto.host instance
ghobs91 · Feb 15, 2024 · 27fa864 · 27fa864
1 parent a969e5e
commit 27fa864
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/app.jsx b/src/app.jsx
@@ -98,7 +98,7 @@ function App() {
       id: 'trending',
       title: 'Trending',
       subtitle: '',
-      path: `/${instanceURL}/trending`,
+      path: instance.indexOf('skybridge.fly.dev') > -1 ? `/l/1795987464373403648`: instance.indexOf('masto.host') > -1 ? `/mastodon.social/trending` : `/${instance}/trending`,
       icon: 'chart',
     },
     {
@@ -293,7 +293,7 @@ function App() {
           <Route index element={<Public />} />
           <Route path="l" element={<Public local />} />
         </Route>
-        <Route path="/:myCurrentInstance?/trending" element={<Trending />} />
+        <Route path="/:instance?/trending" element={<Trending />} />
         <Route path="/foryou" element={<ForYou />} />
         {isLoggedIn && <Route path="/topics" element={<Topics />} />}
         <Route path="/:instance?/search" element={<Search />} />

diff --git a/src/components/search-form.jsx b/src/components/search-form.jsx
@@ -58,6 +58,10 @@ const SearchForm = forwardRef((props, ref) => {
                 params.q = replacedString
               }
             } else {
+              if (query.indexOf("/" === 0)) {
+                let replacedString = params.q.replace("/", "");
+                params.q = replacedString;
+              }
               if (query.indexOf("@") === -1) {
                 if (query.indexOf("bsky.social") > -1 || query.indexOf("bsky.team") > -1) {
                   params.q += "@bsky.brid.gy"

diff --git a/src/components/timeline.jsx b/src/components/timeline.jsx
@@ -286,7 +286,7 @@ function Timeline({
       id: 'trending',
       title: 'Trending',
       subtitle: '',
-      path: instance.indexOf('skybridge.fly.dev') > -1 ? `/l/1795987464373403648` : `/${instance}/trending`,
+      path: instance.indexOf('skybridge.fly.dev') > -1 ? `/l/1795987464373403648`: instance.indexOf('masto.host') > -1 ? `/mastodon.social/trending` : `/${instance}/trending`,
       icon: 'chart',
     },
     {