config: add http:// to all urls if needed, fix invite link generation

changed invites.ts to generate links using window.Pages entirely, rather
than chopping up window.location.href.
This commit is contained in:
Harvey Tindall
2025-05-14 22:46:46 +01:00
parent e38ac62ae4
commit 44e8035ff0
3 changed files with 21 additions and 23 deletions
-10
View File
@@ -48,16 +48,6 @@ export class Activity implements activity, SearchableItem {
private _delete: HTMLElement;
private _ip: HTMLElement;
private _act: activity;
/* private _urlBase: string = ((): string => {
let link = window.location.href;
for (let split of ["#", "?", "/activity"]) {
link = link.split(split)[0];
}
if (link.slice(-1) != "/") { link += "/"; }
// FIXME: I should probably just be using window.pages.Base, but incase thats not right, i'll put this warning here
if (link != window.pages.Base) console.error(`URL Bases don't match: "${link}" != "${window.pages.Base}"`);
return link;
})(); */
_genUserText = (): string => {
return `<span class="font-medium">${this._act.username || this._act.user_id.substring(0, 5)}</span>`;
+1 -6
View File
@@ -63,12 +63,7 @@ class DOMInvite implements Invite {
get code(): string { return this._code; }
set code(code: string) {
this._code = code;
let codeLink = window.location.href;
for (let split of ["#", "?"]) {
codeLink = codeLink.split(split)[0];
}
if (codeLink.slice(-1) != "/") { codeLink += "/"; }
this._codeLink = codeLink + window.pages.Form + "/" + code;
this._codeLink = window.pages.Base + window.pages.Form + "/" + code;
const linkEl = this._codeArea.querySelector("a") as HTMLAnchorElement;
if (this.label == "") {
linkEl.textContent = code.replace(/-/g, '-');