LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-26 06:11:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into language-names

Browse source
This commit is contained in:
Dessalines 2022-02-18 19:32:43 +00:00 committed by GitHub
commit 579756d7fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/index.tsx
View file

@ -94,7 +94,7 @@ server.get("/*", async (req, res) => {
if (errCode == "instance_is_private") {
return res.redirect(`/signup`);
} else {
return res.redirect(`/404?err=${errCode}`);
return res.send(`404: ${errCode}`);
}
}
@ -180,7 +180,7 @@ server.get("/*", async (req, res) => {
`);
} catch (err) {
console.error(err);
return res.redirect(`/404?err=${err}`);
return res.send(`404: ${err}`);
}
});

15
src/shared/components/post/post-listing.tsx
View file

@ -445,11 +445,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
/>
</button>
)}
{!post.local && (
<a className="ml-2" title={i18n.t("link")} href={post.ap_id}>
<Icon icon="fedilink" />
</a>
)}
{post.removed && (
<small className="ml-2 text-muted font-italic">
{i18n.t("removed")}
@ -515,9 +510,19 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
}
commentsLine(mobile = false) {
let post = this.props.post_view.post;
return (
<div class="d-flex justify-content-start flex-wrap text-muted font-weight-bold mb-1">
{this.commentsButton}
{!post.local && (
<a
className="btn btn-link btn-animate text-muted py-0"
title={i18n.t("link")}
href={post.ap_id}
>
<Icon icon="fedilink" inline />
</a>
)}
{mobile && !this.props.viewOnly && this.mobileVotes}
{UserService.Instance.myUserInfo &&
!this.props.viewOnly &&