From 9665db7bbe8a95df6e57e73e901e193e98eaff44 Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Mon, 1 May 2023 20:26:04 +0200
Subject: [PATCH] user files fixes

---
 src/modules/api/submodules/userFiles.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/api/submodules/userFiles.ts b/src/modules/api/submodules/userFiles.ts
index cc3685b..2f42f8b 100644
--- a/src/modules/api/submodules/userFiles.ts
+++ b/src/modules/api/submodules/userFiles.ts
@@ -23,7 +23,7 @@ import fs from 'fs'
 import logger from '../../../utils/logger'
 import utils from '../../../utils/utils'
 import { Request, SubmoduleData, User } from '../../../types/basicTypes'
-import { paths, publicDir } from '../../../utils/files'
+import { paths } from '../../../utils/files'
 import constants from '../../../constants'
 
 export interface UserDirDataFile {
@@ -33,9 +33,9 @@ export interface UserDirDataFile {
     downvotes: number[]
 }
 
-function listDir(subdir: string, userFilesDir: string) {
+function listDir(subdir: string) {
     const safeSubdir = subdir.replace(/\.+/g, '').replace(/\/+/g, '')
-    const dir = userFilesDir + '/' + safeSubdir
+    const dir = paths.userFilesDir + '/' + safeSubdir
     const usersFile = dir + '/' + constants.userFilesDataFileName
 
     if (!utils.FileExists(dir)) {
@@ -67,7 +67,7 @@ function listDir(subdir: string, userFilesDir: string) {
 
             acc.push({
                 name: file,
-                path: dir.replace(publicDir, '') + '/' + file,
+                path: dir.replace('public/', '') + '/' + file,
                 size: stat.size,
                 date: stat.mtime.getTime(),
                 user: users && users[file] ? users[file].uid : -1,
@@ -105,7 +105,7 @@ function setup(data: SubmoduleData): void {
                 const dir = x[2]
                 const fname = x.pop()
                 const dataFilePath =
-                    publicDir +
+                    paths.userFilesDir +
                     '/' +
                     dir +
                     '/' +
@@ -138,7 +138,7 @@ function setup(data: SubmoduleData): void {
         const subdir: string = req.query.subdir
 
         if (subdir) {
-            const result = listDir(subdir, paths.userFilesDir)
+            const result = listDir(subdir)
             res.json(result)
         } else {
             res.json({
@@ -331,7 +331,7 @@ function setup(data: SubmoduleData): void {
             utils.WriteFile(JSON.stringify(data), dataFilePath)
         }
 
-        const result = listDir(dir, paths.userFilesDir)
+        const result = listDir(dir)
         res.json(result)
     })
 
@@ -348,7 +348,7 @@ function setup(data: SubmoduleData): void {
             })
             return
         }
-        const result = listDir(name, paths.userFilesDir)
+        const result = listDir(name)
         if (result.files.length === 0) {
             utils.deleteDir(paths.userFilesDir + '/' + safeName)
         } else {