diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-02-17 15:34:42 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-02-17 15:34:42 +0100 |
| commit | 2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89 (patch) | |
| tree | a814ca1ab71078abe008dae7afc646fb388ca1d8 /server/lib/activitypub/actor.ts | |
| parent | 8d3fe90c3f3bfd43366ea41a2519431b9001e744 (diff) | |
| parent | 1c5fbed2093c0462e40a092d49d761a043c50e98 (diff) | |
| download | PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.tar.gz PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.tar.zst PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.zip | |
Merge branch 'release/2.1.0' into develop
Diffstat (limited to 'server/lib/activitypub/actor.ts')
| -rw-r--r-- | server/lib/activitypub/actor.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index fd934443b..9eabef4b0 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts | |||
| @@ -176,8 +176,8 @@ async function updateActorAvatarInstance (actor: MActorDefault, info: AvatarInfo | |||
| 176 | if (!info.name) return actor | 176 | if (!info.name) return actor |
| 177 | 177 | ||
| 178 | if (actor.Avatar) { | 178 | if (actor.Avatar) { |
| 179 | // Don't update the avatar if the filename did not change | 179 | // Don't update the avatar if the file URL did not change |
| 180 | if (actor.Avatar.fileUrl === info.fileUrl) return actor | 180 | if (info.fileUrl && actor.Avatar.fileUrl === info.fileUrl) return actor |
| 181 | 181 | ||
| 182 | try { | 182 | try { |
| 183 | await actor.Avatar.destroy({ transaction: t }) | 183 | await actor.Avatar.destroy({ transaction: t }) |