diff --git a/.dist/channel.js b/.dist/channel.js index 5c0e566..97806ab 100644 --- a/.dist/channel.js +++ b/.dist/channel.js @@ -99,7 +99,7 @@ class Channel { const params = new URLSearchParams(""); params.set("instance", this.info.wellknown); const encoded = params.toString(); - text.textContent = `${window.location.protocol}//${window.location.host}/invite/${json.code}?${encoded}`; + text.textContent = `${location.origin}/invite/${json.code}?${encoded}`; }); }; update(); diff --git a/.dist/localuser.js b/.dist/localuser.js index 467d7d5..d4263ab 100644 --- a/.dist/localuser.js +++ b/.dist/localuser.js @@ -131,7 +131,7 @@ class Localuser { "compress": !!DecompressionStream, "presence": { "status": "online", - "since": new Date().getTime(), + "since": null, //new Date().getTime() "activities": [], "afk": false } @@ -1092,7 +1092,7 @@ class Localuser { guild_id: guildid, limit: 100, nonce, - //presences:true + presences: true } })); this.fetchingmembers.set(guildid, true); diff --git a/.dist/login.js b/.dist/login.js index f8e71e6..7091388 100644 --- a/.dist/login.js +++ b/.dist/login.js @@ -200,8 +200,8 @@ async function login(username, password, captcha) { }; try { const info = JSON.parse(localStorage.getItem("instanceinfo")); - const api = info.login; - return await fetch(api + '/auth/login', options).then(response => response.json()) + const api = info.login + (info.login.startsWith("/") ? "/" : ""); + return await fetch(api + 'auth/login', options).then(response => response.json()) .then((response) => { console.log(response, response.message); if ("Invalid Form Body" === response.message) { diff --git a/index.js b/index.js index ff949ca..10c6c02 100755 --- a/index.js +++ b/index.js @@ -50,13 +50,7 @@ async function getapiurls(str){ async function inviteres(req,res){ //console.log(req.rawHeaders); try{ - let embed=false; - for(const i in req.rawHeaders){ - if(req.rawHeaders[i]==="User-Agent"){ - embed=isembed(req.rawHeaders[1+ +i]); - } - } - + let embed=isembed(req.get("User-Agent")); if(!embed){return false}; const code=req.path.split("/")[2]; let title=""; diff --git a/webpage/channel.ts b/webpage/channel.ts index e21b1cd..d7d0f03 100644 --- a/webpage/channel.ts +++ b/webpage/channel.ts @@ -113,7 +113,7 @@ class Channel{ const params=new URLSearchParams(""); params.set("instance",this.info.wellknown) const encoded=params.toString(); - text.textContent=`${window.location.protocol}//${window.location.host}/invite/${json.code}?${encoded}` + text.textContent=`${location.origin}/invite/${json.code}?${encoded}` }) } update(); diff --git a/webpage/localuser.ts b/webpage/localuser.ts index 560cca1..393cbf6 100644 --- a/webpage/localuser.ts +++ b/webpage/localuser.ts @@ -137,13 +137,14 @@ class Localuser{ "compress": !!DecompressionStream, "presence": { "status": "online", - "since": new Date().getTime(), + "since": null,//new Date().getTime() "activities": [], "afk": false } } })) }); + let ds:DecompressionStream; let w:WritableStreamDefaultWriter; let r:ReadableStreamDefaultReader; @@ -1116,7 +1117,7 @@ class Localuser{ guild_id:guildid, limit:100, nonce, - //presences:true + presences:true } })); this.fetchingmembers.set(guildid,true); diff --git a/webpage/login.ts b/webpage/login.ts index cbaf8e4..f01575b 100644 --- a/webpage/login.ts +++ b/webpage/login.ts @@ -198,8 +198,8 @@ async function login(username:string, password:string, captcha:string){ }} try{ const info=JSON.parse(localStorage.getItem("instanceinfo")); - const api=info.login; - return await fetch(api+'/auth/login',options).then(response=>response.json()) + const api=info.login+(info.login.startsWith("/")?"/":""); + return await fetch(api+'auth/login',options).then(response=>response.json()) .then((response) => { console.log(response,response.message) if("Invalid Form Body"===response.message){ diff --git a/webpage/register.html b/webpage/register.html index 7d690d0..efed961 100644 --- a/webpage/register.html +++ b/webpage/register.html @@ -16,7 +16,7 @@