aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib
diff options
context:
space:
mode:
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/activitypub/actors/shared/object-to-model-attributes.ts2
-rw-r--r--server/lib/activitypub/context.ts3
2 files changed, 1 insertions, 4 deletions
diff --git a/server/lib/activitypub/actors/shared/object-to-model-attributes.ts b/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
index d854bf2b5..3ce332681 100644
--- a/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
+++ b/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
@@ -32,7 +32,7 @@ function getActorAttributesFromObject (
32 32
33function getImagesInfoFromObject (actorObject: ActivityPubActor, type: ActorImageType) { 33function getImagesInfoFromObject (actorObject: ActivityPubActor, type: ActorImageType) {
34 const iconsOrImages = type === ActorImageType.AVATAR 34 const iconsOrImages = type === ActorImageType.AVATAR
35 ? actorObject.icons || actorObject.icon 35 ? actorObject.icon
36 : actorObject.image 36 : actorObject.image
37 37
38 return normalizeIconOrImage(iconsOrImages) 38 return normalizeIconOrImage(iconsOrImages)
diff --git a/server/lib/activitypub/context.ts b/server/lib/activitypub/context.ts
index eba6d636d..87eb498a3 100644
--- a/server/lib/activitypub/context.ts
+++ b/server/lib/activitypub/context.ts
@@ -27,9 +27,6 @@ const contextStore: { [ id in ContextType ]: (string | { [ id: string ]: string
27 language: 'sc:inLanguage', 27 language: 'sc:inLanguage',
28 identifier: 'sc:identifier', 28 identifier: 'sc:identifier',
29 29
30 // TODO: remove in a few versions, introduced in 4.2
31 icons: 'as:icon',
32
33 isLiveBroadcast: 'sc:isLiveBroadcast', 30 isLiveBroadcast: 'sc:isLiveBroadcast',
34 liveSaveReplay: { 31 liveSaveReplay: {
35 '@type': 'sc:Boolean', 32 '@type': 'sc:Boolean',