Skip to content
Merged

sync #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
33e5903
Added to nowPlaying JSON object
HammerPot Oct 24, 2025
a82cb52
Bump validator and express-validator in /api
dependabot[bot] Dec 3, 2025
3893a25
Merge pull request #35 from Cattn/dependabot/npm_and_yarn/api/multi-9…
Cattn Dec 3, 2025
afb1148
Bump vite from 5.4.11 to 5.4.21
dependabot[bot] Jan 9, 2026
8aaad76
Bump qs and express
dependabot[bot] Jan 9, 2026
c7f1f20
Bump multer from 1.4.5-lts.1 to 2.0.2 in /api
dependabot[bot] Jan 9, 2026
1598eab
Bump node-forge from 1.3.1 to 1.3.3
dependabot[bot] Jan 9, 2026
b9caef8
Merge pull request #46 from Cattn/dependabot/npm_and_yarn/vite-5.4.21
Cattn Jan 9, 2026
4d400da
Merge pull request #47 from Cattn/dependabot/npm_and_yarn/multi-c8afc…
Cattn Jan 9, 2026
3e390af
Merge pull request #48 from Cattn/dependabot/npm_and_yarn/api/multer-…
Cattn Jan 9, 2026
f915e86
Merge pull request #49 from Cattn/dependabot/npm_and_yarn/node-forge-…
Cattn Jan 9, 2026
662e442
Update links in README for web and iOS
Cattn Jan 16, 2026
71af376
Bump devalue from 5.1.1 to 5.6.2
dependabot[bot] Jan 16, 2026
22e33c5
fix some credit
Cattn Jan 16, 2026
2ef284d
friends & socket & user management
Cattn Jan 21, 2026
6bce634
style: auto-format code
github-actions[bot] Jan 21, 2026
c085a5b
nowPlaying & friend activity
Cattn Jan 21, 2026
5ae2751
style: auto-format code
github-actions[bot] Jan 21, 2026
6f84ee4
settings + webhook
Cattn Jan 21, 2026
155a652
style: auto-format code
github-actions[bot] Jan 21, 2026
0d79e05
fix pfp loading, start queue
Cattn Jan 21, 2026
f05796c
Merge branch 'next' of https://github.com/Cattn/Maple into next
Cattn Jan 21, 2026
1b7e65d
style: auto-format code
github-actions[bot] Jan 21, 2026
34ac143
Queue
Cattn Jan 21, 2026
0d48275
style: auto-format code
github-actions[bot] Jan 21, 2026
a0ddcab
Use both slow down and rate limits
Nailington Jan 22, 2026
975a19d
Cherry-Picked rate limits
Nailington Jan 22, 2026
835dc0f
Search
Cattn Jan 23, 2026
e8e4966
style: auto-format code
github-actions[bot] Jan 23, 2026
9f5787f
Mobile Support!
Cattn Jan 23, 2026
ed4b352
improve Queue page
Cattn Jan 23, 2026
e5e0ce6
style: auto-format code
github-actions[bot] Jan 23, 2026
ef1a8f6
toasty
Cattn Jan 23, 2026
04d841f
Merge branch 'next' of https://github.com/Cattn/Maple into next
Cattn Jan 23, 2026
7259792
remove friend activity
Cattn Jan 23, 2026
d88062a
hopefully mobile fix
Cattn Jan 23, 2026
e7b977b
style: auto-format code
github-actions[bot] Jan 23, 2026
6bb28c1
maybe fix mobile?
Cattn Jan 23, 2026
5c64d5a
style: auto-format code
github-actions[bot] Jan 23, 2026
eb14530
mobile positioning
Cattn Jan 23, 2026
7780954
Merge branch 'next' of https://github.com/Cattn/Maple into next
Cattn Jan 23, 2026
7303385
style: auto-format code
github-actions[bot] Jan 23, 2026
ff757c3
fix pause/play on mobile
Cattn Jan 23, 2026
a9df287
server
Cattn Jan 23, 2026
3bc710c
Handle package.json & co.
Nailington Jan 23, 2026
cb5b34f
Merge pull request #21 from Cattn/next
Cattn Jan 23, 2026
8a8225a
Merge pull request #53 from Cattn/dependabot/npm_and_yarn/devalue-5.6.2
Cattn Jan 23, 2026
cefcc89
Potential fix for code scanning alert no. 23: Workflow does not conta…
Cattn Jan 23, 2026
2cac2be
Merge pull request #61 from Cattn/alert-autofix-23
Cattn Jan 23, 2026
ce5bf48
adapter-node
Cattn Jan 23, 2026
d6f5154
Modify rate limits to be more forgiving
Nailington Jan 23, 2026
04140b4
fix playlist page
Cattn Jan 23, 2026
3f161a2
Merge pull request #62 from Cattn/fix-playlist
Cattn Jan 23, 2026
30c0a43
fix login detection
Cattn Jan 23, 2026
a24d271
style: auto-format code
github-actions[bot] Jan 23, 2026
e7eae83
fix the track grid & overflow
Cattn Jan 23, 2026
c23aa12
style: auto-format code
github-actions[bot] Jan 23, 2026
6ad2651
fix: truncation
Cattn Jan 23, 2026
ee92cb0
hopefully stop the yap
Cattn Jan 23, 2026
4870ac4
hopefully fix?
Cattn Jan 23, 2026
0d28dd1
remove workflow
Nailington Jan 23, 2026
b1d1cd4
Merge branch 'main' of https://github.com/Cattn/Maple
Cattn Jan 23, 2026
e80acf3
navigator Fix
Cattn Jan 28, 2026
99662c6
small fix
Cattn Jan 28, 2026
b6d7e93
Merge pull request #70 from Cattn/media-controls
Cattn Jan 28, 2026
e0d30b2
fix padding on mobile
Cattn Jan 28, 2026
4e420a8
Merge pull request #71 from Cattn/mobile-fixes
Cattn Jan 28, 2026
f2b95eb
fix truncation
Cattn Jan 28, 2026
3692aa4
Merge pull request #72 from Cattn/list-truncation-fix
Cattn Jan 28, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions .github/workflows/lint-format.yml

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h3>

<p align="center">
<a href="https://maple.music/" target="_blank">stable</a> · <a href="https://beta.cattn.dev/" target="_blank">beta</a>
<a href="https://play.maple.music/" target="_blank">web</a> · <a href="https://beta.cattn.dev/" target="_blank">beta</a> · <a href="https://maple.music/apple" target="_blank">iOS</a>
</p>

> Need Help? Join our [Development Server](https://discord.gg/Wxrp73HVj4)
Expand Down Expand Up @@ -167,10 +167,10 @@ You can view our privacy policy [here](https://maple.music/privacy)!

## Credits

### Lead & Only Developer
### Lead Developer

- Cattn

### Logos & Branding
### Logos & Various Help

- Nailington
- Nailington ([@Nailington](https://github.com/Nailington))
13 changes: 7 additions & 6 deletions api/maple.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ var options = {
}
};

const limiter = slowDown({
const slower = slowDown({
windowMs: 2 * 60 * 1000,
delayAfter: 5,
delayAfter: 50,
delayMs: (hits) => {
if (hits <= 15) return hits * 100;
return (hits - 15) * 1000 + 2000;
},
maxDelayMs: 15000,
});

// const limiter = rateLimit({
// windowMs: 15 * 60 * 1000,
// limit: 20,
// })
const limiter = rateLimit({
windowMs: 2 * 60 * 1000,
limit: 100,
})

try {

Expand Down Expand Up @@ -96,6 +96,7 @@ try {
const friends = require('./user/friends.js');

app.use(limiter);
app.use(slower);

app.use(cors(corsOptions));

Expand Down
79 changes: 25 additions & 54 deletions api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"express-slow-down": "^3.0.1",
"express-validator": "^7.2.1",
"jsonwebtoken": "^9.0.2",
"multer": "^1.4.5-lts.1",
"multer": "^2.0.2",
"mysql": "^2.18.1",
"mysql2": "^3.12.0",
"peer": "^1.0.2",
"socket.io": "^4.8.1",
"uuid": "^11.0.5",
"validator": "^13.12.0"
"validator": "^13.15.23"
}
}
Loading