diff --git a/apps/admin-x-activitypub/src/components/ListIndex.tsx b/apps/admin-x-activitypub/src/components/ListIndex.tsx index 75e219edba..4c785eead9 100644 --- a/apps/admin-x-activitypub/src/components/ListIndex.tsx +++ b/apps/admin-x-activitypub/src/components/ListIndex.tsx @@ -4,7 +4,7 @@ import articleBodyStyles from './articleBodyStyles'; import getUsername from '../utils/get-username'; import {ActivityPubAPI} from '../api/activitypub'; import {ActorProperties, ObjectProperties} from '@tryghost/admin-x-framework/api/activitypub'; -import {Avatar, Button, ButtonGroup, Heading, Icon, List, ListItem, Page, SelectOption, SettingValue, ViewContainer, ViewTab} from '@tryghost/admin-x-design-system'; +import {Avatar, Button, ButtonGroup, Heading, List, ListItem, Page, SelectOption, SettingValue, ViewContainer, ViewTab} from '@tryghost/admin-x-design-system'; import {useBrowseSite} from '@tryghost/admin-x-framework/api/site'; import {useQuery} from '@tanstack/react-query'; import {useRouting} from '@tryghost/admin-x-framework/routing'; @@ -123,7 +123,6 @@ const ActivityPubComponent: React.FC = () => { actor={activity.actor} layout={selectedOption.value} object={activity.object} - type={activity.type} /> ))} @@ -321,7 +320,7 @@ ${image && ); }; -const ObjectContentDisplay: React.FC<{actor: ActorProperties, object: ObjectProperties, layout: string, type: string }> = ({actor, object, layout, type}) => { +const ObjectContentDisplay: React.FC<{actor: ActorProperties, object: ObjectProperties, layout: string }> = ({actor, object, layout}) => { const parser = new DOMParser(); const doc = parser.parseFromString(object.content || '', 'text/html'); @@ -397,31 +396,23 @@ const ObjectContentDisplay: React.FC<{actor: ActorProperties, object: ObjectProp return ( <> {object && ( -
- {(type === 'Announce' && object.type === 'Note') &&
-
- {actor.name} reposted -
} -
- -
-
- {(type === 'Announce' && object.type === 'Note') ? object.attributedTo?.name : actor.name} -
- {(type === 'Announce' && object.type === 'Note') ? getUsername(object.attributedTo) : getUsername(actor)} - {timestamp} -
-
-
-
- {object.name && {object.name}} -
- {/*

{object.content}

*/} - {renderAttachment()} -
-
+
+ +
+
+

{actor.name}

+ {getUsername(actor)} + {timestamp} +
+
+
+ {object.name && {object.name}} +

{plainTextContent}

+ {/*

{object.content}

*/} + {renderAttachment()} +
+
diff --git a/apps/admin-x-activitypub/src/styles/index.css b/apps/admin-x-activitypub/src/styles/index.css index a59dd422e7..c3b58ac682 100644 --- a/apps/admin-x-activitypub/src/styles/index.css +++ b/apps/admin-x-activitypub/src/styles/index.css @@ -22,17 +22,4 @@ animation: bump 0.3s ease-in-out; .ap-red-heart path { fill: #F50B23; -} - -.ap-note-content a { - color: rgb(236 72 153) !important; -} - -.ap-note-content a:hover { - color: rgb(219 39 119) !important; -} - -.ap-note-content p + p { - margin-top: 1.5rem !important; -} - +} \ No newline at end of file diff --git a/apps/admin-x-design-system/src/assets/icons/reload.svg b/apps/admin-x-design-system/src/assets/icons/reload.svg deleted file mode 100644 index 5afa3c7227..0000000000 --- a/apps/admin-x-design-system/src/assets/icons/reload.svg +++ /dev/null @@ -1 +0,0 @@ -Button Refresh Arrows Streamline Icon: https://streamlinehq.com \ No newline at end of file