Fix missing owner

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

Author: skjnldsv

lib/Sabre/Album/AlbumPhoto.php

@@ -30,6 +30,7 @@
 use OCP\Files\Node;
 use OCP\Files\File;
 use OCP\Files\NotFoundException;
+use OCP\IUser;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\IFile;
 
@@ -38,14 +39,16 @@ class AlbumPhoto implements IFile {
 	private AlbumInfo $album;
 	private AlbumFile $file;
 	private IRootFolder $rootFolder;
+	private IUser $user;
 
 	public const TAG_FAVORITE = '_$!<Favorite>!$_';
 
-	public function __construct(AlbumMapper $albumMapper, AlbumInfo $album, AlbumFile $file, IRootFolder $rootFolder) {
+	public function __construct(AlbumMapper $albumMapper, AlbumInfo $album, AlbumFile $file, IRootFolder $rootFolder, IUser $user) {
 		$this->albumMapper = $albumMapper;
 		$this->album = $album;
 		$this->file = $file;
 		$this->rootFolder = $rootFolder;
+		$this->user = $user;
 	}
 
 	/**
@@ -86,8 +89,9 @@ public function put($data) {
 	}
 
 	public function get() {
+		$currentUserUID = $this->user->getUID();
 		$nodes = $this->rootFolder
-			->getUserFolder($this->file->getOwner())
+			->getUserFolder($this->file->getOwner() ?: $currentUserUID)
 			->getById($this->file->getFileId());
 		$node = current($nodes);
 		if ($node) {
@@ -107,8 +111,9 @@ public function getFileId(): int {
 	}
 
 	public function getFileInfo(): Node {
+		$currentUserUID = $this->user->getUID();
 		$nodes = $this->rootFolder
-			->getUserFolder($this->file->getOwner())
+			->getUserFolder($this->file->getOwner() ?: $currentUserUID)
 			->getById($this->file->getFileId());
 		$node = current($nodes);
 		if ($node) {

lib/Sabre/Album/AlbumRoot.php

@@ -121,14 +121,14 @@ public function createDirectory($name) {
 
 	public function getChildren(): array {
 		return array_map(function (AlbumFile $file) {
-			return new AlbumPhoto($this->albumMapper, $this->album->getAlbum(), $file, $this->rootFolder);
+			return new AlbumPhoto($this->albumMapper, $this->album->getAlbum(), $file, $this->rootFolder, $this->user);
 		}, $this->album->getFiles());
 	}
 
 	public function getChild($name): AlbumPhoto {
 		foreach ($this->album->getFiles() as $file) {
 			if ($file->getFileId() . "-" . $file->getName() === $name) {
-				return new AlbumPhoto($this->albumMapper, $this->album->getAlbum(), $file, $this->rootFolder);
+				return new AlbumPhoto($this->albumMapper, $this->album->getAlbum(), $file, $this->rootFolder, $this->user);
 			}
 		}
 		throw new NotFound("$name not found");
@@ -163,9 +163,9 @@ protected function addFile(int $sourceId, string $ownerUID): bool {
 			throw new Conflict("File $sourceId is already in the folder");
 		}
 		if ($ownerUID === $uid) {
-			$this->albumMapper->addFile($this->album->getAlbum()->getId(), $sourceId);
+			$this->albumMapper->addFile($this->album->getAlbum()->getId(), $sourceId, $ownerUID);
 			$node = current($this->userFolder->getById($sourceId));
-			$this->album->addFile(new AlbumFile($sourceId, $node->getName(), $node->getMimetype(), $node->getSize(), $node->getMTime(), $node->getEtag(), $node->getCreationTime()));
+			$this->album->addFile(new AlbumFile($sourceId, $node->getName(), $node->getMimetype(), $node->getSize(), $node->getMTime(), $node->getEtag(), $node->getCreationTime(), $ownerUID));
 			return true;
 		}
 		return false;