From a8b985240d2be4d73dad0a0174b57f8b0652f846 Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Sun, 22 Aug 2021 16:33:28 +0300
Subject: [PATCH] fix: anon upload and domain fix for album links (#292)

---
 src/api/routes/service/configGET.js | 3 ++-
 src/api/utils/Util.js               | 6 +++---
 src/site/store/config.js            | 7 +++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/api/routes/service/configGET.js b/src/api/routes/service/configGET.js
index 4baf627..f69d9eb 100644
--- a/src/api/routes/service/configGET.js
+++ b/src/api/routes/service/configGET.js
@@ -21,7 +21,8 @@ class configGET extends Route {
 				metaThemeColor: Util.config.metaThemeColor,
 				metaDescription: Util.config.metaDescription,
 				metaKeywords: Util.config.metaKeywords,
-				metaTwitterHandle: Util.metaTwitterHandle
+				metaTwitterHandle: Util.metaTwitterHandle,
+				domain: process.env.domain
 			}
 		});
 	}
diff --git a/src/api/utils/Util.js b/src/api/utils/Util.js
index 4e91954..b243b2b 100644
--- a/src/api/utils/Util.js
+++ b/src/api/utils/Util.js
@@ -289,10 +289,10 @@ class Util {
 		const dbFile = await db.table('files')
 			// eslint-disable-next-line func-names
 			.where(function() {
-				if (user === undefined) {
-					this.whereNull('userId');
-				} else {
+				if (user) {
 					this.where('userId', user.id);
+				} else {
+					this.whereNull('userId');
 				}
 			})
 			.where({
diff --git a/src/site/store/config.js b/src/site/store/config.js
index 124b778..eec0d8f 100644
--- a/src/site/store/config.js
+++ b/src/site/store/config.js
@@ -29,5 +29,12 @@ export const mutations = {
 		state.chunkSize = config.chunkSize;
 		state.publicMode = config.publicMode;
 		state.userAccounts = config.userAccounts;
+		state.URL = config.domain;
+		const lastChar = config.domain.substr(-1);
+		if (lastChar === '/') {
+			state.baseURL = `${config.domain}api`;
+		} else {
+			state.baseURL = `${config.domain}/api`;
+		}
 	}
 };