Merge pull request #1415 from placeAtlas/cleanup

Cleanup sync

data/read-ids.txt

@@ -11563,3 +11563,79 @@ zznclm
 10c6ir7
 10c6gxn
 10cddz9
+10cwe9b
+10cu27p
+10czxwp
+10czwgd
+10czt69
+10d135m
+10d0uy3
+10d0qdo
+10du133
+10dtngf
+10dtjia
+10dsorx
+10dp2l1
+10doxpy
+10dok31
+10dutf3
+10duqkf
+10dunzp
+10dukih
+10dufgm
+10dxzm2
+10dxxji
+10dxrss
+10dxkmy
+10ejebe
+10ejczf
+10ejc6i
+10eja7w
+10ej9mo
+10eiyoi
+10eit0z
+10eiogm
+10enakz
+10er1x2
+10fn0o8
+10fmz7x
+10fmwqo
+10fmv31
+10flxll
+10flvgu
+10fp69p
+10fp5ht
+10fp3l3
+10foxj2
+10fpvuy
+10fpv34
+10fpqpz
+10fpeoc
+10gkbe2
+10gk9ya
+10gk86s
+10gh91g
+10gmh8s
+10gmgnn
+10gmfg9
+10gmd9b
+10gmb1x
+10gm930
+10gm7b2
+10gl145
+10gkzne
+10gkyps
+10gkmbx
+10gmiui
+10gn4l2
+10h3zmt
+10h3xgo
+10hg360
+10hfwqh
+10hfjyn
+10hgh0q
+10hh6jk
+10hh1w3
+10hh00r
+10hgy65
+10hgrxh

tools/formatter.py

@@ -28,26 +28,26 @@
 """
 FS_REGEX = {
 	"commatization": r'[,;& ]+(?:and)?[,;& ]*?',
-	"pattern1": r'\/*[rR]\/([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/$)?',
-	"pattern2": r'^\/*[rR](?!\/)([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/$)?',
-	"pattern3": r'(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com\/r\/([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/[^" ]*)*',
-	"pattern1user": r'\/*(?:u|user)\/([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/$)?',
-	"pattern2user": r'^\/*(?:u|user)(?!\/)([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/$)?',
-	"pattern3user": r'(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com\/(?:u|user)\/([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/[^" ]*)*',
-	"pattern1new": r'(?:(?:(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com)?\/)?[rR]\/([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/[^" ]*)*'
+	"pattern1": r'\/*[rR]\/([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/$)?',
+	"pattern2": r'^\/*[rR](?!\/)([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/$)?',
+	"pattern3": r'(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com\/r\/([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/[^" ]*)*',
+	"pattern1user": r'\/*(?:u|user)\/([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/$)?',
+	"pattern2user": r'^\/*(?:u|user)(?!\/)([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/$)?',
+	"pattern3user": r'(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com\/(?:u|user)\/([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/[^" ]*)*',
+	"pattern1new": r'(?:(?:(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com)?\/)?[rR]\/([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/[^" ]*)*'
 	# "pattern4": r'(?:https?:\/\/)?(?!^www\.)(.+)\.reddit\.com(?:\/[^"]*)*',
 	# "pattern5": r'\[(?:https?:\/\/)?(?!^www\.)(.+)\.reddit\.com(?:\/[^"]*)*\]\((?:https:\/\/)?(?!^www\.)(.+)\.reddit\.com(?:\/[^"]*)*\)"',
 }
 
 VALIDATE_REGEX = {
-	"subreddit": r'^ *\/?r\/([A-Za-z0-9][A-Za-z0-9_]{2,20}) *(, *\/?r\/([A-Za-z0-9][A-Za-z0-9_]{2,20}) *)*$|^$',
+	"subreddit": r'^ *\/?r\/([A-Za-z0-9][A-Za-z0-9_]{2,20}) *(, *\/?r\/([A-Za-z0-9][A-Za-z0-9_]{1,20}) *)*$|^$',
 	"website": r'^https?://[^\s/$.?#].[^\s]*$|^$'
 }
 
 CL_REGEX = r'\[(.+?)\]\((.+?)\)'
 CWTS_REGEX = {
-	"url": r'^(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com\/r\/([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/)?$',
-	"subreddit": r'^\/*[rR]\/([A-Za-z0-9][A-Za-z0-9_]{2,20})\/?$'
+	"url": r'^(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com\/r\/([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/)?$',
+	"subreddit": r'^\/*[rR]\/([A-Za-z0-9][A-Za-z0-9_]{1,20})\/?$'
 }
 CSTW_REGEX = {
 	"website": r'^https?://[^\s/$.?#].[^\s]*$',

tools/migrate_atlas_format.py

@@ -16,7 +16,7 @@
 EXPANSION_2_RANGE = (109, END_IMAGE)
 
 COMMATIZATION = re.compile(r'[,;& ]+(?:and)?[,;& ]*?')
-FS_REGEX = re.compile(r'(?:(?:(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com)?\/)?[rR]\/([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/[^" ]*)*')
+FS_REGEX = re.compile(r'(?:(?:(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com)?\/)?[rR]\/([A-Za-z0-9][A-Za-z0-9_]{1,20})(?:\/[^" ]*)*')
 
 def migrate_atlas_format(entry: dict):
 	new_entry = {

web/_js/draw.js

@@ -43,7 +43,7 @@ const discordGroup = document.getElementById("discordGroup")
 const wikiGroup = document.getElementById("wikiGroup")
 const exportArea = document.getElementById("exportString")
 
-const subredditPattern = /^(?:(?:(?:(?:(?:https?:\/\/)?(?:(?:www|old|new|np)\.)?)?reddit\.com)?\/)?[rR]\/)?([A-Za-z0-9][A-Za-z0-9_]{2,20})(?:\/[^" ]*)*$/
+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 = 0