From 4a9be92b8ecff3a0666e547090b463decc6d22fe Mon Sep 17 00:00:00 2001
From: Gerben <gerben@treora.com>
Date: Thu, 4 Oct 2018 16:22:17 +0200
Subject: [PATCH] Update to use raw/u/{userId} paths

---
 lib/Controller/findMementos.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Controller/findMementos.php b/lib/Controller/findMementos.php
index c71aee0..4bb53d5 100644
--- a/lib/Controller/findMementos.php
+++ b/lib/Controller/findMementos.php
@@ -24,7 +24,7 @@ trait MementoFinder {
 		// If logged in, and asking for one's own mementos, get private mementos too.
 		if ($this->loggedInUserId === $userId) {
 			$userFolder = $this->serverContainer->getUserFolder($this->loggedInUserId);
-			$moreMementos = findPrivateMementos($userFolder);
+			$moreMementos = findPrivateMementos($userFolder, $this->loggedInUserId);
 			$foundMementos = array_merge($foundMementos, $moreMementos);
 		}
 
@@ -48,7 +48,7 @@ trait MementoFinder {
 		// If logged in, get current user's private mementos too.
 		if ($this->loggedInUserId) {
 			$userFolder = $this->serverContainer->getUserFolder($this->loggedInUserId);
-			$moreMementos = findPrivateMementos($userFolder);
+			$moreMementos = findPrivateMementos($userFolder, $this->loggedInUserId);
 			$foundMementos = array_merge($foundMementos, $moreMementos);
 		}
 
@@ -56,16 +56,16 @@ trait MementoFinder {
 	}
 }
 
-function findPrivateMementos($folder) {
-	$urlForFile = function ($file) use ($folder) {
+function findPrivateMementos($userFolder, $userId) {
+	$urlForFile = function ($file) use ($userFolder, $userId) {
 		$absoluteFilePath = $file->getPath();
-		$relativeFilePath = $folder->getRelativePath($absoluteFilePath);
-		$rawFileUrl = joinPaths("/apps/raw/files", $relativeFilePath); // XXX hardcoded dependency
+		$relativeFilePath = $userFolder->getRelativePath($absoluteFilePath);
+		$rawFileUrl = joinPaths("/apps/raw/u/$userId", $relativeFilePath); // XXX hardcoded dependency
 		return $rawFileUrl;
 	};
 
 	// Peek into each HTML file the user owns, and return those that are mementos.
-	$files = $folder->searchByMime('text/html');
+	$files = $userFolder->searchByMime('text/html');
 	$foundMementos = [];
 	foreach ($files as $file) {
 		$mementoInfo = extractMementoInfo($file);