Compare commits

..

No commits in common. "2120076218ce27482c4bd6c2c0ec03ebd4fbe6bf" and "4df82e3d8108147e2eff00303e47c839c4e26373" have entirely different histories.

13 changed files with 43 additions and 136 deletions

20
.bash_history Normal file
View file

@ -0,0 +1,20 @@
cat .config/systemd/user/caddy.service
screen
htop
free -m -h
quota
quota -h
ls
du -h
neofetch
ls -a
htop
free -m -h
ls
nest resources
ls
mutt
ls Mail/
mutt
ls -a
exit

View file

@ -1,60 +1 @@
{ {"admin":{"listen":"unix//home/neon/caddy-admin.sock"},"apps":{"http":{"servers":{"srv0":{"automatic_https":{"skip":["neon.hackclub.app"]},"listen":["unix/.webserver.sock|777"],"routes":[{"handle":[{"handler":"subroute","routes":[{"handle":[{"handler":"vars","root":"/home/neon/pub"},{"handler":"file_server","hide":[".git",".env","/home/neon/Caddyfile"]}]}]}],"match":[{"host":["neon.hackclub.app"]}],"terminal":true}]}}}}}
"admin": { "listen": "unix//home/neon/caddy-admin.sock" },
"apps": {
"http": {
"servers": {
"srv0": {
"automatic_https": { "skip": ["spotify.hackclub.app"] },
"listen": ["unix/.spotify.neon.hackclub.app.webserver.sock|777"],
"routes": [
{
"handle": [
{
"handler": "subroute",
"routes": [
{
"handle": [
{
"handler": "reverse_proxy",
"upstreams": [{ "dial": "localhost:38275" }]
}
]
}
]
}
],
"match": [{ "host": ["spotify.hackclub.app"] }],
"terminal": true
}
]
},
"srv1": {
"automatic_https": { "skip": ["neon.hackclub.app"] },
"listen": ["unix/.webserver.sock|777"],
"routes": [
{
"handle": [
{
"handler": "subroute",
"routes": [
{
"handle": [
{ "handler": "vars", "root": "/home/neon/pub" },
{
"handler": "file_server",
"hide": [".git", ".env", "/home/neon/Caddyfile"]
}
]
}
]
}
],
"match": [{ "host": ["neon.hackclub.app"] }],
"terminal": true
}
]
}
}
}
}
}

8
.gitignore vendored
View file

@ -1,12 +1,8 @@
*.sock *.sock
.npm
.config/git .config/git
.config/pulse # tokens .config/pulse # tokens
.config/caddy Mail # mail sent to neon@hackclub.app is here
Mail sent # all sent mail is there
sent
Mail/* # mail sent to neon@hackclub.app is here
sent/* # all sent mail is there
.bun .bun
.local .local
.nix-profile .nix-profile

View file

@ -1 +0,0 @@
.less-history-file:

View file

@ -9,7 +9,3 @@ http://neon.hackclub.app {
} }
} }
http://spotify.hackclub.app {
bind unix/.spotify.sock|777
reverse_proxy localhost:378625
}

1
Mail/.gitignore vendored
View file

@ -1 +0,0 @@
*

View file

@ -4,12 +4,12 @@
- - [x] oauth [docs](https://tools.slack.dev/node-slack-sdk/oauth) - - [x] oauth [docs](https://tools.slack.dev/node-slack-sdk/oauth)
- - [ ] fix the [channel](https://app.slack.com/client/T0266FRGM/C07RE4N7S4B) - - [ ] fix the [channel](https://app.slack.com/client/T0266FRGM/C07RE4N7S4B)
- - - [x] Add ping for new-song event & send message ovs - - - [x] Add ping for new-song event & send message ovs
- [x] Spotify - [ ] Spotify
- - [x] web api [docs](https://developer.spotify.com/documentation/web-api/) - - [x] web api [docs](https://developer.spotify.com/documentation/web-api/)
- - [x] oauth [docs](https://developer.spotify.com/documentation/general/guides/authorization-guide/) - - [x] oauth [docs](https://developer.spotify.com/documentation/general/guides/authorization-guide/)
- - [x] refresh token [docs](https://developer.spotify.com/documentation/general/guides/authorization-guide/#refresh-an-access-token) - - [x] refresh token [docs](https://developer.spotify.com/documentation/general/guides/authorization-guide/#refresh-an-access-token)
- - [x] playlist tools (creation,modifcation,deletion) - - [x] playlist tools (creation,modifcation,deletion)
- [x] keydb (quick db or smthing) - [x] keydb (quick db or smthing)
- [x] express - [x] express
- [x] transparency of added songs - [ ] transparency of added songs
- - [x] export db -> into csv with properties (slack_id, url, added_at) - - [ ] export db -> into csv with properties (slack_id, url, added_at)

View file

@ -17,20 +17,6 @@ const { QuickDB } = require("quick.db");
const db = new QuickDB({ const db = new QuickDB({
filePath: "./data/songs.sqlite", filePath: "./data/songs.sqlite",
}); });
function arrayToCsv(data) {
return data
.map(
(row) =>
row
.map(String) // convert every value to String
.map((v) => v.replaceAll('"', '""')) // escape double quotes
.map((v) => `"${v}"`) // quote it
.join(","), // comma-separated
)
.join("\r\n"); // rows starting on new lines
}
let cacheDb = {}; let cacheDb = {};
const app = express(); const app = express();
const userScopes = ["identity.avatar", "identity.basic", "identity.team"]; const userScopes = ["identity.avatar", "identity.basic", "identity.team"];
@ -83,7 +69,7 @@ app.use(
path: path.join(__dirname, "../data/sessions"), path: path.join(__dirname, "../data/sessions"),
}), }),
saveUninitialized: true, saveUninitialized: true,
cookie: { secure: "auto", maxAge: 1000 * 60 * 60 * 24 * 7 }, cookie: { secure: "auto", maxAge: 1000 * 60 * 60 * 24 * 365 },
}), }),
); );
@ -171,19 +157,6 @@ app.get("/home", async (req, res) => {
s: req.query.s, s: req.query.s,
}); });
}); });
app.get("/download/db", async (req, res) => {
if (!req.session.info) return res.redirect("/login");
const allSongs = await db.all();
const csvData = arrayToCsv([
["slack_id", "url", "song_id", "added_at"],
...allSongs.map((d) => {
return [d.value.added_by, d.value.song_url, d.id, d.value.added_at];
}),
]);
res.setHeader("Content-Type", "text/csv");
res.setHeader("Content-Disposition", 'attachment; filename="songs.csv"');
res.send(csvData);
});
app.post("/spotify/submitsong", async (req, res) => { app.post("/spotify/submitsong", async (req, res) => {
if (!req.session.token) return res.redirect("/login"); if (!req.session.token) return res.redirect("/login");
if (!cacheDb[req.query.token]) return res.redirect(`/home?error=0`); if (!cacheDb[req.query.token]) return res.redirect(`/home?error=0`);
@ -257,10 +230,3 @@ app.listen(process.env.PORT || 3000, async () => {
// if(!await db.has()) // if(!await db.has())
if (getCredentials() !== null) refreshToken(getCredentials().refresh_token); if (getCredentials() !== null) refreshToken(getCredentials().refresh_token);
}); });
process.on("uncaughtException", function (err) {
console.log(err);
});
process.on("unhandledRejection", function (err) {
console.log(err);
});

View file

@ -633,12 +633,3 @@ td {
max-width: var(--size-narrow-plus); max-width: var(--size-narrow-plus);
} }
} }
/* custom additions */
.error {
color: var(--red);
font-weight: bold;
}
.success {
color: var(--green);
font-weight: bold;
}

View file

@ -23,21 +23,18 @@
<div class="card container" style="max-width: 550px;"> <div class="card container" style="max-width: 550px;">
<h2 class="headline">Submit Song</h2> <h2 class="headline">Submit Song</h2>
<!-- <p> --> <!-- <p> -->
<form action="/spotify/submitsong?token=<%=onetimetoken%>" method="POST" disabled="<%=s%>"> <form action="/spotify/submitsong?token=<%=onetimetoken%>" method="POST">
<div class="interactive"> <div class="interactive">
<label>Song URL</label> <label>Song URL</label>
<input type="url" name="songurl" disabled="<%=s%>" placeholder="https://open.spotify.com/track/6aWOvqmjb3343D5sq7zMgl?si=b72b81a97e564dc3" /> <input type="url" name="songurl" placeholder="https://open.spotify.com/track/6aWOvqmjb3343D5sq7zMgl?si=b72b81a97e564dc3" />
<br> <br>
</div> </div>
<!-- </p> --> <!-- </p> -->
<% if (s) { %> <% if (s) { %>
<!-- <meta property="hhtp-equiv" content="refresh"> -->
<meta http-equiv="refresh" content="5; url='/home'" />
<div class="success"> <div class="success">
<h2>Success!</h2> <h2>Success!</h2>
<p class="success">Your song has been added to the playlist!</p> <p>Your song has been added to the playlist!</p>
<p>refreshing page in 5s</p>
<br> <br>
</div> </div>
<% } %> <% } %>
@ -49,22 +46,16 @@
<% } %> <% } %>
<br> <br>
<button type="submit" disabled="<%=s%>">Submit</button> <button type="submit">Submit</button>
</form> </form>
</div> </div>
</form> </form>
</p> </p>
</div> </div>
<footer style="display: inline-flex;padding-left: 2px;padding-right: 2px;"> <footer>
<a href="/logout" class="button" style="padding-left: 2px;padding-right: 2px;">Logout</a> <a href="/logout" class="button">Logout</a>
<div>
<a href="/download/db" download class="button" style="margin-left: 8px;margin-right: 2px;">Download all song entries</a>
</div>
</footer> </footer>
<p style="max-width: 250px; inline-size: max-content; word-break: break-all;color: gray;"> The "Download all song entries" button includes all songs submited thru the form (even if removed from the playlist)</p>
<a href="https://open.spotify.com/playlist/3gRv97fvllFFLVdCH6XzsE?si=eUQm8275QdyMquBbNdPVHA">Check out the playlist</a>
</div> </div>
</center> </center>
</body> </body>

View file

@ -30,7 +30,6 @@
</div> </div>
<footer> <footer>
<a href="/login">Login Page</a> <a href="/login">Login Page</a>
<a href="https://open.spotify.com/playlist/3gRv97fvllFFLVdCH6XzsE?si=eUQm8275QdyMquBbNdPVHA">Check out the playlist</a>
</footer> </footer>
</div> </div>
</center> </center>

1
sent/.gitignore vendored
View file

@ -1 +0,0 @@
*

View file

@ -0,0 +1,10 @@
Date: Fri, 13 Sep 2024 01:41:52 +0000
From: neon <neon@hackclub.app>
To: neon@saahild.com
Subject: Hi
Message-ID: <ZuOYYH41PzEkqYrv@hackclub.app>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hello World!