diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 601ca4b..396db7d 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -7,11 +7,11 @@ on:
jobs:
docker:
- runs-on: debian-bookworm
+ runs-on: ${{ vars.RUNNER_LABEL }}
steps:
- - name: checkout
- uses: actions/checkout@v6
-
+ - name: Checkout
+ uses: actions/checkout@v7
+
- name: install docker???
run: |
apt update && apt install wget cmake -y && \
diff --git a/.gitignore b/.gitignore
index 251ef39..6200a6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ fes_boss.yaml
node_modules
build
splatnet_backend.egg-info
-venv/*
\ No newline at end of file
+venv/*
+.venv/*
\ No newline at end of file
diff --git a/README.md b/README.md
index 1996705..475a43c 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,14 @@
# SplatNet
-[](https://git.crafterpika.cc/kittentm/splatnet-backend/commits/branch/main)
+
[](https://git.crafterpika.cc/kittentm/splatnet-backend/actions)
-[](https://git.crafterpika.cc/kittentm/splatnet-backend)
+[](https://git.crafterpika.cc/kittentm/splatnet-backend)
[](https://git.crafterpika.cc/kittentm/splatnet-backend/src/branch/main/LICENSE)
+
+
-This is the backend for the [SplatNet](https://git.crafterpika.cc/kittentm/splatnet) Revival frontend. It is a combination of Python & JS.
+This is the backend for the [SplatNet](https://git.crafterpika.cc/kittentm/splatnet) Revival frontend.
diff --git a/code_of_conduct.md b/code_of_conduct.md
new file mode 100644
index 0000000..bab5b09
--- /dev/null
+++ b/code_of_conduct.md
@@ -0,0 +1,65 @@
+# Spacebar Network Code of Conduct
+
+This repository adheres to the official Spacebar Network Code of Conduct ("COC.") These regulations extend to the entire Spacebar network, our official Discord community, and all Git repositories. By choosing to interact with our community, you are entering into a social contract designed to protect the integrity of the project and the well-being of its members.
+
+> **Note:** If you wish to propose changes or simply view the COC, the primary residence and master copy of this Code of Conduct can be found [here](https://git.spbr.net/spacebar/policy).
+
+If you intend to contribute code, participate in community discussions, or experience any element of the Spacebar ecosystem, you must strictly abide by the standards and expectations set forth in this Covenant. We believe that a healthy community is built on mutual respect and shared responsibility. Our goal is to foster a space that is welcoming, inclusive, and free from harassment for everyone, regardless of their background or level of experience. Failure to adhere to these principles may result in removal from the network, as we prioritize maintaining a safe and productive environment for all participants.
+
+---
+
+## Our Pledge
+
+We pledge to make the Spacebar community welcoming, safe, and equitable for all.
+
+We are committed to fostering an environment that respects and promotes the dignity, rights, and contributions of all individuals, regardless of characteristics including race, ethnicity, caste, color, age, physical characteristics, neurodiversity, disability, sex or gender, gender identity or expression, sexual orientation, language, philosophy or religion, national or social origin, socio-economic position, level of education, or other status. The same privileges of participation are extended to everyone who participates in good faith and in accordance with this Covenant.
+
+## Encouraged Behaviors
+
+While acknowledging differences in social norms, we all strive to meet our community's expectations for positive behavior. We also understand that our words and actions may be interpreted differently than we intend based on culture, background, or native language.
+
+With these considerations in mind, we agree to behave mindfully toward each other and act in ways that center our shared values, including:
+
+1. Respecting the **purpose of our community**, our activities, and our ways of gathering.
+2. Engaging **kindly and honestly** with others.
+3. Respecting **different viewpoints** and experiences.
+4. **Taking responsibility** for our actions and contributions.
+5. Gracefully giving and accepting **constructive feedback**.
+6. Committing to **repairing harm** when it occurs.
+7. Behaving in other ways that promote and sustain the **well-being of our community**.
+
+## Restricted Behaviors
+
+We agree to restrict the following behaviors in our community. Instances, threats, and promotion of these behaviors are violations of this Code of Conduct.
+
+1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal attention after any clear request to stop.
+2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a community member or group of people.
+3. **Stereotyping or discrimination.** Characterizing anyone’s personality or behavior on the basis of immutable identities or traits.
+4. **Sexualization.** Behaving in a way that would generally be considered inappropriately intimate in the context or purpose of the community.
+5. **Violating confidentiality**. Sharing or acting on someone's personal or private information without their permission.
+6. **Endangerment.** Causing, encouraging, or threatening violence or other harm toward any person or group.
+7. Behaving in other ways that **threaten the well-being** of our community.
+
+### Other Restrictions
+
+1. **Misleading identity.** Impersonating someone else for any reason, or pretending to be someone else to evade enforcement actions.
+2. **Failing to credit sources.** Not properly crediting the sources of content you contribute. If you are found to be using SDK material, all of your content commited towards Spacebar will be removed. No exceptions.
+3. **Promotional materials**. Sharing marketing or other commercial content in a way that is outside the norms of the community.
+4. **Irresponsible communication.** Failing to responsibly present content which includes, links or describes any other restricted behaviors.
+5. **Discussion of Piracy, or anything relating.**
+
+## Reporting an Issue
+
+When an incident occurs, it is important to report it promptly. To report a possible violation, please contact the Spacebar Maintainers via contacting a SPFN or SPBR developer on the discord server found [here](https://discord.gg/grMSxZf).
+
+Spacebar moderators take reports seriously and will respond in a timely manner. They will investigate all reports by reviewing logs, messages, or interviewing participants. We aim to keep enforcement actions transparent while prioritizing the safety and confidentiality of those involved.
+
+---
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 3.0, permanently available at [https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/).
+
+Contributor Covenant is stewarded by the Organization for Ethical Source and licensed under CC BY-SA 4.0. To view a copy of this license, visit [https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/)
+
+For answers to common questions about Contributor Covenant, see the FAQ at [https://www.contributor-covenant.org/faq](https://www.contributor-covenant.org/faq). Translations are provided at [https://www.contributor-covenant.org/translations](https://www.contributor-covenant.org/translations). Additional enforcement and community guideline resources can be found at [https://www.contributor-covenant.org/resources](https://www.contributor-covenant.org/resources).
\ No newline at end of file
diff --git a/config.py b/config.py
index 7d81b09..66597cf 100644
--- a/config.py
+++ b/config.py
@@ -18,6 +18,7 @@ class Settings(BaseSettings):
twitter_client_id: str
twitter_client_secret: str
twitter_redirect_uri: str
+ account_client_secret: str
model_config = SettingsConfigDict(
env_file=[
diff --git a/judd/package-lock.json b/judd/package-lock.json
index f8f456a..d6335ca 100644
--- a/judd/package-lock.json
+++ b/judd/package-lock.json
@@ -68,9 +68,9 @@
}
},
"node_modules/@discordjs/rest": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.6.1.tgz",
- "integrity": "sha512-wwQdgjeaoYFiaG+atbqx6aJDpqW7JHAo0HrQkBTbYzM3/PJ3GweQIpgElNcGZ26DCUOXMyawYd0YF7vtr+fZXg==",
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.6.3.tgz",
+ "integrity": "sha512-wvOylxNYJkwKjctS/Mn5GP1w9r3/rzyH+ThD1JlAca6zEdlHs8QWBBUQJpU5Q+W6DoIj/Ljh1IPlZs7hTU+UAg==",
"license": "Apache-2.0",
"dependencies": {
"@discordjs/collection": "^2.1.1",
@@ -78,10 +78,10 @@
"@sapphire/async-queue": "^1.5.3",
"@sapphire/snowflake": "^3.5.5",
"@vladfrangu/async_event_emitter": "^2.4.6",
- "discord-api-types": "^0.38.40",
+ "discord-api-types": "^0.38.50",
"magic-bytes.js": "^1.13.0",
"tslib": "^2.6.3",
- "undici": "6.24.1"
+ "undici": "^6.27.0"
},
"engines": {
"node": ">=18"
@@ -102,16 +102,6 @@
"url": "https://github.com/discordjs/discord.js?sponsor"
}
},
- "node_modules/@discordjs/rest/node_modules/@sapphire/snowflake": {
- "version": "3.5.5",
- "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.5.tgz",
- "integrity": "sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==",
- "license": "MIT",
- "engines": {
- "node": ">=v14.0.0",
- "npm": ">=7.0.0"
- }
- },
"node_modules/@discordjs/util": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.2.0.tgz",
@@ -234,9 +224,9 @@
}
},
"node_modules/@sapphire/snowflake": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.3.tgz",
- "integrity": "sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ==",
+ "version": "3.5.5",
+ "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.5.tgz",
+ "integrity": "sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==",
"license": "MIT",
"engines": {
"node": ">=v14.0.0",
@@ -336,6 +326,41 @@
"url": "https://opencollective.com/express"
}
},
+ "node_modules/agent-base": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+ "license": "MIT",
+ "dependencies": {
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
+ "node_modules/agent-base/node_modules/debug": {
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+ "license": "MIT",
+ "dependencies": {
+ "ms": "^2.1.3"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/agent-base/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+ "license": "MIT"
+ },
"node_modules/append-field": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
@@ -349,13 +374,14 @@
"license": "MIT"
},
"node_modules/axios": {
- "version": "1.15.2",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz",
- "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==",
+ "version": "1.19.0",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.19.0.tgz",
+ "integrity": "sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==",
"license": "MIT",
"dependencies": {
- "follow-redirects": "^1.15.11",
- "form-data": "^4.0.5",
+ "follow-redirects": "^1.16.0",
+ "form-data": "^4.0.6",
+ "https-proxy-agent": "^5.0.1",
"proxy-from-env": "^2.1.0"
}
},
@@ -622,33 +648,33 @@
}
},
"node_modules/discord-api-types": {
- "version": "0.38.47",
- "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.47.tgz",
- "integrity": "sha512-XgXQodHQBAE6kfD7kMvVo30863iHX1LHSqNq6MGUTDwIFCCvHva13+rwxyxVXDqudyApMNAd32PGjgVETi5rjA==",
+ "version": "0.38.52",
+ "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.52.tgz",
+ "integrity": "sha512-uwe9EKfbjsmgWc2fdFjvDbj+dQqx3lp7wqDCmIha0jInuU+xeQjkCK9tMMn+p7RXfdVQORCInq4cD3U2ymDmyg==",
"license": "MIT",
"workspaces": [
"scripts/actions/documentation"
]
},
"node_modules/discord.js": {
- "version": "14.26.3",
- "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.26.3.tgz",
- "integrity": "sha512-XEKtYn28YFsiJ5l4fLRyikdbo6RD5oFyqfVHQlvXz2104JhH/E8slN28dbky05w3DCrJcNVWvhVvcJCTSl/KIg==",
+ "version": "14.27.0",
+ "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.27.0.tgz",
+ "integrity": "sha512-qHbFlFG2N7y3LjPySYsL6A1+BnX6bkTVgo842EX0CqVPk/KTMwZkojPHEXKsQUpWZNyz5BISNHK1cPpQw0+m4A==",
"license": "Apache-2.0",
"dependencies": {
"@discordjs/builders": "^1.14.1",
"@discordjs/collection": "1.5.3",
"@discordjs/formatters": "^0.6.2",
- "@discordjs/rest": "^2.6.1",
+ "@discordjs/rest": "^2.6.2",
"@discordjs/util": "^1.2.0",
"@discordjs/ws": "^1.2.3",
- "@sapphire/snowflake": "3.5.3",
- "discord-api-types": "^0.38.40",
+ "@sapphire/snowflake": "3.5.5",
+ "discord-api-types": "^0.38.49",
"fast-deep-equal": "3.1.3",
"lodash.snakecase": "4.1.1",
"magic-bytes.js": "^1.13.0",
"tslib": "^2.6.3",
- "undici": "6.24.1"
+ "undici": "^6.27.0"
},
"engines": {
"node": ">=18"
@@ -797,12 +823,13 @@
}
},
"node_modules/express-rate-limit": {
- "version": "8.3.2",
- "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.3.2.tgz",
- "integrity": "sha512-77VmFeJkO0/rvimEDuUC5H30oqUC4EyOhyGccfqoLebB0oiEYfM7nwPrsDsBL1gsTpwfzX8SFy2MT3TDyRq+bg==",
+ "version": "8.6.2",
+ "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.6.2.tgz",
+ "integrity": "sha512-YH4ru+eOJxQABscKFfRCy9R7x9QFGdezclVMwwgFFndzS2Xnm0uo6B0ABZsLhcpeptGv2qvuJVWlQr9gQZoC3A==",
"license": "MIT",
"dependencies": {
- "ip-address": "10.1.0"
+ "debug": "^4.4.3",
+ "ip-address": "^10.2.0"
},
"engines": {
"node": ">= 16"
@@ -814,6 +841,29 @@
"express": ">= 4.11"
}
},
+ "node_modules/express-rate-limit/node_modules/debug": {
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+ "license": "MIT",
+ "dependencies": {
+ "ms": "^2.1.3"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/express-rate-limit/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+ "license": "MIT"
+ },
"node_modules/express-subdomain": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/express-subdomain/-/express-subdomain-1.0.6.tgz",
@@ -962,16 +1012,16 @@
}
},
"node_modules/form-data": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
- "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+ "version": "4.0.6",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
+ "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
"license": "MIT",
"dependencies": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"es-set-tostringtag": "^2.1.0",
- "hasown": "^2.0.2",
- "mime-types": "^2.1.12"
+ "hasown": "^2.0.4",
+ "mime-types": "^2.1.35"
},
"engines": {
"node": ">= 6"
@@ -1081,9 +1131,9 @@
}
},
"node_modules/hasown": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz",
- "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+ "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
"license": "MIT",
"dependencies": {
"function-bind": "^1.1.2"
@@ -1112,6 +1162,42 @@
"url": "https://opencollective.com/express"
}
},
+ "node_modules/https-proxy-agent": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+ "license": "MIT",
+ "dependencies": {
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/https-proxy-agent/node_modules/debug": {
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+ "license": "MIT",
+ "dependencies": {
+ "ms": "^2.1.3"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/https-proxy-agent/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+ "license": "MIT"
+ },
"node_modules/iconv-lite": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
@@ -1144,9 +1230,9 @@
"license": "ISC"
},
"node_modules/ip-address": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
- "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
+ "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
"license": "MIT",
"engines": {
"node": ">= 12"
@@ -1168,9 +1254,9 @@
"license": "MIT"
},
"node_modules/joi": {
- "version": "18.1.2",
- "resolved": "https://registry.npmjs.org/joi/-/joi-18.1.2.tgz",
- "integrity": "sha512-rF5MAmps5esSlhCA+N1b6IYHDw9j/btzGaqfgie522jS02Ju/HXBxamlXVlKEHAxoMKQL77HWI8jlqWsFuekZA==",
+ "version": "18.2.3",
+ "resolved": "https://registry.npmjs.org/joi/-/joi-18.2.3.tgz",
+ "integrity": "sha512-N5A3KTWQpPWT4ExxxPlUx7WmykGXRzhNidWhV41d6Abu9YfI2NyWCJuxdPnslJCPWtbRpSVOWSnSS6GakLM/Rg==",
"license": "BSD-3-Clause",
"dependencies": {
"@hapi/address": "^5.1.1",
@@ -1276,31 +1362,23 @@
}
},
"node_modules/morgan": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz",
- "integrity": "sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==",
+ "version": "1.11.0",
+ "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.11.0.tgz",
+ "integrity": "sha512-zSkVu3t18r39pw4ixfBKvfZi3y2UOqr7d4WYwcj3m8nXpEQK4rPO6GLzs/CExoRgmX3y9EjmmcXqv6jq0SK46g==",
"license": "MIT",
"dependencies": {
"basic-auth": "~2.0.1",
"debug": "2.6.9",
"depd": "~2.0.0",
- "on-finished": "~2.3.0",
+ "on-finished": "~2.4.1",
"on-headers": "~1.1.0"
},
"engines": {
"node": ">= 0.8.0"
- }
- },
- "node_modules/morgan/node_modules/on-finished": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
- "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
- "license": "MIT",
- "dependencies": {
- "ee-first": "1.1.1"
},
- "engines": {
- "node": ">= 0.8"
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/express"
}
},
"node_modules/ms": {
@@ -1310,9 +1388,9 @@
"license": "MIT"
},
"node_modules/multer": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/multer/-/multer-2.1.1.tgz",
- "integrity": "sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/multer/-/multer-2.2.0.tgz",
+ "integrity": "sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==",
"license": "MIT",
"dependencies": {
"append-field": "^1.0.0",
@@ -1399,15 +1477,14 @@
}
},
"node_modules/pg": {
- "version": "8.20.0",
- "resolved": "https://registry.npmjs.org/pg/-/pg-8.20.0.tgz",
- "integrity": "sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==",
+ "version": "8.23.0",
+ "resolved": "https://registry.npmjs.org/pg/-/pg-8.23.0.tgz",
+ "integrity": "sha512-Ip2EQCngowJLGOfCwkFhPXU7/ljlhn6Rxlmy4XYfL2Y+vyRM59+8uR2xqRWKdYmbXmxCFOAmKxBuSUCdF34qLg==",
"license": "MIT",
- "peer": true,
"dependencies": {
- "pg-connection-string": "^2.12.0",
- "pg-pool": "^3.13.0",
- "pg-protocol": "^1.13.0",
+ "pg-connection-string": "^2.14.0",
+ "pg-pool": "^3.14.0",
+ "pg-protocol": "^1.16.0",
"pg-types": "2.2.0",
"pgpass": "1.0.5"
},
@@ -1415,7 +1492,7 @@
"node": ">= 16.0.0"
},
"optionalDependencies": {
- "pg-cloudflare": "^1.3.0"
+ "pg-cloudflare": "^1.4.0"
},
"peerDependencies": {
"pg-native": ">=3.0.1"
@@ -1427,16 +1504,16 @@
}
},
"node_modules/pg-cloudflare": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.3.0.tgz",
- "integrity": "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.4.0.tgz",
+ "integrity": "sha512-Vo7z/6rrQYxpNRylp4Tlob2elzbh+N/MOQbxFVWCxS7oEx6jF53GTJFxK2WWpKuBRkmiin4Mt+xofFDjx09R0A==",
"license": "MIT",
"optional": true
},
"node_modules/pg-connection-string": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.12.0.tgz",
- "integrity": "sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==",
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.14.0.tgz",
+ "integrity": "sha512-XwWDGcLRGCXAR8F/AM5bG7Q+A3Wm2s6QeEjlOKZLlH3UYcguiqCWKyWXVag5TLTIjR7oOJUY8kcADaZgWPyLeg==",
"license": "MIT"
},
"node_modules/pg-hstore": {
@@ -1461,18 +1538,18 @@
}
},
"node_modules/pg-pool": {
- "version": "3.13.0",
- "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.13.0.tgz",
- "integrity": "sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==",
+ "version": "3.14.0",
+ "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.14.0.tgz",
+ "integrity": "sha512-gKtPkFdQPU3DksooVLi9LsjZxrsBUZIpa+7aVx+LV5pNh0KzP4Zleud2po+ConrxbuXGBJ6Hfer6hdgpIBpBaw==",
"license": "MIT",
"peerDependencies": {
"pg": ">=8.0"
}
},
"node_modules/pg-protocol": {
- "version": "1.13.0",
- "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz",
- "integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==",
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.16.0.tgz",
+ "integrity": "sha512-sILXutLVjCLjcDuOmvhX5e2Z4cS5qG/6Bu3VkpFwdf/633ElGLpEh9bgmuI5I4sqKqkifQiGyiCcx1HdtrK7tg==",
"license": "MIT"
},
"node_modules/pg-types": {
@@ -2050,9 +2127,9 @@
"license": "MIT"
},
"node_modules/undici": {
- "version": "6.24.1",
- "resolved": "https://registry.npmjs.org/undici/-/undici-6.24.1.tgz",
- "integrity": "sha512-sC+b0tB1whOCzbtlx20fx3WgCXwkW627p4EA9uM+/tNNPkSS+eSEld6pAs9nDv7WbY1UUljBMYPtu9BCOrCWKA==",
+ "version": "6.28.0",
+ "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.0.tgz",
+ "integrity": "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA==",
"license": "MIT",
"engines": {
"node": ">=18.17"
diff --git a/judd/routes/post.js b/judd/routes/post.js
index fef1834..e8c7c00 100644
--- a/judd/routes/post.js
+++ b/judd/routes/post.js
@@ -34,11 +34,12 @@ router.post('/post', postLimiter, async (request, response, next) => {
try {
let isPidValid = true;
try {
- const spfnCheck = await axios.get(`https://account.spfn.net/api/v2/users/${pid}/mii`);
+ const spfnCheck = await axios.get(`https://account.spbr.net/api/v2/users/${pid}/mii`);
if (typeof spfnCheck.data === 'string' && spfnCheck.data.includes('0008')) {
isPidValid = false;
}
} catch (err) {
+ console.error(`Caught error when validating ${pid}:`, err.message || err);
isPidValid = false;
}
@@ -115,4 +116,4 @@ router.post('/post', postLimiter, async (request, response, next) => {
return response.send('success');
});
-module.exports = router;
\ No newline at end of file
+module.exports = router;
diff --git a/judd/titles/splatoon.js b/judd/titles/splatoon.js
index f75aa19..c910137 100644
--- a/judd/titles/splatoon.js
+++ b/judd/titles/splatoon.js
@@ -19,7 +19,7 @@ module.exports = {
if (parseInt(data.SessionID) > MAX_INT32) sanitizedData.SessionID = 0;
- const result = await SplatfestResult.create(sanitizedData);
+ const result = await SplatfestResult.create(sanitizedData, { ordering: false, ignoreDuplicates: false });
await Equipment.upsert({
PId: sanitizedData.PId,
diff --git a/main.py b/main.py
index b707506..3496c9e 100644
--- a/main.py
+++ b/main.py
@@ -14,11 +14,13 @@ from routes.equipment import equipment_history
from routes.equipment import equipment
from services.boss_retrieval import process_boss_file
from routes import Ranking
+from routes import ranking_grabstats
from routes import twitter_link
from contextlib import asynccontextmanager
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
from sqlalchemy import delete
from config import BASE_DIR
+import yaml
import asyncio
import subprocess
import signal
@@ -31,6 +33,7 @@ JUDD_SERVER_JS = os.path.join(JUDD_CWD, "server.js")
JUDD_CMD = ["node", JUDD_SERVER_JS]
judd_process = None
+skip_upcoming_reset = False
async def boss_worker_loop():
print("background worker started")
@@ -43,30 +46,79 @@ async def boss_worker_loop():
await asyncio.sleep(3600)
async def weekly_rank_reset_loop():
+ global skip_upcoming_reset
print("weekly_rank_reset worker started")
- while True:
- now = datetime.now()
- days_ahead = 6 - now.weekday()
+
+ FES_BOSS_PATH = os.path.join(BASE_DIR, "fes_boss.yaml")
+
+ def get_next_sunday_reset_time_utc():
+ now_utc = datetime.now(timezone.utc)
+ days_ahead = 6 - now_utc.weekday()
if days_ahead <= 0:
days_ahead += 7
+ next_sunday_utc = now_utc + timedelta(days=days_ahead)
+ return next_sunday_utc.replace(hour=0, minute=0, second=0, microsecond=0)
+
+ async def check_splatfest_schedule_loop():
+ global skip_upcoming_reset
+ while True:
+ try:
+ target_reset_utc = get_next_sunday_reset_time_utc()
+ print(f"checking if a splatfest will be active at: {target_reset_utc.isoformat()}")
+
+ if os.path.exists(FES_BOSS_PATH):
+ with open(FES_BOSS_PATH, "r", encoding="utf-8") as f:
+ fes_data = yaml.safe_load(f)
+
+ if fes_data and "Time" in fes_data:
+ start_time = datetime.fromisoformat(fes_data["Time"]["Start"])
+ end_time = datetime.fromisoformat(fes_data["Time"]["End"])
+
+ start_time_utc = start_time.astimezone(timezone.utc)
+ end_time_utc = end_time.astimezone(timezone.utc)
+
+ print(f"detected splatfest schedule: {start_time_utc.isoformat()} to {end_time_utc.isoformat()}")
+
+ if start_time_utc <= target_reset_utc <= end_time_utc:
+ skip_upcoming_reset = True
+ print("Splatfest detected in reset window")
+ else:
+ skip_upcoming_reset = False
+ print("No splatfest active in reset window, yay!!!")
+ else:
+ print("could not find yaml, defaulted to no fest")
+ skip_upcoming_reset = False
+
+ except Exception as e:
+ print(f"failed to check fest schedule: {e}")
- next_sunday = now + timedelta(days=days_ahead)
- next_run = next_sunday.replace(hour=0, minute=0, second=0, microsecond=0)
+ await asyncio.sleep(7200)
+
+ asyncio.create_task(check_splatfest_schedule_loop())
+
+ while True:
+ now_utc = datetime.now(timezone.utc)
+ next_run_utc = get_next_sunday_reset_time_utc()
+ wait_seconds = (next_run_utc - now_utc).total_seconds()
- wait_seconds = (next_run - now).total_seconds()
- print(f"Next ranking reset scheduled for: {next_run} (in {wait_seconds:.0f} seconds)")
+ print(f"Next ranking reset scheduled for: {next_run_utc.isoformat()} (in {wait_seconds:.0f} seconds)")
try:
await asyncio.sleep(wait_seconds)
- print("Executing weekly ranking reset...")
- with SessionLocal() as db:
- db.execute(delete(PlayerRank))
- db.commit()
- print("Ranking table cleared successfully.")
- await FastAPICache.clear()
- print("Cache cleared")
+ print("ranking reset triggerred!")
+ if skip_upcoming_reset:
+ print("Reset skipped due to active splatfest")
+ else:
+ print("Executing weekly ranking reset...")
+ with SessionLocal() as db:
+ db.execute(delete(PlayerRank))
+ db.commit()
+ print("Ranking table cleared successfully.")
+ await FastAPICache.clear()
+ print("Cache cleared")
+
await asyncio.sleep(60)
except asyncio.CancelledError:
@@ -136,6 +188,7 @@ app.include_router(equipment_history.router, prefix="/api/v1")
app.include_router(equipment.router, prefix="/api/v1")
app.include_router(Ranking.router, prefix="/api/v1")
app.include_router(twitter_link.router, prefix="/api/v1")
+app.include_router(ranking_grabstats.router, prefix="/api/v1")
def start():
uvicorn.run("main:app", host="0.0.0.0", port=settings.port, reload=False)
diff --git a/pyproject.toml b/pyproject.toml
index e0dd270..6dcb7ad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,47 +5,47 @@ description = "Backend for SplatNet"
readme = "README.md"
requires-python = ">=3.11"
dependencies = [
- "annotated-doc==0.0.4",
+ "annotated-doc==0.0.5",
"annotated-types==0.7.0",
- "anyio==4.13.0",
+ "anyio==4.14.1",
"argon2-cffi==25.1.0",
"argon2-cffi-bindings==25.1.0",
- "certifi==2026.4.22",
- "cffi==2.0.0",
- "charset-normalizer==3.4.7",
- "click==8.3.3",
+ "certifi==2026.7.22",
+ "cffi==2.1.1",
+ "charset-normalizer==3.4.9",
+ "click==8.4.2",
"colorama==0.4.6",
- "cryptography==46.0.7",
- "fastapi==0.136.1",
+ "cryptography==50.0.0",
+ "fastapi==0.141.1",
"fastapi-cache2==0.2.2",
- "greenlet==3.4.0",
+ "greenlet==3.5.5",
"h11==0.16.0",
"httpcore==1.0.9",
"httpx==0.28.1",
- "idna==3.13",
+ "idna==3.18",
"oauthlib==3.3.1",
"oead==1.2.9.post4",
"pendulum==3.2.0",
"psycopg2-binary==2.9.12",
"pycparser==3.0",
- "pydantic==2.13.3",
+ "pydantic==2.13.4",
"pydantic-core==2.46.4",
- "pydantic-settings==2.14.0",
+ "pydantic-settings==2.15.0",
"python-dateutil==2.9.0.post0",
"python-dotenv==1.2.2",
- "python-multipart==0.0.27",
+ "python-multipart==0.0.32",
"pyyaml==6.0.3",
- "requests==2.33.1",
+ "requests==2.34.2",
"requests-oauthlib==2.0.0",
"six==1.17.0",
- "sqlalchemy==2.0.49",
- "starlette==1.0.0",
- "tweepy==4.16.0",
- "typing-extensions==4.15.0",
- "typing-inspection==0.4.2",
- "tzdata==2026.2",
- "urllib3==2.6.3",
- "uvicorn==0.46.0",
+ "sqlalchemy==2.0.51",
+ "starlette==1.6.0",
+ "tweepy==4.17.0",
+ "typing-extensions==4.16.0",
+ "typing-inspection==0.4.3",
+ "tzdata==2026.3",
+ "urllib3==2.7.0",
+ "uvicorn==0.52.1",
"jinja2==3.1.6",
]
diff --git a/renovate.json b/renovate.json
index 3f918de..401475e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,7 +4,7 @@
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch"],
- "automerge": true
+ "automerge": false
},
{
"matchUpdateTypes": ["major"],
diff --git a/routes/boss.py b/routes/boss.py
index d003d0f..e3ef57e 100644
--- a/routes/boss.py
+++ b/routes/boss.py
@@ -47,6 +47,20 @@ async def boss_rotation(request: Request):
})
return formatted
+ def nintydevsuranidiotforusingrgb(color_val):
+ if not color_val:
+ return "#000000"
+ if isinstance(color_val, str):
+ parts = [float(p.strip()) for p in color_val.split(",") if p.strip()]
+ elif isinstance(color_val, (list, tuple)):
+ parts = [float(p) for p in color_val]
+ else:
+ return "#000000"
+
+ # trash 4th val
+ rgb = [round(c * 255) for c in parts[:3]]
+ return f"#{rgb[0]:02X}{rgb[1]:02X}{rgb[2]:02X}"
+
with open("boss.yaml", "r", encoding='utf-8') as f:
yaml_data = yaml.safe_load(f)
@@ -97,14 +111,19 @@ async def boss_rotation(request: Request):
fest_result = parse_iso(time_cfg.get("Result"))
teams = fes_yaml.get("Teams", [])
- team_shortnames = []
+ formatted_teams = []
for team in teams:
- team_shortnames.append(team.get("ShortName", {}))
+ raw_color = team.get("Color")
+ formatted_teams.append({
+ "shortName": team.get("ShortName", {}),
+ "color": nintydevsuranidiotforusingrgb(raw_color)
+ })
response_data["splatfestivalSplatfest"] = {
"stages": format_stages(fes_yaml.get("Stages", [])),
"mode": RULE_NAMES.get(fes_yaml.get("Rule"), "TurfWar"),
- "teams": team_shortnames,
+ "teams": formatted_teams,
+ "battleResultRate": fes_yaml.get("BattleResultRate", {}),
"time": {
"start": fest_start,
"end": fest_end,
diff --git a/routes/equipment/equipment.py b/routes/equipment/equipment.py
index 41ef3f7..72c397e 100644
--- a/routes/equipment/equipment.py
+++ b/routes/equipment/equipment.py
@@ -33,7 +33,7 @@ async def get_equipment_composite(request: Request, db: DBSession = Depends(get_
try:
decrypted_pass = cipher.decrypt(user.spfn_pass_enc.encode()).decode()
token_data = auth.get_token(user.username, decrypted_pass)
- profile = json.loads(auth.get_profile(token_data["token"]))
+ profile = auth.get_profile(token_data["access_token"])
pid_val = int(profile.get("pid"))
mii_name = profile.get("name", user.username)
diff --git a/routes/equipment/equipment_history.py b/routes/equipment/equipment_history.py
index a74309e..54060ff 100644
--- a/routes/equipment/equipment_history.py
+++ b/routes/equipment/equipment_history.py
@@ -27,7 +27,7 @@ async def get_history(request: Request, db: DBSession = Depends(get_db)):
try:
decrypted_pass = cipher.decrypt(user.spfn_pass_enc.encode()).decode()
token_data = auth.get_token(user.username, decrypted_pass)
- profile = json.loads(auth.get_profile(token_data["token"]))
+ profile = auth.get_profile(token_data["access_token"])
pid_val = int(profile.get("pid"))
print(f"Fetching History for PID: {pid_val}")
diff --git a/routes/me.py b/routes/me.py
index 4d20b11..72a2456 100644
--- a/routes/me.py
+++ b/routes/me.py
@@ -33,10 +33,10 @@ async def get_my_profile(request: Request, db: DBSession = Depends(get_db)):
decrypted_pass = cipher.decrypt(user.spfn_pass_enc.encode()).decode()
token_data = auth.get_token(user.username, decrypted_pass)
- if not token_data or "token" not in token_data:
+ if not token_data or "access_token" not in token_data:
return RedirectResponse(url="/sign_in/")
- profile_data = auth.get_profile(token_data["token"])
+ profile_data = auth.get_profile(token_data["access_token"])
if not profile_data:
raise HTTPException(status_code=404, detail="Profile not found")
diff --git a/routes/ranking_grabstats.py b/routes/ranking_grabstats.py
new file mode 100644
index 0000000..b46f47e
--- /dev/null
+++ b/routes/ranking_grabstats.py
@@ -0,0 +1,72 @@
+from fastapi import APIRouter, Depends, HTTPException
+from sqlalchemy.orm import Session as DBSession
+from sqlalchemy import desc
+from database import SessionLocal, PlayerRank, EquipmentLast
+from fastapi_cache.decorator import cache
+
+router = APIRouter()
+
+def get_db():
+ db = SessionLocal()
+ try:
+ yield db
+ finally:
+ db.close()
+
+@router.get("/leaderboard/getplayerstats/{pid}")
+@cache(expire=60)
+async def get_player_stats(pid: int, mode: int | None = None, db: DBSession = Depends(get_db)):
+ try:
+ query = (
+ db.query(PlayerRank, EquipmentLast)
+ .outerjoin(EquipmentLast, PlayerRank.PId == EquipmentLast.PId)
+ .filter(PlayerRank.PId == pid)
+ )
+
+ if mode is not None:
+ query = query.filter(PlayerRank.GameMode == mode)
+
+ result = query.first()
+
+ if not result:
+ raise HTTPException(status_code=404, detail="Player not found")
+
+ player, gear = result
+
+ player_data = {
+ "PId": player.PId,
+ "MiiName": player.MiiName,
+ "Rank": player.Rank,
+ "GameMode": player.GameMode,
+ "WinSum": player.WinSum,
+ "LoseSum": player.LoseSum,
+ "RankingScore": round(player.RankingScore, 2),
+ "weapon": gear.weapon if gear else None,
+ "headgear": gear.Gear_Head if gear else None,
+ "clothes": gear.Gear_Clothes if gear else None,
+ "shoes": gear.Gear_Shoes if gear else None,
+ }
+
+ if player.GameMode == 2:
+ top_100_query = (
+ db.query(PlayerRank.PId)
+ .order_by(desc(PlayerRank.FesPower))
+ .limit(100)
+ .all()
+ )
+ top_100_tuples = set(top_100_query)
+
+ is_top_100 = (player.PId,) in top_100_tuples
+ player_data["FesPower"] = player.FesPower
+ player_data["is_top_100_fes"] = is_top_100
+ else:
+ player_data["FesPower"] = None
+ player_data["is_top_100_fes"] = False
+
+ return player_data
+
+ except HTTPException as http_ex:
+ raise http_ex
+ except Exception as e:
+ print(f"Error fetching stats for player {pid}: {e}")
+ return {"error": str(e)}
\ No newline at end of file
diff --git a/routes/sso.py b/routes/sso.py
index e33d9cd..7bbbfcc 100644
--- a/routes/sso.py
+++ b/routes/sso.py
@@ -37,7 +37,7 @@ async def login(
try:
print("fetching spfn token")
data = auth.get_token(username, password)
- if not data or "token" not in data:
+ if not data or "access_token" not in data:
print("auth failed")
return RedirectResponse(f"{auth_path}{sep}error=auth&username={username}", 303)
diff --git a/routes/twitter_link.py b/routes/twitter_link.py
index 9addb7b..65fcd00 100644
--- a/routes/twitter_link.py
+++ b/routes/twitter_link.py
@@ -93,7 +93,7 @@ async def confirm_twitter(state: str, code: str, db: DBSession = Depends(get_db)
decrypted_pass = cipher.decrypt(user.spfn_pass_enc.encode()).decode()
profile_auth = auth.get_token(user.username, decrypted_pass)
- profile_response = auth.get_profile(profile_auth["token"])
+ profile_response = auth.get_profile(profile_auth["access_token"])
if isinstance(profile_response, str):
try:
@@ -149,7 +149,7 @@ async def get_twitter_status(request: Request, db: DBSession = Depends(get_db)):
try:
decrypted_pass = cipher.decrypt(user.spfn_pass_enc.encode()).decode()
profile_auth = auth.get_token(user.username, decrypted_pass)
- profile_res = auth.get_profile(profile_auth["token"])
+ profile_res = auth.get_profile(profile_auth["access_token"])
if isinstance(profile_res, str):
profile_data = json.loads(profile_res)
@@ -183,7 +183,7 @@ async def unlink_twitter(request: Request, db: DBSession = Depends(get_db)):
user = db.query(User).filter(User.username == db_session.username).first()
decrypted_pass = cipher.decrypt(user.spfn_pass_enc.encode()).decode()
profile_auth = auth.get_token(user.username, decrypted_pass)
- profile_data = auth.get_profile(profile_auth["token"])
+ profile_data = auth.get_profile(profile_auth["access_token"])
if isinstance(profile_data, str):
profile_data = json.loads(profile_data)
diff --git a/security.md b/security.md
new file mode 100644
index 0000000..9634fba
--- /dev/null
+++ b/security.md
@@ -0,0 +1,3 @@
+# Security Policy
+
+Report security vulnerabilities through the security tab on this repo. Only vulnerabilities on the latest commit of any branch will be considered.
diff --git a/services/auth.py b/services/auth.py
index d25218d..efd1f49 100644
--- a/services/auth.py
+++ b/services/auth.py
@@ -1,35 +1,41 @@
import requests
-import base64
+from config import settings
from argon2 import PasswordHasher
-API_URL = "https://account.spfn.net/api/v2"
+API_URL = "https://account.spbr.net/api/v2"
+CLIENT_ID = "splatnet"
+CLIENT_SECRET = settings.account_client_secret
ph = PasswordHasher()
def hash_password(password: str):
return ph.hash(password)
-def verify_password(hashed: str, password: str):
- try:
- return ph.verify(hashed, password)
- except Exception:
- return False
-
def get_token(username, password):
- creds = f"{username} {password}"
- encoded = base64.b64encode(creds.encode()).decode()
+ url = f"{API_URL}/oauth2/generate_token"
- headers = {
- "Authorization": f"Basic {encoded}",
- "User-Agent": "saturday & allison should lwk kiss..."
+ payload = {
+ "grant_type": "password",
+ "username": username,
+ "password": password,
+ "client_id": CLIENT_ID,
+ "client_secret": CLIENT_SECRET
}
- response = requests.get(f"{API_URL}/oauth2/generate_token", headers=headers, timeout=10)
+ headers = {
+ "User-Agent": "chiyo & eri should lwk kiss..."
+ }
+
+ response = requests.post(url, data=payload, headers=headers, timeout=10)
return response.json() if response.ok else None
def get_profile(token):
+ url = f"{API_URL}/users/@me/profile"
+
headers = {
"Authorization": f"Bearer {token}",
- "User-Agent": "every update im going to change this user agent because im bored!!"
+ "User-Agent": "lets make the most of the night like were gonna die young!!"
}
- response = requests.get(f"{API_URL}/users/@me/profile", headers=headers, timeout=10)
- return response.text if response.ok else None
\ No newline at end of file
+
+ response = requests.get(url, headers=headers, timeout=10)
+
+ return response.json() if response.ok else None
diff --git a/services/boss_retrieval.py b/services/boss_retrieval.py
index 54dc664..3737f76 100644
--- a/services/boss_retrieval.py
+++ b/services/boss_retrieval.py
@@ -15,29 +15,46 @@ def process_boss_file():
base_url = settings.boss_url.rstrip('/')
tasks = [
- {"url": f"{base_url}/zvGSM4kOrXpkKnpT/schdat2?c=JP&l=en", "output": "boss.yaml"},
- {"url": f"{base_url}/zvGSM4kOrXpkKnpT/optdat2?c=US&l=en", "output": "fes_boss.yaml"}
+ {
+ "url": f"{base_url}/zvGSM4kOrXpkKnpT/schdat2?c=JP&l=en",
+ "filename": "VSSetting.byaml",
+ "output": "boss.yaml"
+ },
+ {
+ "url": f"{base_url}/zvGSM4kOrXpkKnpT/optdat2?c=US&l=en",
+ "filename": "Festival.byaml",
+ "output": "fes_boss.yaml"
+ }
]
try:
success_all = True
for task in tasks:
master_url = task["url"]
+ target_filename = task["filename"]
output_yaml = task["output"]
print(f"data get: {master_url}")
meta_res = requests.get(master_url, timeout=10)
meta_res.raise_for_status()
root = ET.fromstring(meta_res.content)
- data_url_element = root.find(".//Url")
- if data_url_element is None or not data_url_element.text:
- print("woops! no tag found in the XML response")
+ # LMFAO HOW DID THIS FLY UNDER THE RADAR FOR SO LONG
+ real_data_url = None
+ for file_element in root.findall(".//File"):
+ filename_elem = file_element.find("Filename")
+ if filename_elem is not None and filename_elem.text == target_filename:
+ url_elem = file_element.find("Url")
+ if url_elem is not None and url_elem.text:
+ real_data_url = url_elem.text.strip()
+ break
+
+ if not real_data_url:
+ print(f"woops! could not find URL for file '{target_filename}' in the XML response")
success_all = False
continue
- real_data_url = data_url_element.text.strip()
- print(f"parsed data url: {real_data_url}")
+ print(f"parsed data url for {target_filename}: {real_data_url}")
res = requests.get(real_data_url, timeout=10)
res.raise_for_status()
diff --git a/support.md b/support.md
new file mode 100644
index 0000000..7cfc89e
--- /dev/null
+++ b/support.md
@@ -0,0 +1,3 @@
+# Support
+
+For support, join [our discord](https://discord.gg/splatfestival).