diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index d0fdf925..3fee7d54 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -1,23 +1,11 @@ - - -
- - - - • - - • - - {Math.floor( - (postRes.counts.upvotes / - (postRes.counts.upvotes + postRes.counts.downvotes || 1)) * - 100 - )}% - - -
- -
- {#if postRes.post.nsfw} - NSFW - {/if} - {#if postRes.counts.score < 0 && postRes.counts.upvotes > 3 && postRes.counts.downvotes > 3} - - - - {/if} - {#if postRes.saved} - - - - {/if} - {#if postRes.post.deleted || postRes.post.removed} - - - - {/if} - {#if postRes.post.featured_community || postRes.post.featured_local} - - - - {/if} -
-
+ - {postRes.post.name} + {post.post.name} - {#if postRes.post.url && !postRes.post.thumbnail_url} + {#if post.post.url && !post.post.thumbnail_url} - {postRes.post.url} + {post.post.url} {/if} - {#if isImage(postRes.post.url)} -
+ {#if isImage(post.post.url)} +
- {:else if postRes.post.thumbnail_url && postRes.post.url} - - {postRes.post.name} - - - {new URL(postRes.post.url).hostname} - - + {:else if post.post.thumbnail_url && post.post.url} + {/if} - {#if postRes.post.body && !postRes.post.nsfw} + {#if post.post.body && !post.post.nsfw}

- {postRes.post.body} + {post.post.body}

{/if} - + diff --git a/src/lib/components/lemmy/post/PostLink.svelte b/src/lib/components/lemmy/post/PostLink.svelte new file mode 100644 index 00000000..cb522ddf --- /dev/null +++ b/src/lib/components/lemmy/post/PostLink.svelte @@ -0,0 +1,24 @@ + + + + + + + + {new URL(url).hostname} + + diff --git a/src/lib/components/lemmy/post/PostMeta.svelte b/src/lib/components/lemmy/post/PostMeta.svelte new file mode 100644 index 00000000..ce25fe3a --- /dev/null +++ b/src/lib/components/lemmy/post/PostMeta.svelte @@ -0,0 +1,60 @@ + + + + +
+ + + + • + + • + + {Math.floor((upvotes / (upvotes + downvotes || 1)) * 100)}% + + +
+ +
+ {#if nsfw} + NSFW + {/if} + {#if saved} + + + + {/if} + {#if deleted} + + + + {/if} + {#if featured} + + + + {/if} +
+
diff --git a/src/lib/components/ui/Card.svelte b/src/lib/components/ui/Card.svelte index 38dc82a0..452a5fc2 100644 --- a/src/lib/components/ui/Card.svelte +++ b/src/lib/components/ui/Card.svelte @@ -1,14 +1,23 @@
diff --git a/src/routes/post/[instance]/[id]/+page.svelte b/src/routes/post/[instance]/[id]/+page.svelte index bb8cc448..5a19ea55 100644 --- a/src/routes/post/[instance]/[id]/+page.svelte +++ b/src/routes/post/[instance]/[id]/+page.svelte @@ -1,5 +1,8 @@