Merge pull request #36 from zer0bin-dev/main

ThatOneCalculator · web-flow · commit b85e3fa1d1ce · 2022-03-22T10:15:58.000-07:00
diff --git a/.github/ISSUE_TEMPLATE/03_public_instance.md b/.github/ISSUE_TEMPLATE/03_public_instance.md
@@ -12,19 +12,13 @@ Thanks for offering us your public instance!
 
 ## Details
 
-What country is the server in: 
-
-What server hardware/provider is the server on:
-
-Are you using CloudFlare or any Google serives (domain, DNS, etc): 
-
-What version of zer0bin is it running: 
-
-Have you made any modifications to zer0bin? If so, what?: 
-
-What are the ratelimits: 
-
-What is the expiration time of pastes: 
-
-What is the max paste size: 
+- Domain name:
+- What country is the server in: 
+- What server hardware/provider is the server on:
+- Are you using CloudFlare or any Google services (domain, DNS, etc): 
+- What version of zer0bin is it running: 
+- Have you made any modifications to zer0bin? If so, what?: 
+- What are the ratelimits: 
+- What is the expiration time of pastes:
+- What is the max paste size: 
 
diff --git a/README.md b/README.md
@@ -27,14 +27,15 @@ Submit your public instance [here](https://github.com/Domterion/zer0bin/issues/n
 
 | Website                                        | Expiration | Max paste size | Version | Country |
 | ---------------------------------------------- | ---------- | -------------- | ------- | ------- |
-| zer0b.in                                       | 7 days     | 40,000 chars   | v1.0.0  | 🇺🇸 USA  |
+| [zer0b.in](https://zer0b.in)                   | 90 days    | 50,000 chars   | v0.7.1  | 🇺🇸 USA  |
 | [stepbro.voring.me](https://stepbro.voring.me) | 365 days   | 69,000 chars   | v0.7.1  | 🇺🇸 USA  |
+| [tinker.nz](https://tinker.nz/)                | 28 days    | 69,420 chars   | v0.7.1  | 🇳🇿 NZ   |
 
 # Technologies used
 
 ### Frontend:
 
-<a href="https://www.typescriptlang.org/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/TypeScript.svg" height=40/></a> <a href="https://sass-lang.com/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/Sass.svg" height=40/></a> <a href="https://pugjs.org/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/Pug-Dark.svg" height=40/></a> <a href="https://rosepinetheme.com/"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953176309444542464/RosePine.svg" height=40/></a> <a href="https://highlightjs.org/"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953177926688464936/HLJS.svg" height=40/></a> <a href="https://github.com/ant-design/ant-design-icons"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953181625259266059/AntIcons-Dark.svg" height=40/></a> <a href="https://github.com/idiotWu/smooth-scrollbar"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953564432628322364/SmoothScrollJS.svg" height=40/></a><br><a href="https://atomiks.github.io/tippyjs/"><img src="https://cdn.discordapp.com/attachments/872332549777666078/955624715521769522/Tippy.svg" height=40/></a> <a href="https://github.com/loonywizard/js-confetti"><img src="https://cdn.discordapp.com/attachments/810799100940255260/955609316042362930/JSConfetti.svg" height=40/></a> <a href="https://definitelytyped.org/"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953567495321710602/DefinitelyTyped.svg" height=40/></a> <a href="https://parceljs.org/"><img src="https://user-images.githubusercontent.com/44733677/158683062-17ac3b62-cacd-4add-babb-1f74f36020d8.svg" height=40/></a> <a href="https://prettier.io/"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953339670538887318/Prettier.svg" height=40/></a> <a href="https://yarnpkg.org"><img src="https://cdn.discordapp.com/attachments/810799100940255260/954823377493852170/Yarn.svg" height=40/></a> <a href="https://transfonter.org"><img src="https://user-images.githubusercontent.com/44733677/159066877-234f68ba-e95c-439d-b5fe-74def49dc762.svg" height=40></a>
+<a href="https://www.typescriptlang.org/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/TypeScript.svg" height=40/></a> <a href="https://sass-lang.com/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/Sass.svg" height=40/></a> <a href="https://pugjs.org/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/Pug-Dark.svg" height=40/></a> <a href="https://rosepinetheme.com/"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953176309444542464/RosePine.svg" height=40/></a> <a href="https://highlightjs.org/"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953177926688464936/HLJS.svg" height=40/></a> <a href="https://github.com/ant-design/ant-design-icons"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953181625259266059/AntIcons-Dark.svg" height=40/></a> <a href="https://github.com/idiotWu/smooth-scrollbar"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953564432628322364/SmoothScrollJS.svg" height=40/></a><br><a href="https://atomiks.github.io/tippyjs/"><img src="https://cdn.discordapp.com/attachments/872332549777666078/955624715521769522/Tippy.svg" height=40/></a> <a href="https://github.com/loonywizard/js-confetti"><img src="https://cdn.discordapp.com/attachments/810799100940255260/955609316042362930/JSConfetti.svg" height=40/></a> <a href="https://github.com/hadialqattan/no-darkreader"><img src="https://cdn.discordapp.com/attachments/810799100940255260/955869669535907870/NoDarkReader.svg" height=40/></a> <a href="https://parceljs.org/"><img src="https://user-images.githubusercontent.com/44733677/158683062-17ac3b62-cacd-4add-babb-1f74f36020d8.svg" height=40/></a> <a href="https://prettier.io/"><img src="https://cdn.discordapp.com/attachments/810799100940255260/953339670538887318/Prettier.svg" height=40/></a> <a href="https://yarnpkg.org"><img src="https://cdn.discordapp.com/attachments/810799100940255260/954823377493852170/Yarn.svg" height=40/></a> <a href="https://transfonter.org"><img src="https://user-images.githubusercontent.com/44733677/159066877-234f68ba-e95c-439d-b5fe-74def49dc762.svg" height=40></a>
 
 ### Backend:
 
diff --git a/backend/config.example.json b/backend/config.example.json
@@ -4,9 +4,9 @@
 		"backend_port": 8000
 	},
 	"pastes": {
-		"character_limit": 40000,
-		"days_til_expiration": 7,
-		"id_length": 10
+		"character_limit": 50000,
+		"days_til_expiration": 30,
+		"id_length": 6
 	},
 	"ratelimits": {
 		"seconds_in_between_pastes": 2,
diff --git a/example.nginx b/example.nginx
@@ -5,7 +5,7 @@
 
 server {
     #listen 80 is default
-    server_name www.example.tld;
+    server_name example.tld;
     return 301 https://example.tld$request_uri;
     # brotli on;
 }
diff --git a/frontend/index.pug b/frontend/index.pug
@@ -6,6 +6,7 @@ head
 	link(rel='shortcut icon' type='image/x-icon' href='favicon.ico')
 	meta(name='theme-color' content='#90BDC9')
 	meta(name='keywords' content='zerobin, zer0bin, paste, paste bin, pastebin, pastebin alternative, foss pastebin, open source pastebin, free pastebin, ghostbin, hastebin, pastebin.com, free pastebin online, paste online, github paste, github gist, github gist paste')
+	meta(name='darkreader' content='NO-DARKREADER-PLUGIN')
 	link(href='style/style.scss' rel='stylesheet')
 	link(href='style/rosepine.min.css' rel='stylesheet')
 	meta(name='title' content='zer0bin')
diff --git a/frontend/package.json b/frontend/package.json
@@ -26,6 +26,7 @@
 		"@ant-design/icons-svg": "^4.2.1",
 		"highlight.js": "^11.4.0",
 		"js-confetti": "^0.10.2",
+		"no-darkreader": "^1.0.1",
 		"smooth-scrollbar": "^8.7.4",
 		"tippy.js": "^6.3.7"
 	}
diff --git a/frontend/src/index.ts b/frontend/src/index.ts
@@ -1,3 +1,5 @@
+import "no-darkreader"
+
 import hljs from "highlight.js"
 import JSConfetti from "js-confetti"
 import Scrollbar from "smooth-scrollbar"
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -2373,6 +2373,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"no-darkreader@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "no-darkreader@npm:1.0.1"
+  checksum: d2723be352daff453ae775daced9c755767e2caaf138b645f10073fa9b3253cf28eadc2addd8ce6b17bc720b8201cc0c7e045b6352b44cdc51a9e143fee4e989
+  languageName: node
+  linkType: hard
+
 "node-addon-api@npm:^3.2.1":
   version: 3.2.1
   resolution: "node-addon-api@npm:3.2.1"
@@ -3659,6 +3666,7 @@ __metadata:
     "@types/node": ^17.0.21
     highlight.js: ^11.4.0
     js-confetti: ^0.10.2
+    no-darkreader: ^1.0.1
     parcel: ^2.3.2
     smooth-scrollbar: ^8.7.4
     tippy.js: ^6.3.7

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`server {`
`7`	`7`	`#listen 80 is default`
`8`		`- server_name www.example.tld;`
	`8`	`+ server_name example.tld;`
`9`	`9`	`return 301 https://example.tld$request_uri;`
`10`	`10`	`# brotli on;`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`"@ant-design/icons-svg": "^4.2.1",`
`27`	`27`	`"highlight.js": "^11.4.0",`
`28`	`28`	`"js-confetti": "^0.10.2",`
	`29`	`+ "no-darkreader": "^1.0.1",`
`29`	`30`	`"smooth-scrollbar": "^8.7.4",`
`30`	`31`	`"tippy.js": "^6.3.7"`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import "no-darkreader"`
	`2`	`+`
`1`	`3`	`import hljs from "highlight.js"`
`2`	`4`	`import JSConfetti from "js-confetti"`
`3`	`5`	`import Scrollbar from "smooth-scrollbar"`