Skip to content

Better chat #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rgantzos wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Better chat #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions backend/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ io.on('connection', (client) => {
})
});

app.post("/report/chat//:project/", async function(req, res) {
console.log(`A USER JUST REPORTED THE CHAT IN PROJECT ${req.params.project}`)
})

app.post('/newProject/:scratchId/:owner',(req,res)=>{
console.log('yeetee')
if(sanitize(req.params.scratchId + '') == '') {res.send({err:'invalid scratch id'}); return}
Expand Down
48 changes: 47 additions & 1 deletion extension/scripts/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2749,6 +2749,7 @@ bl-msg{
max-width: 80%;
margin-left: 15px;
background-color: rgb(255, 255, 255);
overflow-wrap: break-word;
}
bl-msg-sender-name{
font-style:italic;
Expand Down Expand Up @@ -3027,13 +3028,58 @@ async function addMessage(msg) {
}
let msgElem = document.createElement('bl-msg')
msgElem.innerText = msg.text
addReportFunction(msgElem)
if(msg.sender == uname) {msgElem.classList.add('mymsg')}
msgsElem.appendChild(msgElem)

msgsElem.scrollTop = msgsElem.scrollHeight;


}

function addReportFunction(msg) {
msg.addEventListener("contextmenu", function(e) {
e.preventDefault()
if (!document.querySelector(".report-chat")) {
var reportChatModal = document.createElement("div")
reportChatModal.className = "report-chat"
reportChatModal.innerHTML = `
<h3>Would you like to report this chat to the Blocklive team?</h3><p>Please don't false report, it takes up our time and it isn't actually that funny :(</p>
<button class="button">Report</button><button class="button">Cancel</button>
`
document.body.appendChild(reportChatModal)
var style = document.createElement("style")
style.textContent = `
.report-chat {
width: 40vw;
height: 40vh;
background-color: white;
border-radius: .5rem;
box-shadow: 0 0 11px black;
z-index: 9999999;
left: 30vw;
top: 30vh;
position: fixed;
padding: 1rem;
}

.report-chat button {
margin-right: .5rem;
}
`
document.body.appendChild(style)
reportChatModal.querySelectorAll("button")[0].onclick = async function() {
reportChatModal.remove()
await fetch("https://spore.us.to:4000/report/chat/"+bl_projectId+"/", {
method: "POST",
})
}
reportChatModal.querySelectorAll("button")[1].onclick = function() {
reportChatModal.remove()
}
}
})
}

function postMessageBubble() {
let inputElem = document.querySelector('bl-chat-input')
let messageText = inputElem.innerText
Expand Down
45 changes: 45 additions & 0 deletions tests/chat/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@
msgsElem.appendChild(unameElem)
}
let msgElem = document.createElement('bl-msg')
addReportFunction(msgElem)
msgElem.innerText = msg.text
if(msg.sender == uname) {msgElem.classList.add('mymsg')}
msgsElem.appendChild(msgElem)
Expand All @@ -287,6 +288,50 @@
})
document.querySelector('bl-chat-send-button').onclick = postMessageBubble

function addReportFunction(msg) {
msg.addEventListener("contextmenu", function(e) {
e.preventDefault()
if (!document.querySelector(".report-chat")) {
var reportChatModal = document.createElement("div")
reportChatModal.className = "report-chat"
reportChatModal.innerHTML = `
<h3>Would you like to report this chat to the Blocklive team?</h3><p>Please don't false report, it takes up our time and it isn't actually that funny :(</p>
<button class="button">Report</button><button class="button">Cancel</button>
`
document.body.appendChild(reportChatModal)
var style = document.createElement("style")
style.textContent = `
.report-chat {
width: 40vw;
height: 40vh;
background-color: white;
border-radius: .5rem;
box-shadow: 0 0 11px black;
z-index: 9999999;
left: 30vw;
top: 30vh;
position: fixed;
padding: 1rem;
}

.report-chat button {
margin-right: .5rem;
}
`
document.body.appendChild(style)
reportChatModal.querySelectorAll("button")[0].onclick = async function() {
reportChatModal.remove()
await fetch("https://spore.us.to:4000/report/chat/"+bl_projectId+"/", {
method: "POST",
})
}
reportChatModal.querySelectorAll("button")[1].onclick = function() {
reportChatModal.remove()
}
}
})
}

function postMessageBubble() {
let inputElem = document.querySelector('bl-chat-input')
let messageText = inputElem.innerText
Expand Down