diff --git a/.drone.yml b/.drone.yml index 47293dd..b843027 100644 --- a/.drone.yml +++ b/.drone.yml @@ -85,7 +85,7 @@ steps: commands: - curl -sL https://git.io/goreleaser > 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 - 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"' @@ -164,7 +164,7 @@ steps: commands: - curl -sL https://git.io/goreleaser > goreleaser - chmod +x goreleaser - - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --clean + - ./scripts/version.sh ./goreleaser --snapshot --skip=publish --clean trigger: event: diff --git a/ts/user.ts b/ts/user.ts index de13f63..44bfac3 100644 --- a/ts/user.ts +++ b/ts/user.ts @@ -266,13 +266,20 @@ class ReferralCard { get code(): string { return this._code; } set code(c: string) { this._code = c; - let url = window.location.href; - for (let split of ["#", "?", "account", "my"]) { - url = url.split(split)[0]; + + let u = new URL(window.location.href); + let path = u.pathname; + for (let split of ["account", "my"]) { + path = path.split(split)[0]; } - if (url.slice(-1) != "/") { url += "/"; } - url = url + "invite/" + this._code; - this._url = url; + if (path.slice(-1) != "/") { path += "/"; } + path = path + "invite/" + this._code; + + u.pathname = path; + u.hash = ""; + u.search = ""; + + this._url = u.toString(); } get remaining_uses(): number { return this._remainingUses; }