summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Kangas <gabek@real-ity.com>2022-01-20 14:56:04 -0800
committerGabe Kangas <gabek@real-ity.com>2022-01-20 14:56:04 -0800
commita471707a54e2bde7c6dbb6632d81e44ecd17a0c7 (patch)
tree2f8aaa7ef1adf4bb674d8cda0bfd9dcf5f60ce35
parent372b1059c024635325c123d9fc5d7dd660ff2da5 (diff)
Fix misskey-specific error of existing-but-null avatar. Closes #1689
-rw-r--r--activitypub/apmodels/actor.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/activitypub/apmodels/actor.go b/activitypub/apmodels/actor.go
index 5c96e0ebb..9b335d59e 100644
--- a/activitypub/apmodels/actor.go
+++ b/activitypub/apmodels/actor.go
@@ -52,7 +52,7 @@ func MakeActorFromPerson(person vocab.ActivityStreamsPerson) ActivityPubActor {
W3IDSecurityV1PublicKey: person.GetW3IDSecurityV1PublicKey(),
}
- if person.GetActivityStreamsIcon() != nil && person.GetActivityStreamsIcon().Len() > 0 {
+ if person.GetActivityStreamsIcon() != nil && person.GetActivityStreamsIcon().Len() > 0 && person.GetActivityStreamsIcon().At(0).GetActivityStreamsImage() != nil {
apActor.Image = person.GetActivityStreamsIcon().At(0).GetActivityStreamsImage().GetActivityStreamsUrl().Begin().GetIRI()
}
@@ -71,7 +71,7 @@ func MakeActorFromService(service vocab.ActivityStreamsService) ActivityPubActor
W3IDSecurityV1PublicKey: service.GetW3IDSecurityV1PublicKey(),
}
- if service.GetActivityStreamsIcon() != nil && service.GetActivityStreamsIcon().Len() > 0 {
+ if service.GetActivityStreamsIcon() != nil && service.GetActivityStreamsIcon().Len() > 0 && service.GetActivityStreamsIcon().At(0).GetActivityStreamsImage() != nil {
apActor.Image = service.GetActivityStreamsIcon().At(0).GetActivityStreamsImage().GetActivityStreamsUrl().Begin().GetIRI()
}