diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index fd1fa6fd..fb288f36 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -12,7 +12,7 @@ import RelativeDate from '$lib/components/util/RelativeDate.svelte' import CommentForm from './CommentForm.svelte' import { page } from '$app/stores' - import UserLink from '$lib/components/user/UserLink.svelte' + import UserLink from '$lib/components/lemmy/user/UserLink.svelte' import Markdown from '$lib/components/markdown/Markdown.svelte' import CommentActions from '$lib/components/lemmy/comment/CommentActions.svelte' import { createEventDispatcher } from 'svelte' diff --git a/src/lib/components/lemmy/post/PostMeta.svelte b/src/lib/components/lemmy/post/PostMeta.svelte index e92f3b36..36de2b72 100644 --- a/src/lib/components/lemmy/post/PostMeta.svelte +++ b/src/lib/components/lemmy/post/PostMeta.svelte @@ -2,7 +2,7 @@ import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte' import Avatar from '$lib/components/ui/Avatar.svelte' import Badge from '$lib/components/ui/Badge.svelte' - import UserLink from '$lib/components/user/UserLink.svelte' + import UserLink from '$lib/components/lemmy/user/UserLink.svelte' import RelativeDate from '$lib/components/util/RelativeDate.svelte' import type { Community, Person } from 'lemmy-js-client' import { Bookmark, Icon, InformationCircle, Trash } from 'svelte-hero-icons' diff --git a/src/lib/components/lemmy/user/UserItem.svelte b/src/lib/components/lemmy/user/UserItem.svelte index 113ed8ed..ee3d5f6f 100644 --- a/src/lib/components/lemmy/user/UserItem.svelte +++ b/src/lib/components/lemmy/user/UserItem.svelte @@ -6,7 +6,7 @@ PencilSquare, } from 'svelte-hero-icons' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' - import UserLink from '$lib/components/user/UserLink.svelte' + import UserLink from '$lib/components/lemmy/user/UserLink.svelte' export let user: PersonView diff --git a/src/lib/components/user/UserLink.svelte b/src/lib/components/lemmy/user/UserLink.svelte similarity index 89% rename from src/lib/components/user/UserLink.svelte rename to src/lib/components/lemmy/user/UserLink.svelte index 246e6741..93f71f6f 100644 --- a/src/lib/components/user/UserLink.svelte +++ b/src/lib/components/lemmy/user/UserLink.svelte @@ -6,6 +6,7 @@ export let user: Person export let avatar: boolean = false export let avatarSize = 24 + export let badges = true function linkFromCommunity(user: Person) { const domain = new URL(user.actor_id).hostname @@ -23,7 +24,7 @@ {#if !user.local && $userSettings.showInstance} {user.name} - + @{new URL(user.actor_id).hostname} {:else} diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte index 52db5968..483f1674 100644 --- a/src/routes/inbox/InboxItem.svelte +++ b/src/routes/inbox/InboxItem.svelte @@ -7,7 +7,7 @@ import Markdown from '$lib/components/markdown/Markdown.svelte' import Card from '$lib/components/ui/Card.svelte' import { ToastType, addToast } from '$lib/components/ui/toasts/toasts.js' - import UserLink from '$lib/components/user/UserLink.svelte' + import UserLink from '$lib/components/lemmy/user/UserLink.svelte' import { authData, getClient, user } from '$lib/lemmy.js' import { Color } from '$lib/ui/colors.js' import type { diff --git a/src/routes/post/[instance]/[id]/+page.svelte b/src/routes/post/[instance]/[id]/+page.svelte index f54c6ee1..652af2f4 100644 --- a/src/routes/post/[instance]/[id]/+page.svelte +++ b/src/routes/post/[instance]/[id]/+page.svelte @@ -9,7 +9,7 @@ import { authData, getClient, user } from '$lib/lemmy.js' import CommentForm from '$lib/components/lemmy/comment/CommentForm.svelte' import { onMount } from 'svelte' - import UserLink from '$lib/components/user/UserLink.svelte' + import UserLink from '$lib/components/lemmy/user/UserLink.svelte' import Markdown from '$lib/components/markdown/Markdown.svelte' import Avatar from '$lib/components/ui/Avatar.svelte' import RelativeDate from '$lib/components/util/RelativeDate.svelte'