hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-10-18 00:50:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #347 from jeppevinkel/patch-1

Browse Source 
Fix referral url when subdomain contains `account`
This commit is contained in:
Harvey Tindall 2024-07-13 23:33:46 +01:00 committed by GitHub
commit a085e91cc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -85,7 +85,7 @@ steps:
commands: commands:
- curl -sL https://git.io/goreleaser > goreleaser - curl -sL https://git.io/goreleaser > goreleaser
- chmod +x goreleaser - chmod +x goreleaser
- ./scripts/version.sh ./goreleaser --snapshot --skip-publish --clean - ./scripts/version.sh ./goreleaser --snapshot --skip=publish --clean
- wget https://builds.hrfee.pw/upload.py - wget https://builds.hrfee.pw/upload.py
- pip3 install requests - pip3 install requests
- bash -c 'sftp -i /id_rsa2 -o StrictHostKeyChecking=no root@161.97.102.153:/mnt/redoc <<< $"put docs/swagger.json jfa-go.json"' - bash -c 'sftp -i /id_rsa2 -o StrictHostKeyChecking=no root@161.97.102.153:/mnt/redoc <<< $"put docs/swagger.json jfa-go.json"'
@ -164,7 +164,7 @@ steps:
commands: commands:
- curl -sL https://git.io/goreleaser > goreleaser - curl -sL https://git.io/goreleaser > goreleaser
- chmod +x goreleaser - chmod +x goreleaser
- ./scripts/version.sh ./goreleaser --snapshot --skip-publish --clean - ./scripts/version.sh ./goreleaser --snapshot --skip=publish --clean
trigger: trigger:
event: event:

19
ts/user.ts
View File

@ -266,13 +266,20 @@ class ReferralCard {
get code(): string { return this._code; } get code(): string { return this._code; }
set code(c: string) { set code(c: string) {
this._code = c; this._code = c;
let url = window.location.href;
for (let split of ["#", "?", "account", "my"]) { let u = new URL(window.location.href);
url = url.split(split)[0]; let path = u.pathname;
for (let split of ["account", "my"]) {
path = path.split(split)[0];
} }
if (url.slice(-1) != "/") { url += "/"; } if (path.slice(-1) != "/") { path += "/"; }
url = url + "invite/" + this._code; path = path + "invite/" + this._code;
this._url = url;
u.pathname = path;
u.hash = "";
u.search = "";
this._url = u.toString();
} }
get remaining_uses(): number { return this._remainingUses; } get remaining_uses(): number { return this._remainingUses; }