Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Handled non-string preferredUsername values (#21598)

Browse source 
ref https://linear.app/ghost/issue/AP-585

If preferredUsername is not a string, and we attempt to render it, we
will crash the entire React application!
This commit is contained in:
Fabien 'egg' O'Carroll 2024-11-12 14:22:45 +00:00 • committed by GitHub
parent e7a80d79f3
commit d555cc6612
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/admin-x-activitypub/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "@tryghost/admin-x-activitypub", "name": "@tryghost/admin-x-activitypub",
"version": "0.3.14", "version": "0.3.15",
"license": "MIT", "license": "MIT",
"repository": { "repository": {
"type": "git", "type": "git",

3
apps/admin-x-activitypub/src/components/Inbox.tsx
View file

@ -6,6 +6,7 @@ import MainNavigation from './navigation/MainNavigation';
import NiceModal from '@ebay/nice-modal-react'; import NiceModal from '@ebay/nice-modal-react';
import React, {useEffect, useRef} from 'react'; import React, {useEffect, useRef} from 'react';
import ViewProfileModal from './global/ViewProfileModal'; import ViewProfileModal from './global/ViewProfileModal';
import getName from '../utils/get-name';
import getUsername from '../utils/get-username'; import getUsername from '../utils/get-username';
import {Button, Heading, LoadingIndicator} from '@tryghost/admin-x-design-system'; import {Button, Heading, LoadingIndicator} from '@tryghost/admin-x-design-system';
import {handleViewContent} from '../utils/content-handlers'; import {handleViewContent} from '../utils/content-handlers';
@ -123,7 +124,7 @@ const Inbox: React.FC<InboxProps> = ({}) => {
<APAvatar author={actor} /> <APAvatar author={actor} />
<div> <div>
<div className='text-grey-600'> <div className='text-grey-600'>
<span className='mr-1 truncate font-bold text-black'>{actor.name || actor.preferredUsername || 'Unknown'}</span> <span className='mr-1 truncate font-bold text-black'>{getName(actor)}</span>
<div className='truncate text-sm'>{getUsername(actor)}</div> <div className='truncate text-sm'>{getUsername(actor)}</div>
</div> </div>
</div> </div>

5
apps/admin-x-activitypub/src/components/Profile.tsx
View file

@ -4,6 +4,7 @@ import FeedItem from './feed/FeedItem';
import MainNavigation from './navigation/MainNavigation'; import MainNavigation from './navigation/MainNavigation';
import NiceModal from '@ebay/nice-modal-react'; import NiceModal from '@ebay/nice-modal-react';
import React, {useEffect, useRef, useState} from 'react'; import React, {useEffect, useRef, useState} from 'react';
import getName from '../utils/get-name';
import getUsername from '../utils/get-username'; import getUsername from '../utils/get-username';
import {ActorProperties} from '@tryghost/admin-x-framework/api/activitypub'; import {ActorProperties} from '@tryghost/admin-x-framework/api/activitypub';
@ -187,7 +188,7 @@ const Profile: React.FC<ProfileProps> = ({}) => {
<APAvatar author={item} /> <APAvatar author={item} />
<div> <div>
<div className='text-grey-600'> <div className='text-grey-600'>
<span className='mr-1 font-bold text-black'>{item.name || item.preferredUsername || 'Unknown'}</span> <span className='mr-1 font-bold text-black'>{getName(item)}</span>
<div className='text-sm'>{getUsername(item)}</div> <div className='text-sm'>{getUsername(item)}</div>
</div> </div>
</div> </div>
@ -235,7 +236,7 @@ const Profile: React.FC<ProfileProps> = ({}) => {
<APAvatar author={item} /> <APAvatar author={item} />
<div> <div>
<div className='text-grey-600'> <div className='text-grey-600'>
<span className='mr-1 font-bold text-black'>{item.name || item.preferredUsername || 'Unknown'}</span> <span className='mr-1 font-bold text-black'>{item.name || getName(item) || 'Unknown'}</span>
<div className='text-sm'>{getUsername(item)}</div> <div className='text-sm'>{getUsername(item)}</div>
</div> </div>
</div> </div>

3
apps/admin-x-activitypub/src/components/global/ViewProfileModal.tsx
View file

@ -13,6 +13,7 @@ import APAvatar from '../global/APAvatar';
import ActivityItem from '../activities/ActivityItem'; import ActivityItem from '../activities/ActivityItem';
import FeedItem from '../feed/FeedItem'; import FeedItem from '../feed/FeedItem';
import FollowButton from '../global/FollowButton'; import FollowButton from '../global/FollowButton';
import getName from '../../utils/get-name';
import getUsername from '../../utils/get-username'; import getUsername from '../../utils/get-username';
const noop = () => {}; const noop = () => {};
@ -86,7 +87,7 @@ const ActorList: React.FC<ActorListProps> = ({
<APAvatar author={actor} /> <APAvatar author={actor} />
<div> <div>
<div className='text-grey-600'> <div className='text-grey-600'>
<span className='mr-1 font-bold text-black'>{actor.name || actor.preferredUsername || 'Unknown'}</span> <span className='mr-1 font-bold text-black'>{getName(actor)}</span>
<div className='text-sm'>{getUsername(actor)}</div> <div className='text-sm'>{getUsername(actor)}</div>
</div> </div>
</div> </div>

16
apps/admin-x-activitypub/src/utils/get-name.ts Normal file
View file

@ -0,0 +1,16 @@
export default function getName(actor: {name: unknown, preferredUsername: unknown}): string {
if (typeof actor.name === 'string') {
return actor.name;
}
if (typeof actor.preferredUsername === 'string') {
return actor.preferredUsername;
}
if (typeof actor.preferredUsername === 'object' && actor.preferredUsername !== null) {
if ('@value' in actor.preferredUsername) {
if (typeof actor.preferredUsername['@value'] === 'string') {
return actor.preferredUsername['@value'];
}
}
}
return 'Unknown';
}