code002lover/IPost
1
0
Fork 0
Code Issues 1 Pull Requests 8 Packages Projects Releases Wiki Activity

fix some anti pattern stuff

Browse Source
This commit is contained in:
Mystikfluu
2023-02-10 19:24:05 +01:00
parent 0a46eeee9f
commit 3254d01581
21 changed files with 130 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/dms.js
+39 -39
View File
@@ -11,29 +11,29 @@ var highest_id
var currentChannel
let socket = new WebSocket(wss_URI);
socket.addEventListener("message", async function (event) {
socket.addEventListener("message", async function (_event) {
console.info("TODO: add websocket support to dms")
return
if(wss_server == event.origin) {
let data = event.data;
let ds = JSON.parse(data)
let message = ds.message
let item = ds.data
let username = decodeURIComponent(item.post_user_name)
if(message == "new_post") {
await createPost(decodeURIComponent(item.post_user_name),decodeURIComponent(item.post_text),item.post_time,item.post_special_text,highest_id+1,item.post_from_bot,item.post_reply_id,true)
if(user["username"]!=username)mainNoti(username)
// return
// if(wss_server === event.origin) {
// let data = event.data;
// let ds = JSON.parse(data)
// let message = ds.message
// let item = ds.data
// let username = decodeURIComponent(item.post_user_name)
// if(message === "new_post") {
// await createPost(decodeURIComponent(item.post_user_name),decodeURIComponent(item.post_text),item.post_time,item.post_special_text,highest_id+1,item.post_from_bot,item.post_reply_id,true)
// if(user["username"]!==username)mainNoti(username)
let highest_known_posts = await (await fetch(`/api/getPostsLowerThan?id=${highest_id+28}&channel=${currentChannel}`)).json()
for (let i = 0; i < highest_known_posts.length; i++) {
if(document.getElementById(highest_known_posts[i].post_id) == undefined) {
main()
return;
}
}
highest_id++;
}
}
// let highest_known_posts = await (await fetch(`/api/getPostsLowerThan?id=${highest_id+28}&channel=${currentChannel}`)).json()
// for (let i = 0; i < highest_known_posts.length; i++) {
// if(document.getElementById(highest_known_posts[i].post_id) === undefined) {
// main()
// return;
// }
// }
// highest_id++;
// }
// }
})
var cd = true //inversed "cooldown"
@@ -74,12 +74,12 @@ async function postMsg() {
alert(`Your message cant contain more than 1000 characters! (${len})`)
return
}
if(cd && posting_id!=undefined) {
if(cd && posting_id!==undefined) {
cd = false
let text = document.getElementById("post-text").value
if(typeof encrypt == "function" && encryption_keys != "") {
if(typeof encrypt === "function" && encryption_keys !== "") {
text = encrypt(text,{
packed: encryption_keys
})
@@ -103,7 +103,7 @@ async function update_pid() {
console.log("new pid info: ",r)
if(r.error) {
//an error occurred
if(r.error == "you cannot access the api without being logged in") {
if(r.error === "you cannot access the api without being logged in") {
//account error, go to login page
location.replace("/")
return
@@ -125,7 +125,7 @@ function spacerTextNode() {
const user_cache = {}
async function getavatar(username) {
let user = user_cache[username]
if(user == undefined) {
if(user === undefined) {
user = (await (await fetch("/api/getotheruser?user="+encodeURIComponent(username))).json())["avatar"]
if(user) {
user = "/avatars/"+user
@@ -139,7 +139,7 @@ async function getavatar(username) {
async function reply_link_clicked(reply_channel,reply_id) {
console.log("clicked link")
if(reply_channel != currentChannel) {
if(reply_channel !== currentChannel) {
console.log("reply is in another channel")
switchChannel(reply_channel)
console.log("switched channel")
@@ -186,7 +186,7 @@ async function createPost(username,text,time,specialtext,postid,isbot,reply_id,a
time = time.toString()
time = time.split(" ")
time = time[0] + " " + time[1] + " " + time[2] + " " + time[3] + " " + time[4]
if(timedate=="Thu Jan 01 1970 01:00:00 GMT+0100 (Central European Standard Time)")time="unknown time"
if(timedate==="Thu Jan 01 1970 01:00:00 GMT+0100 (Central European Standard Time)")time="unknown time"
const newTime = document.createTextNode(time)
const newSpecialText = document.createTextNode(specialtext)
newDiv.classList.add("post");
@@ -210,9 +210,9 @@ async function createPost(username,text,time,specialtext,postid,isbot,reply_id,a
newP.appendChild(newA)
newP.appendChild(spacerTextNode())
newP.appendChild(newSpan2)
if(specialtext != "")newP.appendChild(spacerTextNode())
if(specialtext !== "")newP.appendChild(spacerTextNode())
newP.appendChild(newSpan3)
if(isbot==1){
if(isbot===1){
newP.appendChild(spacerTextNode())
newP.appendChild(boticon)
}
@@ -220,7 +220,7 @@ async function createPost(username,text,time,specialtext,postid,isbot,reply_id,a
// |\>.</|
newP.innerHTML += `<button onclick="reply(${postid})">Reply to this Post</button>`
if(reply_id != 0) {
if(reply_id !== 0) {
try {
const reply_obj = await (await fetch(`/api/dms/getDM?id=${reply_id}`)).json()
const reply_username = decodeURIComponent(reply_obj.dms_user_name)
@@ -236,7 +236,7 @@ async function createPost(username,text,time,specialtext,postid,isbot,reply_id,a
replyA.appendChild(reply_username_text)
replyA.appendChild(spacerTextNode())
if(typeof decrypt == "function" && encryption_keys != "") {
if(typeof decrypt === "function" && encryption_keys !== "") {
reply_text = decrypt(reply_text,{packed:encryption_keys}).msg
}
@@ -262,7 +262,7 @@ async function createPost(username,text,time,specialtext,postid,isbot,reply_id,a
}
}
if(typeof decrypt == "function" && encryption_keys != "") {
if(typeof decrypt === "function" && encryption_keys !== "") {
text = decrypt(text,{packed:encryption_keys}).msg
}
newDiv.appendChild(newP)
@@ -316,7 +316,7 @@ async function main(){
let mentions = document.getElementsByClassName("mention")
for (let i = 0; i < mentions.length; i++) {
if(mentions[i]!=undefined && mentions[i].innerText == "@"+username) {
if(mentions[i]!==undefined && mentions[i].innerText === "@"+username) {
mentions[i].classList.add("user-mention");
mentions[i].classList.remove("mention");
i--;
@@ -336,7 +336,7 @@ async function reply(postid) {
posttext = decodeURIComponent(posttext)
if(typeof decrypt == "function" && encryption_keys != "") {
if(typeof decrypt === "function" && encryption_keys !== "") {
posttext = decrypt(posttext,{packed:encryption_keys}).msg
}
@@ -438,7 +438,7 @@ async function loadChannels() {
let channels = []
for(let dm of dms) {
if(dm.dms_user_name == username) {
if(dm.dms_user_name === username) {
channels[channels.length] = dm.dms_receiver
} else {
channels[channels.length] = dm.dms_user_name
@@ -450,7 +450,7 @@ async function loadChannels() {
let tab = document.getElementById("channelTab")
tab.innerHTML = ""
for (let i = 0; i < channels.length; i++) {
if(channels[i]=="")continue;
if(channels[i]==="")continue;
createChannel(channels[i],tab)
}
}
@@ -467,13 +467,13 @@ function init() {
}
async function clickPress(event) {
if (event.key == "Enter") {
if (event.key === "Enter") {
user = (await (await fetch("/api/getotheruser?user="+encodeURIComponent(document.getElementById("Username_input").value))).json())
if(user.username == undefined) {
if(user.username === undefined) {
alert("invalid username entered")
return
} else {
if(document.getElementById(user.username) == undefined) {
if(document.getElementById(user.username) === undefined) {
let tab = document.getElementById("channelTab")
createChannel(encodeURIComponent(user.username),tab)
}
js/index.js
+1 -1
View File
@@ -1,6 +1,6 @@
window.addEventListener("load",async function(){
let data = await(await fetch("/api/getuser")).json()
if(data["username"] != undefined) {
if(data["username"] !== undefined) {
document.getElementById("HasAccount").style=""
} else {
document.getElementById("NoAccount").style=""
js/login.js
+1 -1
View File
@@ -15,7 +15,7 @@ async function login() {
let passfield = document.getElementById("pass")
function passkeydown(e) {
if(e.code == "Enter") {
if(e.code === "Enter") {
login()
}
}
js/posts.js
+16 -16
View File
@@ -13,13 +13,13 @@ function getById(i){return document.getElementById(i)}
let socket = new WebSocket(wss_URI);
socket.addEventListener("message", async function (event) {
console.log("new websocket message arrived");
if(wss_server == event.origin) {
if(wss_server === event.origin) {
let data = event.data;
let ds = JSON.parse(data)
let message = ds.message
let item = ds.data
let username = decURIComp(item.post_user_name)
if(message == "new_post" && decURIComp(item.post_receiver_name) == currentChannel) {
if(message === "new_post" && decURIComp(item.post_receiver_name) === currentChannel) {
await createPost(
username,
decURIComp(item.post_text),
@@ -37,11 +37,11 @@ socket.addEventListener("message", async function (event) {
item.files[4]
)
console.log("created new post");
if(user["username"]!=username)mainNoti(username)
if(user["username"] !== username)mainNoti(username)
let highest_known_posts = await (await fetch(`/api/getPostsLowerThan?id=${highest_id+28}&channel=${currentChannel}`)).json()
for (let i = 0; i < highest_known_posts.length; i++) {
if(getById(highest_known_posts[i].post_id) == undefined) {
if(getById(highest_known_posts[i].post_id) === undefined) {
main()
return;
}
@@ -76,7 +76,7 @@ let last_called_postMsg = Date.now()
last_called_postMsg = Date.now()
let msg = getById("post-text").value
let len = msg.length
if(len==0){
if(len===0){
alert("you have to enter a message!")
return;
};
@@ -88,7 +88,7 @@ let last_called_postMsg = Date.now()
alert("Your message is too long! (Too many special characters)")
return
}
if(cd && posting_id!=undefined) {
if(cd && posting_id !== undefined) {
cd = false
setTimeout(function(){
cd = true
@@ -122,7 +122,7 @@ async function update_pid() {
console.log("new pid info: ",r)
if(r.error) {
//an error occurred
if(r.error == "you cannot access the api without being logged in") {
if(r.error === "you cannot access the api without being logged in") {
//account error, go to login page
location.replace("/")
return
@@ -139,7 +139,7 @@ function spacerTextNode() {
async function reply_link_clicked(reply_channel,reply_id) {
console.log("clicked link")
if(reply_channel != currentChannel) {
if(reply_channel !== currentChannel) {
console.log("reply is in another channel")
switchChannel(reply_channel)
console.log("switched channel")
@@ -229,9 +229,9 @@ async function createPost(username,text,time,specialtext,postid,isbot,reply_id,a
newP.appendChild(newA)
newP.appendChild(spacerTextNode())
newP.appendChild(newSpan2)
if(specialtext != "")newP.appendChild(spacerTextNode())
if(specialtext !== "")newP.appendChild(spacerTextNode())
newP.appendChild(newSpan3)
if(isbot==1){
if(isbot === 1){
newP.appendChild(spacerTextNode())
newP.appendChild(boticon)
}
@@ -239,7 +239,7 @@ async function createPost(username,text,time,specialtext,postid,isbot,reply_id,a
// |\>.</|
newP.innerHTML += `<button onclick="reply(${postid})">Reply to this Post</button>`
if(reply_id != 0) {
if(reply_id !== 0) {
try {
const reply_obj = await (await fetch(`/api/getPost?id=${reply_id}`)).json()
const reply_username = decURIComp(reply_obj.post_user_name)
@@ -417,7 +417,7 @@ async function main(){
let mentions = document.getElementsByClassName("mention")
for (let i = 0; i < mentions.length; i++) {
if(mentions[i]!=undefined && mentions[i].innerText == "@"+username) {
if(mentions[i] !== undefined && mentions[i].innerText === "@"+username) {
mentions[i].classList.add("user-mention");
mentions[i].classList.remove("mention");
i--;
@@ -494,7 +494,7 @@ function switchChannel(channelname) {
tab.innerHTML = ""
for (let i = 0; i < channels.length; i++) {
let channelname = decURIComp(channels[i])
if(channelname == "")continue;
if(channelname === "")continue;
let channelp = createElement("p")
channelp.classList.add("channel")
let textnode = document.createTextNode(channelname)
@@ -505,8 +505,8 @@ function switchChannel(channelname) {
let settings = await (await fetch("/api/settings")).json() // skipqc
console.log(settings) // skipqc
if(settings != "null") {
if(settings.ACCR == false) {
if(settings !== "null") {
if(settings.ACCR === false) {
unreply()
}
}
@@ -561,7 +561,7 @@ function dropHandler(ev) {
function init() {
setInterval(update_pid,30000)
if(posting_id=="")update_pid()
if(posting_id==="")update_pid()
main()
firstAsk()
loadChannels()
js/register.js
+2 -2
View File
@@ -7,7 +7,7 @@ async function register() {
alert("Username is too long!")
return;
}
if(document.getElementById("user").value.search("@") != -1) {
if(document.getElementById("user").value.search("@") !== -1) {
alert("User cannot contain '@' character!")
return;
}
@@ -31,7 +31,7 @@ async function register() {
}
function passkeydown(e) {
if(e.code == "Enter") {
if(e.code === "Enter") {
register()
}
}
js/search.js
+4 -4
View File
@@ -20,7 +20,7 @@ async function submit() {
console.log(res);
for (let i = 0; i < res.length; i++) {
let obj = res[i]
if(type=="user") {
if(type === "user") {
createPost(decodeURIComponent(obj.User_Name || ""),decodeURIComponent(obj.User_Bio || "wow such empty"),0)
} else {
createPost(decodeURIComponent(obj.post_user_name),decodeURIComponent(obj.post_text),obj.post_time,obj.post_special_text,obj.post_id)
@@ -53,7 +53,7 @@ function createPost(username,text,time,specialtext,postid) {
time = time.toString()
time = time.split(" ")
time = time[0] + " " + time[1] + " " + time[2] + " " + time[3] + " " + time[4]
if(timedate=="Thu Jan 01 1970 01:00:00 GMT+0100 (Central European Standard Time)")time=""
if(timedate==="Thu Jan 01 1970 01:00:00 GMT+0100 (Central European Standard Time)")time=""
const newTime = document.createTextNode(time)
const newSpecialText = document.createTextNode(specialtext)
@@ -68,9 +68,9 @@ function createPost(username,text,time,specialtext,postid) {
newP.appendChild(newA)
if(time != "")newP.appendChild(spacerTextNode())
if(time !== "")newP.appendChild(spacerTextNode())
newP.appendChild(newSpan2)
if(specialtext != "" && time != "")newP.appendChild(spacerTextNode())
if(specialtext !== "" && time !== "")newP.appendChild(spacerTextNode())
newP.appendChild(newSpan3)
newDiv.appendChild(newP)
js/settings.js
+2 -2
View File
@@ -129,10 +129,10 @@ async function setAllowCCR() {
let r = await(await post("/api/settings",{setting: settingname, value: ACCR})).json() // skipqc
if(r.status == "error") {
if(r.status === "error") {
alert("Couldn't change setting")
console.log(r.code)
} else if(r.status == "success") {
} else if(r.status === "success") {
//changed setting
}
}
js/user.js
+3 -3
View File
@@ -4,10 +4,10 @@ function getCookie(cname) {
let ca = decodedCookie.split(';');
for(let i = 0; i <ca.length; i++) {
let c = ca[i];
while (c.charAt(0) == ' ') {
while (c.charAt(0) ===' ') {
c = c.substring(1);
}
if (c.indexOf(name) == 0) {
if (c.indexOf(name) === 0) {
return c.substring(name.length, c.length);
}
}
@@ -28,7 +28,7 @@ function logout() {
}
async function setuser() {
if(getCookie("priv_key") != "") {
if(getCookie("priv_key") !== "") {
localStorage.setItem("priv_key",getCookie("priv_key"))
setCookie("priv_key","",0)
}