merge: upstream changes

2023-10-18 19:48:03 +02:00
parent c4b0f47ba1 de6e15e36d
commit 4b230d792c
63 changed files with 1250 additions and 830 deletions
@@ -83,7 +83,7 @@ export class FeedService {
 				date: this.idService.parse(note.id).date,
 				description: note.cw ?? undefined,
 				content: note.text ?? undefined,
-				image: file ? this.driveFileEntityService.getPublicUrl(file) ?? undefined : undefined,
+				image: file ? this.driveFileEntityService.getPublicUrl(file) : undefined,
 			});
 		}