Merge pull request #4252 from nextcloud/backport/4249/stable6.1

[stable6.1] fix: check if photo property is set before downloading
nextcloud · Dec 13, 2024 · 795860f · 795860f
2 parents 866db45 + 243d957
commit 795860f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/components/ContactsList/ContactsListItem.vue b/src/components/ContactsList/ContactsListItem.vue
@@ -141,7 +141,7 @@ export default {
 					return
 				}
 				this.avatarUrl = photoUrl
-			} else if (this.source.url) {
+			} else if (this.source.hasPhoto && this.source.url) {
 				this.avatarUrl = `${this.source.url}?photo`
 			}
 		},

diff --git a/src/models/contact.js b/src/models/contact.js
@@ -209,6 +209,16 @@ export default class Contact {
 		this.vCard.updatePropertyWithValue('photo', photo)
 	}
 
+	/**
+	 * Return whether a photo is available
+	 *
+	 * @readonly
+	 * @memberof Contact
+ 	 */
+	get hasPhoto() {
+		return this.dav && this.dav.hasphoto
+	}
+
 	/**
 	 * Return the photo usable url
 	 * We cannot fetch external url because of csp policies