aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-02-17 15:34:42 +0100
committerChocobozzz <me@florianbigard.com>2020-02-17 15:34:42 +0100
commit2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89 (patch)
treea814ca1ab71078abe008dae7afc646fb388ca1d8 /server
parent8d3fe90c3f3bfd43366ea41a2519431b9001e744 (diff)
parent1c5fbed2093c0462e40a092d49d761a043c50e98 (diff)
downloadPeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.tar.gz
PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.tar.zst
PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.zip
Merge branch 'release/2.1.0' into develop
Diffstat (limited to 'server')
-rw-r--r--server/lib/activitypub/actor.ts4
-rw-r--r--server/lib/activitypub/process/process-follow.ts2
2 files changed, 3 insertions, 3 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 })
diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts
index 85f22d654..0b98d4af2 100644
--- a/server/lib/activitypub/process/process-follow.ts
+++ b/server/lib/activitypub/process/process-follow.ts
@@ -59,7 +59,7 @@ async function processFollow (byActor: MActorSignature, targetActorURL: string)
59 transaction: t 59 transaction: t
60 }) 60 })
61 61
62 if (actorFollow.state !== 'accepted' && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false) { 62 if (actorFollow.state !== 'accepted' && isFollowingInstance && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false) {
63 actorFollow.state = 'accepted' 63 actorFollow.state = 'accepted'
64 await actorFollow.save({ transaction: t }) 64 await actorFollow.save({ transaction: t })
65 } 65 }