fixed bug where translations were also broadcasted to other client and fixed bug where the same original and target language caused a 500 error
This commit is contained in:
parent
f4467c65fd
commit
b19a000729
|
@ -29,7 +29,8 @@ class PagesController < ApplicationController
|
|||
translation.text.gsub!("'", "'")
|
||||
ActionCable.server.broadcast "chat_room_#{params[:chat_room_id]}", {
|
||||
translation: translation,
|
||||
input: params[:input]
|
||||
input: params[:input],
|
||||
userId: current_user.id
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -10,6 +10,7 @@ import ActionCable from 'actioncable'
|
|||
|
||||
// find chatroom id
|
||||
const chatroomId = document.getElementById('chatroom-hook').dataset["chatroomId"]
|
||||
const userId = document.getElementById('current-user').innerText
|
||||
|
||||
// create subsciptions
|
||||
App['chatroom' + chatroomId] = App.cable.subscriptions.create({
|
||||
|
@ -25,14 +26,14 @@ App['chatroom' + chatroomId] = App.cable.subscriptions.create({
|
|||
const message = document.createElement("p")
|
||||
message.innerText = `${chatMessage["time_stamp"]} ${chatMessage["user_info"]["name"]}: ${chatMessage["message"]}`
|
||||
messagesContainer.appendChild(message)
|
||||
} else if (data["translation"]) {
|
||||
} else if (data["translation"] && data["userId"] == userId) {
|
||||
if (data["input"] == 1) {
|
||||
document.getElementById('language-2-input').value = data["translation"].text
|
||||
} else {
|
||||
document.getElementById('language-1-input').value = data["translation"].text
|
||||
}
|
||||
} else {
|
||||
console.log(data)
|
||||
// console.log(data)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
const userId = document.getElementById('current-user').innerText
|
||||
const languageForm1 = document.getElementById('lang-1')
|
||||
const languageForm2 = document.getElementById('lang-2')
|
||||
const chatroomId = document.getElementById('chatroom-hook').dataset["chatroomId"]
|
||||
|
@ -8,16 +9,21 @@ languageForm1.addEventListener('submit', event => {
|
|||
const target = document.getElementById('language-2').value
|
||||
const text = document.getElementById('language-1-input').value
|
||||
|
||||
fetch(`/chat_rooms/${chatroomId}/translate` , {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
original,
|
||||
target,
|
||||
text,
|
||||
input: 1
|
||||
}),
|
||||
headers: { "content-type": "application/json", "X-CSRF-Token": document.querySelector('meta[name=csrf-token]').content }
|
||||
})
|
||||
if (original !== target) {
|
||||
fetch(`/chat_rooms/${chatroomId}/translate` , {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
original,
|
||||
target,
|
||||
text,
|
||||
input: 1,
|
||||
userId
|
||||
}),
|
||||
headers: { "content-type": "application/json", "X-CSRF-Token": document.querySelector('meta[name=csrf-token]').content }
|
||||
})
|
||||
} else {
|
||||
document.getElementById('language-2-input').value = text
|
||||
}
|
||||
// post request and change form 1
|
||||
})
|
||||
|
||||
|
@ -27,15 +33,19 @@ languageForm2.addEventListener('submit', event => {
|
|||
const target = document.getElementById('language-1').value
|
||||
const text = document.getElementById('language-2-input').value
|
||||
// post request and change form 2
|
||||
|
||||
fetch(`/chat_rooms/${chatroomId}/translate` , {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
original: original,
|
||||
target: target,
|
||||
text: text,
|
||||
input: 2
|
||||
}),
|
||||
headers: { "content-type": "application/json", "X-CSRF-Token": document.querySelector('meta[name=csrf-token]').content }
|
||||
})
|
||||
if (original !== target) {
|
||||
fetch(`/chat_rooms/${chatroomId}/translate` , {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
original: original,
|
||||
target: target,
|
||||
text: text,
|
||||
input: 2,
|
||||
userId
|
||||
}),
|
||||
headers: { "content-type": "application/json", "X-CSRF-Token": document.querySelector('meta[name=csrf-token]').content }
|
||||
})
|
||||
} else {
|
||||
document.getElementById('language-1-input').value = text
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue