Skip to content

Commit

Permalink
added explainer to search page for handle format per protocol
Browse files Browse the repository at this point in the history
  • Loading branch information
ghobs91 committed Dec 19, 2023
1 parent c17bc41 commit 7253a1f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
5 changes: 3 additions & 2 deletions src/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ function App() {
snapStates.settings.shortcutsViewMode !== 'multi-column' && (
<Shortcuts />
)}
<nav class="tab-bar">
{isLoggedIn && <nav class="tab-bar">
<ul>
{formattedShortcuts.map(
({ id, path, title, subtitle, icon }, i) => {
Expand Down Expand Up @@ -351,7 +351,8 @@ function App() {
},
)}
</ul>
</nav>
</nav>}

<Modals />
{isLoggedIn && <NotificationService />}
<BackgroundService isLoggedIn={isLoggedIn} />
Expand Down
3 changes: 2 additions & 1 deletion src/components/search-form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ const SearchForm = forwardRef((props, ref) => {
params.q += "@mostr.pub"
}
} else if (query.indexOf("@twitter.com") > -1) {
params.q.replace("twitter.com", "bird.makeup");
const replacedString = params.q.replace("twitter.com", "bird.makeup")
params.q = replacedString
}
}
if (type) params.type = type; // Preserve type
Expand Down
5 changes: 4 additions & 1 deletion src/pages/search.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,10 @@ function Search(props) {
</p>
) : (
<p class="ui-state">
Enter your search term or paste a URL above to get started.
<p class="ui-state">To find a Mastodon profile, search their handle in this format: <strong>@gargron@mastodon.social</strong></p>
<p class="ui-state">To find a Bluesky profile, search their handle in this format: <strong>andrew.bsky.social</strong></p>
<p class="ui-state">To find a Nostr profile, search their profile hex code in this format: <strong>b17c59874dc05d7f6ec975bce04770c8b7fa9d37f3ad0096fdb76c9385d68928@mostr.pub</strong></p>
<p class="ui-state">To find a Twitter profile, search their handle in this format: <strong>elonmusk@twitter.com</strong></p>
</p>
)}
</main>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/status.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ function StatusThread({ id, closeLink = '/', instance: propInstance }) {
<span class="hero-heading">
<NameText
account={heroStatus.account}
instance={currentmasto}
instance={currentmasto ? currentMasto : instance}
showAvatar
short
/>{' '}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/trending.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function Trending({ columnMode, ...props }) {
const [uiState, setUIState] = useState('default');

const { masto, instance } = api({
instance: params.instance === 'ditto.pub' ? 'mastodon.social' : props?.instance || params.instance,
instance: params.instance === 'ditto.pub' ? 'mastodon.social' : params.instance === 'skybridge.fly.dev' ? 'mastodon.social' : props?.instance || params.instance,
});
const title = `Trending`;
useTitle(title, `/:instance?/trending`);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/welcome.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function Welcome() {
</b>
</big>
</p>
<p class="desc">Follow your interests, and learn new things!</p>
<p class="desc">Follow your interests across social networks!</p>
</div>
<div id="why-container">
<div class="sections">
Expand Down

0 comments on commit 7253a1f

Please sign in to comment.