Merge branch 'master' into master

CONTRIBUTING.md

@@ -1,23 +1,35 @@
-# How To Contribute
+# Contributing
 
-## Contributing to the Map
+This project is open source. You may contribute to the project by submitting a Pull Request on the GitHub repo.
 
-To contribute to the map, we require a certain format for artwork region and labels. This can be generated on the [contributing page](/index.html?mode=draw) on the website.
+## Map Contributions
 
-You can either post this contribution to the subreddit, or make a Pull Request on the GitHub repo.
+<h3><b>WE ONLY ACCEPT NEW CONTRIBUTIONS ON REDDIT</b></h3>
+
+To contribute to the map, we require a certain format for artwork region and labels. This can be generated on the [contributing page](https://place-atlas.stefanocoding.me/index.html?mode=draw) on the website. 
 
 ### Reddit Submission
 
-1. Follow the instructions on the [contributing page](/index.html?mode=draw), then click "Post Direct to Reddit".
+1. Follow the instructions on the [contributing page](https://place-atlas.stefanocoding.me/index.html?mode=draw), then click "Post Direct to Reddit".
 2. Flair your post with the "New Entry" tag.
 3. A moderator will accept your contribution shortly.
 
+<!--
+
 ### GitHub Submission
 
 1. Create a fork of our repo.
 2. Enter your data into the `web/_js/atlas.js` file, with the correct format and ID number.
 3. Create a Pull Request.
 
-## Contributing to the Project
+-->
 
-This project is open source. You may contribute to the project by submitting a Pull Request on the GitHub repo.
+## Map Edits
+
+1. Create a fork of our repo.
+2. Enter your data into the `web/_js/atlas.json` file, with the correct format and ID number.
+3. Create a Pull Request against the `/cleanup` branch.
+
+## Cleaning Contributions
+
+If you spot a duplicate, please PR against `/cleanup`. To help find duplicates, run the code locally, changing line 92 of `main.js` to `overlap`.

README.md

@@ -1,9 +1,43 @@
 # The Place Atlas
-The /r/place Atlas is a project aiming to catalog all the artworks created during Reddit's 2022's /r/place event.
+The /r/place Atlas is a project aiming to catalog all the artworks created during Reddit's 2022 /r/place event.
 This project was created by Roland Rytz and is licensed under the GNU Affero General Public License v3.0.
 
 ---
 
-*You can check out the website at by clicking [here](https://place-atlas.stefanocoding.me/).*
+*You can check out the website by clicking [here](https://place-atlas.stefanocoding.me/).*
 
-To submit new entries or request changes to existing ones, please visist [/r/placeAtlas2](https://www.reddit.com/r/placeAtlas2/).
+If you don't know GitHub and wanted to submit new entries or request changes to existing ones, please visit [/r/placeAtlas2](https://www.reddit.com/r/placeAtlas2/).
+
+## How To Contribute
+
+### Map Contributions
+
+<h4><b>WE ONLY ACCEPT NEW CONTRIBUTIONS ON REDDIT</b></h4>
+
+To contribute to the map, we require a certain format for artwork region and labels. This can be generated on the [contributing page](https://place-atlas.stefanocoding.me/index.html?mode=draw) on the website. 
+
+#### Reddit Submission
+
+1. Follow the instructions on the [contributing page](https://place-atlas.stefanocoding.me/index.html?mode=draw), then click "Post Direct to Reddit".
+2. Flair your post with the "New Entry" tag.
+3. A moderator will accept your contribution shortly.
+
+<!--
+
+#### GitHub Submission
+
+1. Create a fork of our repo.
+2. Enter your data into the `web/_js/atlas.js` file, with the correct format and ID number.
+3. Create a Pull Request.
+
+-->
+
+### Map Edits
+
+1. Create a fork of our repo.
+2. Enter your data into the `web/_js/atlas.json` file, with the correct format and ID number.
+3. Create a Pull Request against the `/cleanup` branch.
+
+### Cleaning Contributions
+
+If you spot a duplicate, please PR against `/cleanup`. To help find duplicates, run the code locally, changing line 92 of `main.js` to `overlap`.

tools/redditcrawl.py

@@ -24,7 +24,7 @@
 	existing_ids.append(item['id'])
 
 
-for submission in reddit.subreddit('placeAtlas2').new(limit=500):
+for submission in reddit.subreddit('placeAtlas2').new(limit=1000):
 	"""
 	Auth setup
 	1. Head to https://www.reddit.com/prefs/apps
@@ -47,6 +47,7 @@
 	"""
 	#print(dir(submission))
 	if (submission.id in existing_ids):
+		print("Found first duplicate!")
 		break
 	if(submission.link_flair_text == "New Entry"):
 		text = submission.selftext

web/index.html

@@ -175,8 +175,8 @@ <h1 id="title">The /r/place Atlas</h1>
 					When you're happy with the result, click the "Finish" button above or press the Enter key.</p>
 					<p>You can then add more information about your object.</p>
 					<div style="background-color:#666; padding:20px">
-						<p><b>Handy with GitHub?</b></p>
+						<p><b>Warning</b></p>
-						<p>You can contribute directly with a Pull Request <a href="https://github.com/Codixer/place-atlas/blob/master/web/_js/atlas.js">here!</a></p>
+						<p><b>DO NOT</b> include the character <b>"</b> (quotation marks) in your submission. It will not be approved.</p>
 					</div><br>
 					<div style="background-color:#7289DA; padding:20px">
 						<p><b>Need Help?</b></p>
@@ -195,8 +195,8 @@ <h1 id="title">The /r/place Atlas</h1>
 					new text post to <a target="_blank" href="https://www.reddit.com/r/placeAtlas2/">/r/placeAtlas2</a> on Reddit.</p>
 					<p>I will then check it and add it to the atlas.</p>
 					<div style="background-color:#666; padding:5px">
-						<p><b>Handy with GitHub?</b></p>
+						<p><b>Warning</b></p>
-						<p>You can contribute directly with a Pull Request <a href="https://github.com/Codixer/place-atlas/blob/master/web/_js/atlas.js">here!</a></p>
+						<p><b>DO NOT</b> include the character <b>"</b> (quotation marks) in your submission. It will not be approved.</p>
 					</div>
 					<textarea cols="50" rows="5" id="exportString"></textarea>
 					<div style="display:flex; flex-direction:column;align-items:center">