1
0
Fork 0

Fix collapsed peek status with wrong url

This commit is contained in:
Lim Chee Aun 2023-11-05 17:40:58 +08:00
parent 83bdc82049
commit 305710fa8c

View file

@ -268,6 +268,7 @@ function Status({
instance={instance} instance={instance}
size={size} size={size}
contentTextWeight={contentTextWeight} contentTextWeight={contentTextWeight}
readOnly={readOnly}
/> />
</div> </div>
); );
@ -290,6 +291,7 @@ function Status({
instance={instance} instance={instance}
size={size} size={size}
contentTextWeight={contentTextWeight} contentTextWeight={contentTextWeight}
readOnly={readOnly}
/> />
</div> </div>
); );
@ -2276,6 +2278,7 @@ const unfurlMastodonLink = throttle(_unfurlMastodonLink);
function FilteredStatus({ status, filterInfo, instance, containerProps = {} }) { function FilteredStatus({ status, filterInfo, instance, containerProps = {} }) {
const { const {
id: statusID,
account: { avatar, avatarStatic, bot, group }, account: { avatar, avatarStatic, bot, group },
createdAt, createdAt,
visibility, visibility,
@ -2305,6 +2308,11 @@ function FilteredStatus({ status, filterInfo, instance, containerProps = {} }) {
' ' + ' ' +
(statusKey(reblog?.id, instance) || ''); (statusKey(reblog?.id, instance) || '');
const actualStatusID = reblog?.id || statusID;
const url = instance
? `/${instance}/s/${actualStatusID}`
: `/s/${actualStatusID}`;
return ( return (
<div <div
class={isReblog ? (group ? 'status-group' : 'status-reblog') : ''} class={isReblog ? (group ? 'status-group' : 'status-reblog') : ''}
@ -2380,7 +2388,7 @@ function FilteredStatus({ status, filterInfo, instance, containerProps = {} }) {
<Link <Link
ref={statusPeekRef} ref={statusPeekRef}
class="status-link" class="status-link"
to={`/${instance}/s/${status.id}`} to={url}
onClick={() => { onClick={() => {
setShowPeek(false); setShowPeek(false);
}} }}