Use url, not uri

This commit is contained in:
Lim Chee Aun 2023-02-21 14:29:25 +08:00
parent 8891e0f01c
commit c2e9dc0efe

View file

@ -79,7 +79,7 @@ function Status({
avatar, avatar,
avatarStatic, avatarStatic,
id: accountId, id: accountId,
url, url: accountURL,
displayName, displayName,
username, username,
emojis: accountEmojis, emojis: accountEmojis,
@ -108,6 +108,7 @@ function Status({
mediaAttachments, mediaAttachments,
reblog, reblog,
uri, uri,
url,
emojis, emojis,
// Non-API props // Non-API props
_deleted, _deleted,
@ -128,7 +129,7 @@ function Status({
(mention) => mention.id === inReplyToAccountId, (mention) => mention.id === inReplyToAccountId,
); );
if (!inReplyToAccountRef && inReplyToAccountId === id) { if (!inReplyToAccountRef && inReplyToAccountId === id) {
inReplyToAccountRef = { url, username, displayName }; inReplyToAccountRef = { url: accountURL, username, displayName };
} }
const [inReplyToAccount, setInReplyToAccount] = useState(inReplyToAccountRef); const [inReplyToAccount, setInReplyToAccount] = useState(inReplyToAccountRef);
if (!withinContext && !inReplyToAccount && inReplyToAccountId) { if (!withinContext && !inReplyToAccount && inReplyToAccountId) {
@ -232,7 +233,7 @@ function Status({
)} )}
{size !== 's' && ( {size !== 's' && (
<a <a
href={url} href={accountURL}
tabindex="-1" tabindex="-1"
// target="_blank" // target="_blank"
title={`@${acct}`} title={`@${acct}`}
@ -268,7 +269,7 @@ function Status({
)} */} )} */}
{/* </span> */}{' '} {/* </span> */}{' '}
{size !== 'l' && {size !== 'l' &&
(uri ? ( (url ? (
<Link <Link
to={instance ? `/${instance}/s/${id}` : `/s/${id}`} to={instance ? `/${instance}/s/${id}` : `/s/${id}`}
class="time" class="time"
@ -467,7 +468,7 @@ function Status({
<> <>
<div class="extra-meta"> <div class="extra-meta">
<Icon icon={visibilityIconsMap[visibility]} alt={visibility} />{' '} <Icon icon={visibilityIconsMap[visibility]} alt={visibility} />{' '}
<a href={uri} target="_blank"> <a href={url} target="_blank">
<time class="created" datetime={createdAtDate.toISOString()}> <time class="created" datetime={createdAtDate.toISOString()}>
{Intl.DateTimeFormat('en', { {Intl.DateTimeFormat('en', {
// Show year if not current year // Show year if not current year