nki/phanpy
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use /:instance?/xxx instead

Browse source
This commit is contained in:
Lim Chee Aun 2023-02-06 19:54:18 +08:00
parent 692851b24c
commit 719a407414
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/app.jsx
View file

@ -185,17 +185,13 @@ function App() {
{isLoggedIn && <Route path="/b" element={<Bookmarks />} />} {isLoggedIn && <Route path="/b" element={<Bookmarks />} />}
{isLoggedIn && <Route path="/f" element={<Favourites />} />} {isLoggedIn && <Route path="/f" element={<Favourites />} />}
{isLoggedIn && <Route path="/l/:id" element={<Lists />} />} {isLoggedIn && <Route path="/l/:id" element={<Lists />} />}
{isLoggedIn && ( <Route path="/:instance?/t/:hashtag" element={<Hashtags />} />
<Route path="/t/:instance?/:hashtag" element={<Hashtags />} /> <Route path="/:instance?/a/:id" element={<AccountStatuses />} />
)} <Route path="/:instance?/p/l?" element={<Public />} />
{isLoggedIn && (
<Route path="/a/:instance?/:id" element={<AccountStatuses />} />
)}
<Route path="/p/l?/:instance" element={<Public />} />
{/* <Route path="/:anything" element={<NotFound />} /> */} {/* <Route path="/:anything" element={<NotFound />} /> */}
</Routes> </Routes>
<Routes> <Routes>
<Route path="/s/:instance?/:id" element={<Status />} /> <Route path="/:instance?/s/:id" element={<Status />} />
</Routes> </Routes>
<nav id="tab-bar" hidden> <nav id="tab-bar" hidden>
<li> <li>

2
src/components/account.jsx
View file

@ -223,7 +223,7 @@ function Account({ account, instance: propInstance, onClose }) {
)} )}
<p class="stats"> <p class="stats">
<Link <Link
to={`/a/${id}`} to={instance ? `/${instance}/a/${id}` : `/a/${id}`}
onClick={() => { onClick={() => {
hideAllModals(); hideAllModals();
}} }}

2
src/components/media-modal.jsx
View file

@ -171,7 +171,7 @@ function MediaModal({
<span> <span>
{!isStatusLocation && ( {!isStatusLocation && (
<Link <Link
to={instance ? `/s/${instance}/${statusID}` : `/s/${statusID}`} to={instance ? `/${instance}/s/${statusID}` : `/s/${statusID}`}
class="button carousel-button media-post-link plain3" class="button carousel-button media-post-link plain3"
onClick={() => { onClick={() => {
// if small screen (not media query min-width 40em + 350px), run onClose // if small screen (not media query min-width 40em + 350px), run onClose

4
src/components/timeline.jsx
View file

@ -114,7 +114,7 @@ function Timeline({
const { id: statusID, reblog, boosts } = status; const { id: statusID, reblog, boosts } = status;
const actualStatusID = reblog?.id || statusID; const actualStatusID = reblog?.id || statusID;
const url = instance const url = instance
? `/s/${instance}/${actualStatusID}` ? `/${instance}/s/${actualStatusID}`
: `/s/${actualStatusID}`; : `/s/${actualStatusID}`;
if (boosts) { if (boosts) {
return ( return (
@ -265,7 +265,7 @@ function BoostsCarousel({ boosts, instance }) {
const { id: statusID, reblog } = boost; const { id: statusID, reblog } = boost;
const actualStatusID = reblog?.id || statusID; const actualStatusID = reblog?.id || statusID;
const url = instance const url = instance
? `/s/${instance}/${actualStatusID}` ? `/${instance}/s/${actualStatusID}`
: `/s/${actualStatusID}`; : `/s/${actualStatusID}`;
return ( return (
<li key={statusID}> <li key={statusID}>

4
src/pages/status.jsx
View file

@ -639,7 +639,7 @@ function StatusPage() {
class="status-link" class="status-link"
to={ to={
instance instance
? `/s/${instance}/${statusID}` ? `/${instance}/s/${statusID}`
: `/s/${statusID}` : `/s/${statusID}`
} }
onClick={() => { onClick={() => {
@ -819,7 +819,7 @@ function SubComments({ hasManyStatuses, replies, instance }) {
<li key={r.id}> <li key={r.id}>
<Link <Link
class="status-link" class="status-link"
to={instance ? `/s/${instance}/${r.id}` : `/s/${r.id}`} to={instance ? `/${instance}/s/${r.id}` : `/s/${r.id}`}
onClick={() => { onClick={() => {
resetScrollPosition(r.id); resetScrollPosition(r.id);
}} }}