diff options
| author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-03-31 00:06:13 +1100 |
|---|---|---|
| committer | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-03-31 00:06:13 +1100 |
| commit | 6972dac5603e4019f3edc85fa753bde544948730 (patch) | |
| tree | 3040bd1df368956a3b0af3d04783b2a0134fbb4b /api | |
| parent | Merge branch 'maddyrtc' into slowcord (diff) | |
| parent | Make member.premium_since ISO8601 timestamp (diff) | |
| download | server-6972dac5603e4019f3edc85fa753bde544948730.tar.xz | |
Merge branch 'master' into slowcord
Diffstat (limited to 'api')
| -rw-r--r-- | api/assets/openapi.json | 6 | ||||
| -rw-r--r-- | api/assets/preload-plugins/fosscord-login.js | 12 | ||||
| -rw-r--r-- | api/assets/schemas.json | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/api/assets/openapi.json b/api/assets/openapi.json index 03550323..a8a657b2 100644 --- a/api/assets/openapi.json +++ b/api/assets/openapi.json @@ -2,7 +2,7 @@ "openapi": "3.0.0", "servers": [ { - "url": "https://api.fosscord.com/v{version}", + "url": "https://api.fosscord.com/api/v{version}", "description": "Official fosscord instance", "variables": { "version": { @@ -2960,7 +2960,7 @@ "type": { "type": "string" }, - "verifie": { + "verified": { "type": "boolean" }, "visibility": { @@ -2980,7 +2980,7 @@ "type", "user", "user_id", - "verifie", + "verified", "visibility" ] }, diff --git a/api/assets/preload-plugins/fosscord-login.js b/api/assets/preload-plugins/fosscord-login.js new file mode 100644 index 00000000..38f82200 --- /dev/null +++ b/api/assets/preload-plugins/fosscord-login.js @@ -0,0 +1,12 @@ +// Remove `<link id="logincss" rel="stylesheet" href="/assets/fosscord-login.css" />` from header when we're not accessing `/login` or `/register` +// fosscord-login.css replaces discord's TOS tooltip with something more fitting for fosscord, which when included in the main app, causes other tooltips +// to be affected, which is potentially unwanted. +// +// This script removes fosscord-login.css when a user reloads the page. From testing, it appears fosscord already properly removes +// fosscord-login.css after login is successful, but not if you reload the page after logging in. This script is to remove fosscord-login.css in +// that specific case. + +var token = JSON.parse(localStorage.getItem("token")); +if (!token && location.pathname !== "/login" && location.pathname !== "/register") { + document.getElementById("logincss").remove(); +} diff --git a/api/assets/schemas.json b/api/assets/schemas.json index 1b905197..555129e3 100644 --- a/api/assets/schemas.json +++ b/api/assets/schemas.json @@ -355,11 +355,11 @@ "type": { "type": "string" }, - "verifie": { + "verified": { "type": "boolean" } }, - "required": ["name", "type", "verifie"] + "required": ["name", "type", "verified"] } }, "$schema": "http://json-schema.org/draft-07/schema#" |