From ce3ea3a27152a1d69cd7edac0ac2b1286699e390 Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Mon, 19 Aug 2024 12:19:42 -0500 Subject: [PATCH] add "noImplicitThis":true --- .dist/channel.js | 9 ++++----- .dist/dialog.js | 2 +- .dist/guild.js | 8 +++----- .dist/index.js | 10 ++++++---- .dist/localuser.js | 3 +-- .dist/member.js | 2 +- .dist/message.js | 2 +- tsconfig.json | 3 ++- webpage/channel.ts | 24 ++++++++++++------------ webpage/dialog.ts | 2 +- webpage/guild.ts | 22 +++++++++++----------- webpage/index.ts | 4 ++-- webpage/localuser.ts | 6 +++--- webpage/login.ts | 2 +- webpage/member.ts | 6 +++--- webpage/message.ts | 10 +++++----- webpage/user.ts | 2 +- 17 files changed, 58 insertions(+), 59 deletions(-) diff --git a/.dist/channel.js b/.dist/channel.js index 8011fe1..376dadd 100644 --- a/.dist/channel.js +++ b/.dist/channel.js @@ -58,7 +58,7 @@ class Channel { this.deleteChannel(); }, null, _ => { console.log(_); return _.isAdmin(); }); this.contextmenu.addbutton("Edit channel", function () { - this.editChannel(this); + this.editChannel(); }, null, _ => { return _.isAdmin(); }); this.contextmenu.addbutton("Make invite", function () { this.createInvite(); @@ -346,9 +346,9 @@ class Channel { addchannel.textContent = "+"; addchannel.classList.add("addchannel"); caps.appendChild(addchannel); - addchannel.onclick = function () { + addchannel.onclick = _ => { this.guild.createchannels(this.createChannel.bind(this)); - }.bind(this); + }; this.coatDropDiv(decdiv, childrendiv); } div.appendChild(caps); @@ -552,8 +552,7 @@ class Channel { }); console.log(full); full.hide(); - }] - ] + }]] ]); full.show(); console.log(full); diff --git a/.dist/dialog.js b/.dist/dialog.js index fc2f3ab..11ee249 100644 --- a/.dist/dialog.js +++ b/.dist/dialog.js @@ -238,7 +238,7 @@ class Dialog { this.background.classList.add("background"); document.body.appendChild(this.background); document.body.appendChild(this.html); - this.background.onclick = function () { this.hide(); }.bind(this); + this.background.onclick = _ => { this.hide(); }; } hide() { document.body.removeChild(this.background); diff --git a/.dist/guild.js b/.dist/guild.js index 815c2f7..9a83b45 100644 --- a/.dist/guild.js +++ b/.dist/guild.js @@ -446,8 +446,7 @@ class Guild { console.log(name, category); func(name, category); channelselect.hide(); - }.bind(this)] - ]); + }.bind(this)]]); channelselect.show(); } createcategory() { @@ -458,12 +457,11 @@ class Guild { console.log(this); name = this.value; }], - ["button", "", "submit", function () { + ["button", "", "submit", () => { console.log(name, category); this.createChannel(name, category); channelselect.hide(); - }] - ]); + }]]); channelselect.show(); } delChannel(json) { diff --git a/.dist/index.js b/.dist/index.js index 284441c..d28ad76 100644 --- a/.dist/index.js +++ b/.dist/index.js @@ -153,11 +153,13 @@ typebox.addEventListener("keydown", event => { }); console.log(typebox); typebox.onclick = console.log; -function getguildinfo() { - const path = window.location.pathname.split("/"); - const channel = path[3]; - this.ws.send(JSON.stringify({ op: 14, d: { guild_id: path[2], channels: { [channel]: [[0, 99]] } } })); +/* +function getguildinfo(){ + const path=window.location.pathname.split("/"); + const channel=path[3]; + this.ws.send(JSON.stringify({op: 14, d: {guild_id: path[2], channels: {[channel]: [[0, 99]]}}})); } +*/ const images = []; const imageshtml = []; import { File } from "./file.js"; diff --git a/.dist/localuser.js b/.dist/localuser.js index 8a6c423..9d774a7 100644 --- a/.dist/localuser.js +++ b/.dist/localuser.js @@ -917,8 +917,7 @@ class Localuser { this.mfa_enabled = true; } }); - }] - ]); + }]]); console.log("here :3"); addmodel.show(); }); diff --git a/.dist/member.js b/.dist/member.js index 83683e8..68bd5a7 100644 --- a/.dist/member.js +++ b/.dist/member.js @@ -17,7 +17,7 @@ class Member { this.contextmenu.addbutton("Message user", function () { fetch(this.info.api + "/users/@me/channels", { method: "POST", body: JSON.stringify({ "recipients": [this.id] }), - headers: this.headers + headers: this.localuser.headers }); }); } diff --git a/.dist/message.js b/.dist/message.js index d61fa81..96ab4e7 100644 --- a/.dist/message.js +++ b/.dist/message.js @@ -70,7 +70,7 @@ class Message { Message.contextmenu.addbutton("Edit", function () { this.channel.editing = this; const markdown = (document.getElementById("typebox"))["markdown"]; - markdown.txt = this.content.rawString; + markdown.txt = this.content.rawString.split(''); markdown.boxupdate(document.getElementById("typebox")); }, null, _ => { return _.author.id === _.localuser.user.id; }); Message.contextmenu.addbutton("Delete message", function () { diff --git a/tsconfig.json b/tsconfig.json index b4b481e..9dba0e0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,8 @@ "strict": false, "esModuleInterop": true, "outDir": "./.dist", - "removeComments": false + "removeComments": false, + "noImplicitThis":true }, "include": [ "./webpage/*.ts" diff --git a/webpage/channel.ts b/webpage/channel.ts index 74c8d22..139b558 100644 --- a/webpage/channel.ts +++ b/webpage/channel.ts @@ -51,30 +51,30 @@ class Channel{ return this.snowflake.id; } static setupcontextmenu(){ - this.contextmenu.addbutton("Copy channel id",function(){ + this.contextmenu.addbutton("Copy channel id",function(this:Channel){ console.log(this) navigator.clipboard.writeText(this.id); }); - this.contextmenu.addbutton("Mark as read",function(){ + this.contextmenu.addbutton("Mark as read",function(this:Channel){ console.log(this) this.readbottom(); }); - this.contextmenu.addbutton("Settings[temp]",function(){ + this.contextmenu.addbutton("Settings[temp]",function(this:Channel){ this.generateSettings(); }); - this.contextmenu.addbutton("Delete channel",function(){ + this.contextmenu.addbutton("Delete channel",function(this:Channel){ console.log(this) this.deleteChannel(); },null,_=>{console.log(_);return _.isAdmin()}); - this.contextmenu.addbutton("Edit channel",function(){ - this.editChannel(this); + this.contextmenu.addbutton("Edit channel",function(this:Channel){ + this.editChannel(); },null,_=>{return _.isAdmin()}); - this.contextmenu.addbutton("Make invite",function(){ + this.contextmenu.addbutton("Make invite",function(this:Channel){ this.createInvite(); },null,(_:Channel)=>{ return _.hasPermission("CREATE_INSTANT_INVITE")&&_.type!==4 @@ -356,9 +356,9 @@ class Channel{ addchannel.textContent="+"; addchannel.classList.add("addchannel"); caps.appendChild(addchannel); - addchannel.onclick=function(){ + addchannel.onclick=_=>{ this.guild.createchannels(this.createChannel.bind(this)); - }.bind(this); + } this.coatDropDiv(decdiv,childrendiv); } div.appendChild(caps) @@ -537,9 +537,9 @@ class Channel{ const full=new Dialog( ["hdiv", ["vdiv", - ["textbox","Channel name:",this.name,function(){name=this.value}], - ["mdbox","Channel topic:",this.topic,function(){topic=this.value}], - ["checkbox","NSFW Channel",this.nsfw,function(){nsfw=this.checked}], + ["textbox","Channel name:",this.name,function(this:HTMLInputElement){name=this.value}], + ["mdbox","Channel topic:",this.topic,function(this:HTMLTextAreaElement){topic=this.value}], + ["checkbox","NSFW Channel",this.nsfw,function(this:HTMLInputElement){nsfw=this.checked}], ["button","","submit",()=>{ fetch(this.info.api+"/channels/"+thisid,{ method:"PATCH", diff --git a/webpage/dialog.ts b/webpage/dialog.ts index 985031a..def7c25 100644 --- a/webpage/dialog.ts +++ b/webpage/dialog.ts @@ -241,7 +241,7 @@ class Dialog{ this.background.classList.add("background"); document.body.appendChild(this.background); document.body.appendChild(this.html); - this.background.onclick = function(){this.hide();}.bind(this); + this.background.onclick = _=>{this.hide()}; } hide(){ document.body.removeChild(this.background); diff --git a/webpage/guild.ts b/webpage/guild.ts index f3a4d28..b662a64 100644 --- a/webpage/guild.ts +++ b/webpage/guild.ts @@ -31,33 +31,33 @@ class Guild{ } static contextmenu=new Contextmenu("guild menu"); static setupcontextmenu(){ - Guild.contextmenu.addbutton("Copy Guild id",function(){ + Guild.contextmenu.addbutton("Copy Guild id",function(this:Guild){ console.log(this) navigator.clipboard.writeText(this.id); }); - Guild.contextmenu.addbutton("Mark as read",function(){ + Guild.contextmenu.addbutton("Mark as read",function(this:Guild){ console.log(this) this.markAsRead(); }); - Guild.contextmenu.addbutton("Notifications",function(){ + Guild.contextmenu.addbutton("Notifications",function(this:Guild){ console.log(this) this.setnotifcation(); }); - Guild.contextmenu.addbutton("Leave guild",function(){ + Guild.contextmenu.addbutton("Leave guild",function(this:Guild){ this.confirmleave(); },null,function(_){return _.properties.owner_id!==_.member.user.id}); - Guild.contextmenu.addbutton("Delete guild",function(){ + Guild.contextmenu.addbutton("Delete guild",function(this:Guild){ this.confirmDelete(); },null,function(_){return _.properties.owner_id===_.member.user.id}); - Guild.contextmenu.addbutton("Create invite",function(){ + Guild.contextmenu.addbutton("Create invite",function(this:Guild){ console.log(this); },null,_=>true,_=>false); - Guild.contextmenu.addbutton("Settings[temp]",function(){ + Guild.contextmenu.addbutton("Settings[temp]",function(this:Guild){ this.generateSettings(); }); /* -----things left for later----- @@ -296,7 +296,7 @@ class Guild{ ["textbox", "Name of server:", "", - function(){ + function(this:HTMLInputElement){ confirmname=this.value; } ] @@ -447,7 +447,7 @@ class Guild{ }, 1 ], - ["textbox","Name of channel","",function(){ + ["textbox","Name of channel","",function(this:HTMLInputElement){ console.log(this) name=this.value }], @@ -464,11 +464,11 @@ class Guild{ let category=4; const channelselect=new Dialog( ["vdiv", - ["textbox","Name of category","",function(){ + ["textbox","Name of category","",function(this:HTMLInputElement){ console.log(this); name=this.value; }], - ["button","","submit",function(){ + ["button","","submit",()=>{ console.log(name,category) this.createChannel(name,category); channelselect.hide(); diff --git a/webpage/index.ts b/webpage/index.ts index 4a9501c..972190e 100644 --- a/webpage/index.ts +++ b/webpage/index.ts @@ -166,13 +166,13 @@ typebox.addEventListener("keydown",event=>{ console.log(typebox) typebox.onclick=console.log; - +/* function getguildinfo(){ const path=window.location.pathname.split("/"); const channel=path[3]; this.ws.send(JSON.stringify({op: 14, d: {guild_id: path[2], channels: {[channel]: [[0, 99]]}}})); } - +*/ const images:Blob[]=[]; const imageshtml=[]; diff --git a/webpage/localuser.ts b/webpage/localuser.ts index 90e668e..b3da697 100644 --- a/webpage/localuser.ts +++ b/webpage/localuser.ts @@ -534,7 +534,7 @@ class Localuser{ ["textbox", "Invite Link/Code", "", - function(){ + function(this:HTMLInputElement){ inviteurl=this.value; } ], @@ -916,8 +916,8 @@ class Localuser{ ["title","2FA set up"], ["text","Copy this secret into your totp(time-based one time password) app"], ["text",`Your secret is: ${secret} and it's 6 digits, with a 30 second token period`], - ["textbox","Account password:","",function(){password=this.value}], - ["textbox","Code:","",function(){code=this.value}], + ["textbox","Account password:","",function(this:HTMLInputElement){password=this.value}], + ["textbox","Code:","",function(this:HTMLInputElement){code=this.value}], ["button","","Submit",()=>{ fetch(this.info.api+"/users/@me/mfa/totp/enable/",{ method:"POST", diff --git a/webpage/login.ts b/webpage/login.ts index 766f72c..45d3d56 100644 --- a/webpage/login.ts +++ b/webpage/login.ts @@ -263,7 +263,7 @@ async function login(username:string, password:string, captcha:string){ console.log(response); if(response.ticket){ let onetimecode=""; - new Dialog(["vdiv",["title","2FA code:"],["textbox","","",function(){onetimecode=this.value}],["button","","Submit",function(){ + new Dialog(["vdiv",["title","2FA code:"],["textbox","","",function(this:HTMLInputElement){onetimecode=this.value}],["button","","Submit",function(){ fetch(api+"/auth/mfa/totp",{ method:"POST", headers:{ diff --git a/webpage/member.ts b/webpage/member.ts index dbbd865..8578bfb 100644 --- a/webpage/member.ts +++ b/webpage/member.ts @@ -14,14 +14,14 @@ class Member{ nick:string; static contextmenu:Contextmenu=new Contextmenu("User Menu"); static setUpContextMenu(){ - this.contextmenu.addbutton("Copy user id",function(){ + this.contextmenu.addbutton("Copy user id",function(this:Member){ navigator.clipboard.writeText(this.id); }); - this.contextmenu.addbutton("Message user",function(){ + this.contextmenu.addbutton("Message user",function(this:Member){ fetch(this.info.api+"/users/@me/channels", {method:"POST", body:JSON.stringify({"recipients":[this.id]}), - headers: this.headers + headers: this.localuser.headers }); }); } diff --git a/webpage/message.ts b/webpage/message.ts index c36e1f8..ce8a79d 100644 --- a/webpage/message.ts +++ b/webpage/message.ts @@ -57,13 +57,13 @@ class Message{ this.del=new Promise(_=>{this.resolve=_}) } static setupcmenu(){ - Message.contextmenu.addbutton("Copy raw text",function(){ + Message.contextmenu.addbutton("Copy raw text",function(this:Message){ navigator.clipboard.writeText(this.content.rawString); }); Message.contextmenu.addbutton("Reply",function(this:Message,div:HTMLDivElement){ this.channel.setReplying(this); }); - Message.contextmenu.addbutton("Copy message id",function(){ + Message.contextmenu.addbutton("Copy message id",function(this:Message){ navigator.clipboard.writeText(this.id); }); Message.contextmenu.addsubmenu("Add reaction",function(this:Message,e){ @@ -72,13 +72,13 @@ class Message{ this.reactionToggle(_); }); }); - Message.contextmenu.addbutton("Edit",function(){ + Message.contextmenu.addbutton("Edit",function(this:Message){ this.channel.editing=this; const markdown=(document.getElementById("typebox"))["markdown"] as MarkDown; - markdown.txt=this.content.rawString; + markdown.txt=this.content.rawString.split(''); markdown.boxupdate(document.getElementById("typebox")); },null,_=>{return _.author.id===_.localuser.user.id}); - Message.contextmenu.addbutton("Delete message",function(){ + Message.contextmenu.addbutton("Delete message",function(this:Message){ this.delete(); },null,_=>{return _.canDelete()}) } diff --git a/webpage/user.ts b/webpage/user.ts index 3122e02..99ec8b2 100644 --- a/webpage/user.ts +++ b/webpage/user.ts @@ -71,7 +71,7 @@ class User{ this.contextmenu.addbutton("Copy user id",function(this:User){ navigator.clipboard.writeText(this.id); }); - this.contextmenu.addbutton("Message user",function(){ + this.contextmenu.addbutton("Message user",function(this:User){ fetch(this.info.api+"/users/@me/channels", {method:"POST", body:JSON.stringify({"recipients":[this.id]}),