Skip to content

Commit 8051d00

Browse files
MiranDanielMiranDaniel
committed
General info updates
1 parent 070e07b commit 8051d00

File tree

8 files changed

+37
-20
lines changed

8 files changed

+37
-20
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2021-2022 MiranDaniel
1+
Copyright MiranDaniel <[email protected]>
22

33

44
The Software is provided to you by the Licensor under

‎SECURITY.md‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,26 @@
2525

2626
If you find a vulnerability please contact the maintainer at
2727

28-
`[email protected]`, `mirandaniel#3515`
28+
`[email protected]`, `F42DFEFE9040255FAE1ADC8CC96567DFE63D4202`
29+
30+
```pgp
31+
-----BEGIN PGP PUBLIC KEY BLOCK-----
32+
Comment: User-ID: MiranDaniel <[email protected]>
33+
Comment: Valid from: 25 Aug 2023 14:36:23
34+
Comment: Valid until: 25 Aug 2025 12:00:00
35+
Comment: Type: 255-bit EdDSA (secret key available)
36+
Comment: Usage: Signing, Encryption, Certifying User-IDs, SSH Authentication
37+
Comment: Fingerprint: F42DFEFE9040255FAE1ADC8CC96567DFE63D4202
38+
39+
mDMEZOigRxYJKwYBBAHaRw8BAQdA6nlfxM3PXd6CQKw2j3EuB0l9z9s/vYlW78Ib
40+
1GisZeG0IE1pcmFuRGFuaWVsIDxtZUBtaXJhbmRhbmllbC5jb20+iJkEExYKAEEW
41+
IQT0Lf7+kEAlX64a3IzJZWff5j1CAgUCZOigRwIbIwUJA8OT2QULCQgHAgIiAgYV
42+
CgkICwIEFgIDAQIeBwIXgAAKCRDJZWff5j1CAuh9AP0VYTe9YY9flGNNUdaFANtd
43+
klxR2Uip2MPS/kmKjsEtMQEAxRb5ehP7NjdsD8FCUHA86ABTciSzvgekfignoFih
44+
jQW4OARk6KBHEgorBgEEAZdVAQUBAQdAed8AKjqp0TtGTc4ywW4p5gIXAU+edl2h
45+
GKgg5x3Yu34DAQgHiH4EGBYKACYWIQT0Lf7+kEAlX64a3IzJZWff5j1CAgUCZOig
46+
RwIbDAUJA8OT2QAKCRDJZWff5j1CAukqAP0fcO+cWxwPP+EpYzaQTt76GbnmOhJX
47+
xXCP27i1Cl3AbgD/cwRMBR3egPR1Zs+UVFvgiPhRGNZGijGA442mXjtllwc=
48+
=4Ke1
49+
-----END PGP PUBLIC KEY BLOCK-----
50+
```

‎app.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright 2021-2022 MiranDaniel
2+
Copyright MiranDaniel <[email protected]>
33
44
55
The Software is provided to you by the Licensor under
@@ -95,7 +95,7 @@ def recaptcha(token):
9595
def invite():
9696
print("Generating new invite!")
9797
resp = requests.post(
98-
'https://discordapp.com/api/channels/{}/invites'.format(config["discord"]["welcome_room"]),
98+
'https://discordapp.com/api/channels/{}/invites'.format(config["discord"]["welcome_room"]),
9999
headers={'Authorization': 'Bot {}'.format(config["discord"]["private"])},
100100
json={'max_uses': 1, 'unique': True, 'max_age': 300}
101101
)
@@ -119,7 +119,7 @@ def index():
119119
key = request.args.get('key') # get key parameter from URL
120120
if key: # if key set
121121
r = recaptcha(key) # confirm captcha
122-
if r["success"]: # if ok
122+
if r.get("success"): # if ok
123123
print(f"Recaptcha {key[:30]} verified!")
124124
i = invite() # generate new invite
125125
return redirect(f"https://discord.gg/{i}") # redirect user to new invite

‎config.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ dark_theme: false
1111

1212
recaptcha:
1313
# put your public recaptcha key here!
14-
public:
15-
14+
public:
15+
1616
# DO NOT LEAK THIS
1717
# put your private recapthca key here!
18-
private:
18+
private:
1919

2020
discord:
2121
# users will be invited to this room, it should be public
2222
# put your welcome room ID here
23-
welcome_room:
23+
welcome_room:
2424

2525
# DO NOT LEAK THIS
2626
# put your Discord bot token here
27-
private:
27+
private:
2828

2929
server:
3030
# the script will host the gateway on this port

‎etc/wall.service‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ ExecStart=/usr/local/bin/gunicorn --bind 0.0.0.0:80 server:app --capture-output
1010
Restart=always
1111
RestartSec=5s
1212

13-
1413
[Install]
1514
WantedBy=multi-user.target

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
flask
22
requests
33
gevent
4-
pyyaml
4+
pyyaml

‎server.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
print(f"Serving on port {config['server']['port']}")
1313

1414
http_server = WSGIServer(('', config["server"]["port"]), app)
15-
http_server.serve_forever()
15+
http_server.serve_forever()

‎templates/index.html‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<html lang="en">
22
<!--
3-
Copyright 2021 MiranDaniel
4-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
3+
Copyright MiranDaniel https://mirandaniel.com/
64
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
75
-->
86
<head>
@@ -105,9 +103,7 @@ <h2 class="display-6 mt-2">Join our Discord</h2>
105103
</div>
106104
</body>
107105
<script>
108-
console.log("Copyright 2021 MiranDaniel");
109-
console.log("Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files(the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:");
110-
console.log("The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.")
106+
console.log("Copyright MiranDaniel https://mirandaniel.com/");
111107
console.log("THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.")
112108
</script>
113109
<script>
@@ -117,7 +113,7 @@ <h2 class="display-6 mt-2">Join our Discord</h2>
117113
let params = new URLSearchParams(url.search);
118114

119115
params.set('key', grecaptcha.getResponse());
120-
window.location.href = url+"?"+params.toString();
116+
window.location.href = url+"?"+params.toString();
121117
}
122118
</script>
123119
</html>

0 commit comments

Comments
 (0)