From a3b5608612ca35dbef8e38109407127241458b49 Mon Sep 17 00:00:00 2001
From: Stefano <stefano@stefanocoding.me>
Date: Wed, 5 Jul 2023 14:24:10 +0200
Subject: [PATCH 01/11] Update index.html - Mastodon Verification

---
 web/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/web/index.html b/web/index.html
index 162bef70..5c0d8979 100644
--- a/web/index.html
+++ b/web/index.html
@@ -102,6 +102,7 @@
 				"description": "An interactive map of Reddit's 2022 r/place, with information to each artwork of the canvas."
 			}
 		</script>
+		<link rel="me" href="https://enshittification.social/@Codixer">Mastodon</a>
 	</head>
 	<body>
 		<div id="wrapper" class="listHidden">
@@ -457,4 +458,4 @@ <h5 class="modal-title" id="donateModalLabel">Donation Links</h5>
 		<script src="./_js/minified.js"></script> -->
 		<pwa-update swpath="./sw.js"></pwa-update>
 	</body>
-</html>
\ No newline at end of file
+</html>

From 591a6416d53d8c844f0fd4f0ddbf9ab60680ce76 Mon Sep 17 00:00:00 2001
From: Stefano <stefano@stefanocoding.me>
Date: Wed, 5 Jul 2023 17:46:18 +0200
Subject: [PATCH 02/11] Update index.html

---
 web/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index 5c0d8979..e0dfc141 100644
--- a/web/index.html
+++ b/web/index.html
@@ -41,6 +41,7 @@
 		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-dark-5@1.1.3/dist/css/bootstrap-dark.min.css">
 		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
 		<link rel="manifest" href="./manifest.webmanifest">
+		<link rel="me" href="https://enshittification.social/@Codixer">Mastodon</link>
 		<script type="module" src="https://cdn.jsdelivr.net/npm/@pwabuilder/pwaupdate/dist/pwa-update.js"></script>
 		<script src="./_js/favicon.js" defer></script>
 		<script type="application/ld+json">
@@ -102,7 +103,6 @@
 				"description": "An interactive map of Reddit's 2022 r/place, with information to each artwork of the canvas."
 			}
 		</script>
-		<link rel="me" href="https://enshittification.social/@Codixer">Mastodon</a>
 	</head>
 	<body>
 		<div id="wrapper" class="listHidden">

From 54f9cd80db56984aa86726c25724196f910e45ea Mon Sep 17 00:00:00 2001
From: Stefano <stefano@stefanocoding.me>
Date: Wed, 5 Jul 2023 17:48:32 +0200
Subject: [PATCH 03/11] Update index.html - Please end my suffering

---
 web/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index e0dfc141..b3cd359d 100644
--- a/web/index.html
+++ b/web/index.html
@@ -41,7 +41,7 @@
 		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-dark-5@1.1.3/dist/css/bootstrap-dark.min.css">
 		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
 		<link rel="manifest" href="./manifest.webmanifest">
-		<link rel="me" href="https://enshittification.social/@Codixer">Mastodon</link>
+		<link rel="me" href="https://enshittification.social/@Codixer">
 		<script type="module" src="https://cdn.jsdelivr.net/npm/@pwabuilder/pwaupdate/dist/pwa-update.js"></script>
 		<script src="./_js/favicon.js" defer></script>
 		<script type="application/ld+json">

From a15dc4fb6e26dbe1e6e7054a01802bf116fbfcd2 Mon Sep 17 00:00:00 2001
From: Hans5958 <hans5958@outlook.com>
Date: Thu, 22 Jun 2023 18:52:29 +0700
Subject: [PATCH 04/11] Remove unused Netlify header config

---
 web/_headers | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/_headers b/web/_headers
index 6d3ad113..881b275a 100644
--- a/web/_headers
+++ b/web/_headers
@@ -1,9 +1,6 @@
 /*
   Access-Control-Allow-Origin: *
   
-/_img/place/*.png
-  cache-control: public, max-age=604800
-
 /_img/canvas/*/*.png
   cache-control: public, max-age=604800
 

From 6009434380b22ce845a3bc9c6710c43f428a05dc Mon Sep 17 00:00:00 2001
From: Hans5958 <hans5958@outlook.com>
Date: Thu, 22 Jun 2023 18:54:07 +0700
Subject: [PATCH 05/11] Fix description of ID in schema

---
 tools/schema/atlas.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/schema/atlas.json b/tools/schema/atlas.json
index 4559efb8..c1867e68 100644
--- a/tools/schema/atlas.json
+++ b/tools/schema/atlas.json
@@ -21,7 +21,7 @@
 							"description": "The ID of the entry. The value is a placeholder for new entries."
 						}
 					],
-					"description": "The ID of the entry. Usually, this is a number (string or number) this is the post ID of the new entry submission."
+					"description": "The ID of the entry. Usually, this is a number (preferably number, or string), or the post ID of the new entry submission."
 				},
 				"name": {
 					"type": "string",

From 7d769d502922feab964b25220b61f588a5fac801 Mon Sep 17 00:00:00 2001
From: Hans5958 <hans5958@outlook.com>
Date: Sat, 1 Jul 2023 16:37:56 +0700
Subject: [PATCH 06/11] Add data/patches to CODEOWNERS

---
 .github/CODEOWNERS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d3e86d03..3ca5195b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,2 @@
-web/atlas.json		@placeAtlas/archival-team
\ No newline at end of file
+web/atlas.json		@placeAtlas/archival-team
+data/patches		@placeAtlas/archival-team
\ No newline at end of file

From 8a53b17d957c6c2ea8119de7ca4e4ce088359b75 Mon Sep 17 00:00:00 2001
From: Hans5958 <hans5958@outlook.com>
Date: Sat, 1 Jul 2023 23:05:36 +0700
Subject: [PATCH 07/11] Save whole entry instead of just entry ID when editing

---
 web/_js/main/draw.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/web/_js/main/draw.js b/web/_js/main/draw.js
index f96dc76b..e6e646ed 100644
--- a/web/_js/main/draw.js
+++ b/web/_js/main/draw.js
@@ -43,7 +43,7 @@ const exportArea = document.getElementById("exportString")
 const subredditPattern = /^(?:(?:(?:(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com)?\/)?[rR]\/)?([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/[^" ]*)*$/
 const discordPattern = /^(?:(?:https?:\/\/)?(?:www\.)?(?:(?:discord)?\.?gg|discord(?:app)?\.com\/invite)\/)?([^\s/]+?)(?=\b)$/
 
-let entryId = undefined
+let entry
 let path = []
 let center = [canvasCenter.x, canvasCenter.y]
 
@@ -273,7 +273,7 @@ function initDraw() {
 
 	function generateExportObject() {
 		const exportObject = {
-			id: entryId ?? -1,
+			id: -1,
 			name: nameField.value,
 			description: descriptionField.value,
 			links: {},
@@ -336,8 +336,8 @@ function initDraw() {
 
 		let redditPostJsonString = "    " + prettyJsonString.split("\n").join("\n    ")
 		let redditPostUrl = `https://www.reddit.com/r/${instanceSubreddit}/submit?selftext=true&title=`
-		if (exportObject.id === 0) redditPostUrl += `✨%20${encodeURIComponent(exportObject.name)}`
-		else redditPostUrl += `✏%20${encodeURIComponent(exportObject.name)}`
+		if (exportObject.id === 0) redditPostUrl += `✨%20${encodeURIComponent(exportObject.name ?? entry.name)}`
+		else redditPostUrl += `✏%20${encodeURIComponent(exportObject.name ?? entry.name)}`
 		redditPostUrl += "&text="
 
 		if (encodeURIComponent(redditPostJsonString).length > 7579 - redditPostUrl.length) {
@@ -364,7 +364,7 @@ function initDraw() {
 		// GitHub
 
 		let githubPostJsonString = prettyJsonString
-		let githubPostUrl = `${instanceRepo}/new/cleanup/data/patches?filename=gh-${[...Array(4)].map(() => Math.floor(Math.random() * 16).toString(16)).join('')}-${slugify(exportObject.name)}.json&value=`
+		let githubPostUrl = `${instanceRepo}/new/cleanup/data/patches?filename=gh-${[...Array(4)].map(() => Math.floor(Math.random() * 16).toString(16)).join('')}-${slugify(exportObject.name ?? entry.name)}.json&value=`
 
 		if (encodeURIComponent(githubPostJsonString).length > 8192 - githubPostUrl.length) {
 			githubPostJsonString = miniJsonString
@@ -565,14 +565,12 @@ function initDraw() {
 	}
 
 	const getEntry = id => {
+		if (!id) return
 		const entries = atlasAll.filter(entry => entry.id.toString() === id.toString())
 		if (entries.length === 1) return entries[0]
-		return {}
+		return
 	}
 
-	const params = new URLSearchParams(document.location.search)
-
-
 	function addFieldButton(inputButton, inputGroup, array, index, name) {
 		if (inputButton.title === "Remove " + name) {
 			removeFieldButton(inputGroup, array, index)
@@ -756,9 +754,11 @@ function initDraw() {
 		inputGroup.appendChild(inputButton)
 	}
 
-	if (params.has('id') && getEntry(params.get('id'))) {
-		entryId = params.get('id')
-		const entry = getEntry(entryId)
+	const params = new URLSearchParams(document.location.search)
+	const entryId = params.get('id')
+	entry = getEntry(entryId)
+
+	if (entry) {
 
 		nameField.value = entry.name
 		descriptionField.value = entry.description
@@ -827,10 +827,10 @@ function initDraw() {
 		initPeriodGroups()
 	})
 
-	drawBackButton.href = "./" + formatHash(entryId, currentPeriod, currentPeriod, currentVariation)
+	drawBackButton.href = "./" + formatHash(entry?.id, currentPeriod, currentPeriod, currentVariation)
 
 	document.addEventListener('timeupdate', event => {
-		drawBackButton.href = "./" + formatHash(entryId, event.detail.period, event.detail.period, event.detail.variation)
+		drawBackButton.href = "./" + formatHash(entry?.id, event.detail.period, event.detail.period, event.detail.variation)
 	})
 
 }

From 0093632d0e7b5f2010096bce75aea83cc422cea8 Mon Sep 17 00:00:00 2001
From: Hans5958 <hans5958@outlook.com>
Date: Sat, 1 Jul 2023 23:06:06 +0700
Subject: [PATCH 08/11] Use structuredClone

---
 web/_js/main/draw.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/_js/main/draw.js b/web/_js/main/draw.js
index e6e646ed..320ebeea 100644
--- a/web/_js/main/draw.js
+++ b/web/_js/main/draw.js
@@ -285,7 +285,7 @@ function initDraw() {
 			if (!isNaN(Number(exportObject.id))) exportObject.id = Number(exportObject.id)
 		}
 
-		const pathWithPeriodsTemp = JSON.parse(JSON.stringify(pathWithPeriods))
+		const pathWithPeriodsTemp = structuredClone(pathWithPeriods)
 
 		for (let i = pathWithPeriodsTemp.length - 1; i > 0; i--) {
 			for (let j = 0; j < i; j++) {

From a19418b02c080264c0c054c9f925607c1a44e3c2 Mon Sep 17 00:00:00 2001
From: Hans5958 <hans5958@outlook.com>
Date: Sat, 1 Jul 2023 23:39:59 +0700
Subject: [PATCH 09/11] Pin defined paths on tool scripts to root of project

So it can run inside tools folders and on the root folder
---
 tools/aformatter.py       |  6 +++++-
 tools/ci/validate_json.py | 12 ++++++++----
 tools/create_patch.py     |  5 ++++-
 tools/merge_out.py        | 21 ++++++++++++---------
 tools/redditcrawl.py      |  8 ++++++--
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/tools/aformatter.py b/tools/aformatter.py
index 01913c9b..d016e607 100644
--- a/tools/aformatter.py
+++ b/tools/aformatter.py
@@ -7,6 +7,7 @@
 import math
 import traceback
 import tqdm
+import os
 
 END_NORMAL_IMAGE = "164"
 END_WHITEOUT_IMAGE = "166"
@@ -420,4 +421,7 @@ def go(path):
 
 if __name__ == '__main__':
 
-	go("../web/atlas.json")
+	while not os.path.exists('README.md'):
+		os.chdir('..')
+
+	go("web/atlas.json")
diff --git a/tools/ci/validate_json.py b/tools/ci/validate_json.py
index cf698286..f1bac310 100644
--- a/tools/ci/validate_json.py
+++ b/tools/ci/validate_json.py
@@ -6,16 +6,20 @@
 from pathlib import Path, PurePosixPath
 import os
 
-instance_path = "../../web/atlas.json"
+if len(sys.argv) == 1:
+	while not os.path.exists('README.md'):
+		os.chdir('..')
+
+instance_path = "web/atlas.json"
 
 # path override as 1st param: validate_json.py path_to_file.json
-if (len(sys.argv) > 1):
+if len(sys.argv) > 1:
 	instance_path = sys.argv[1]
 
-schema_path = "../schema/atlas.json"
+schema_path = "tools/schema/atlas.json"
 
 # schema override as 2nd param: validate_json.py [...] path_to_schema.json
-if (len(sys.argv) > 2):
+if len(sys.argv) > 2:
 	schema_path = sys.argv[2]
 
 relative_path = "file:" + str(PurePosixPath(Path(os.getcwd(), schema_path)))
diff --git a/tools/create_patch.py b/tools/create_patch.py
index 9e283ef3..8a3b83db 100644
--- a/tools/create_patch.py
+++ b/tools/create_patch.py
@@ -3,7 +3,10 @@
 import secrets
 from pathlib import Path
 
-patches_dir = "../data/patches/"
+while not os.path.exists('README.md'):
+	os.chdir('..')
+
+patches_dir = "data/patches/"
 Path(patches_dir).mkdir(parents=True, exist_ok=True)
 
 entry = None
diff --git a/tools/merge_out.py b/tools/merge_out.py
index e26e36ae..4075377f 100644
--- a/tools/merge_out.py
+++ b/tools/merge_out.py
@@ -9,13 +9,16 @@
 atlas_ids = {}
 authors = []
 
-with open('../web/all-authors.txt', 'r', encoding='utf-8') as authors_file:
+while not os.path.exists('README.md'):
+	os.chdir('..')
+
+with open('web/all-authors.txt', 'r', encoding='utf-8') as authors_file:
 	authors = authors_file.read().strip().split()
 
-with open('../data/read-ids.txt', 'r', encoding='utf-8') as ids_file:
+with open('data/read-ids.txt', 'r', encoding='utf-8') as ids_file:
 	out_ids = ids_file.read().strip().split()
 
-with open('../web/atlas.json', 'r', encoding='utf-8') as atlas_file:
+with open('web/atlas.json', 'r', encoding='utf-8') as atlas_file:
 	atlas_data = json.loads(atlas_file.read())
 
 last_id = 0
@@ -26,13 +29,13 @@
 	if id.isnumeric() and int(id) > last_id and int(id) - last_id < 100:
 		last_id = int(id)
 
-patches_dir = "../data/patches/"
-permanent_patch_file = "temp-atlas.json"
+patches_dir = "data/patches/"
+permanent_patch_file = "tools/temp-atlas.json"
 if not os.path.exists(patches_dir):
 	print("Patches folder not found. Exiting.")
 	exit()
 
-base_image_path = os.path.join('..', 'web', '_img', 'canvas', 'place30')
+base_image_path = os.path.join('web', '_img', 'canvas', 'place30')
 ScaleConfig.image1 = os.path.join(base_image_path, '159.png')
 
 filenames = os.listdir(patches_dir)
@@ -111,13 +114,13 @@
 		traceback.print_exc()
 
 print('Writing...')
-with open('../web/atlas.json', 'w', encoding='utf-8') as atlas_file:
+with open('web/atlas.json', 'w', encoding='utf-8') as atlas_file:
 	per_line_entries(atlas_data, atlas_file)
 
-with open('../data/read-ids.txt', 'w', encoding='utf-8') as ids_file:
+with open('data/read-ids.txt', 'w', encoding='utf-8') as ids_file:
 	ids_file.write("\n".join(out_ids) + "\n")
 
-with open('../web/all-authors.txt', 'w', encoding='utf-8') as authors_file:
+with open('web/all-authors.txt', 'w', encoding='utf-8') as authors_file:
 	authors_file.write("\n".join(authors) + "\n")
 
 print('All done.')
\ No newline at end of file
diff --git a/tools/redditcrawl.py b/tools/redditcrawl.py
index 9ad68aad..a940c1fc 100755
--- a/tools/redditcrawl.py
+++ b/tools/redditcrawl.py
@@ -34,8 +34,12 @@
 import humanize
 from datetime import datetime
 import secrets
+import os
 
-patches_dir = "../data/patches/"
+while not os.path.exists('README.md'):
+	os.chdir('..')
+
+patches_dir = "data/patches/"
 Path(patches_dir).mkdir(parents=True, exist_ok=True)
 
 def set_flair(submission, flair):
@@ -69,7 +73,7 @@ def set_flair(submission, flair):
 
 existing_ids = []
 
-with open('../data/read-ids.txt', 'r') as edit_ids_file:
+with open('data/read-ids.txt', 'r') as edit_ids_file:
 	for id in [x.strip() for x in edit_ids_file.readlines()]:
 		existing_ids.append(id)
 

From 6d9cb03d60dd8fe8c9f19e6914302c412838a285 Mon Sep 17 00:00:00 2001
From: Hans5958 <hans5958@outlook.com>
Date: Sat, 1 Jul 2023 23:53:48 +0700
Subject: [PATCH 10/11] Netlify: Show atlas with patches on preview, only build
 when relevant files changed

---
 netlify.toml              |  6 +++++-
 tools/ci/build-preview.sh | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tools/ci/build-preview.sh

diff --git a/netlify.toml b/netlify.toml
index f4d5a066..e252c6dc 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,6 +1,10 @@
 [build]
 	publish = "dist/"
 	command = "FILE=tools/ci/build-prod.sh; rm -rf dist/; if [ -f $FILE ]; then bash $FILE; else cp -r web/ dist/; fi"
+	ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF web/ .parcelrc netlify.toml package-lock.json package.json postcss.config.js"
 
 [build.environment]
-	PYTHON_VERSION = "3.8"
\ No newline at end of file
+	PYTHON_VERSION = "3.8"
+
+[context.deploy-preview]
+	command = "FILE=tools/ci/build-preview.sh; rm -rf dist/; if [ -f $FILE ]; then bash $FILE; else cp -r web/ dist/; fi"
diff --git a/tools/ci/build-preview.sh b/tools/ci/build-preview.sh
new file mode 100644
index 00000000..32ea7b05
--- /dev/null
+++ b/tools/ci/build-preview.sh
@@ -0,0 +1,22 @@
+# This command should be run on CI/Netlify enviroment!
+# If you really wanted to run it, run it on the root.
+
+rm -rf dist-temp
+rm -rf dist
+rm -rf .parcel-cache
+
+cp -r web/ dist-temp/
+
+npm i
+python tools/ci/cdn_to_local.py
+python tools/ci/merge_out.py	# On previews, attempt to merge patches
+npx parcel build dist-temp/index.html dist-temp/**.html --dist-dir "dist" --no-source-maps --no-content-hash
+
+rm -rf dist-temp
+
+cp -r web/_img/ dist/
+cp web/atlas.json dist/
+cp web/*.txt dist/
+cp web/_headers dist/
+cp web/favicon.ico dist/
+cp web/sw.js dist/
\ No newline at end of file

From aca41bc4e78c1331a419f69865ec1a5812d248cb Mon Sep 17 00:00:00 2001
From: Hans5958 <hans5958@outlook.com>
Date: Sun, 2 Jul 2023 00:02:33 +0700
Subject: [PATCH 11/11] Netlify: Forgot to build when there are patches changes

---
 netlify.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netlify.toml b/netlify.toml
index e252c6dc..c743854b 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -8,3 +8,4 @@
 
 [context.deploy-preview]
 	command = "FILE=tools/ci/build-preview.sh; rm -rf dist/; if [ -f $FILE ]; then bash $FILE; else cp -r web/ dist/; fi"
+	ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF data/patches/ web/ .parcelrc netlify.toml package-lock.json package.json postcss.config.js"
