diff --git a/android/app/src/main/assets/public/blah/en-cat.json b/android/app/src/main/assets/public/blah/en-cat.json index 95c07f09..16927f31 100644 --- a/android/app/src/main/assets/public/blah/en-cat.json +++ b/android/app/src/main/assets/public/blah/en-cat.json @@ -14,7 +14,9 @@ "dm.key.too.large": "meowchat key too large :o", "dm.key.not.found": "meowchat key not found :c", "dm.key.updated": "meowchat key updated successfully :3", - "body.too.large": "request too large ><", + "body.too.large": "Meow is too big! Max meow is {0} MB.", + "message.too.long": "Meowssage exceeds maximum allowed size ({0}).", + "reaction.too.long": "Re-meow-ction exceeds maximum allowed size ({0}).", "invite.revoked": "invite revoked successfully", "invite.declined": "invite declined successfully", "account.creation.request.expired": "cat creation request expired. try again", diff --git a/android/app/src/main/assets/public/blah/en-us.json b/android/app/src/main/assets/public/blah/en-us.json index e550f1b1..dc3c41f2 100644 --- a/android/app/src/main/assets/public/blah/en-us.json +++ b/android/app/src/main/assets/public/blah/en-us.json @@ -14,7 +14,9 @@ "dm.key.too.large": "DM key too large", "dm.key.not.found": "DM key not found", "dm.key.updated": "DM key updated successfully", - "body.too.large": "Request too large", + "body.too.large": "Request too large. Max limit is {0} MB", + "message.too.long": "Message exceeds maximum allowed size ({0}).", + "reaction.too.long": "Reaction exceeds maximum allowed size ({0}).", "invite.revoked": "Invite revoked successfully", "invite.declined": "Invite declined successfully", "account.creation.request.expired": "Account creation request expired. Try again", diff --git a/android/app/src/main/assets/public/blah/pl-pl.json b/android/app/src/main/assets/public/blah/pl-pl.json index 7274282e..d59ae8b3 100644 --- a/android/app/src/main/assets/public/blah/pl-pl.json +++ b/android/app/src/main/assets/public/blah/pl-pl.json @@ -14,7 +14,9 @@ "dm.key.too.large": "Klucz wiadomości prywatnej jest zbyt duży", "dm.key.not.found": "Nie znaleziono klucza wiadomości prywatnej", "dm.key.updated": "Klucz wiadomości prywatnej został pomyślnie zaktualizowany", - "body.too.large": "Treść żądania jest zbyt duża", + "body.too.large": "Treść żądania jest zbyt duża. Maksymalny limit to {0} MB", + "message.too.long": "Wiadomość przekracza dozwolony rozmiar ({0}).", + "reaction.too.long": "Reakcja przekracza dozwolony rozmiar ({0}).", "invite.revoked": "Zaproszenie zostało cofnięte", "invite.declined": "Zaproszenie zostało odrzucone", "account.creation.request.expired": "Żądanie utworzenia konta wygasło. Spróbuj ponownie", diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js index 869ce2b6..3e8a72e7 100644 --- a/android/app/src/main/assets/public/main.js +++ b/android/app/src/main/assets/public/main.js @@ -2900,9 +2900,12 @@ async function sendMessage(sendbutton = document.getElementById("chat-sendmessag } if (res.status === 413) { - throw new Error("error.body.too.large"); + throw new Error("error:body.too.large"); } let text = await res.text(); + if (text.startsWith("error:")) { + throw new Error(text); + } let decText; try { decText = await decryptString(text, passwordHash); diff --git a/webroot/blah/en-cat.json b/webroot/blah/en-cat.json index 95c07f09..16927f31 100644 --- a/webroot/blah/en-cat.json +++ b/webroot/blah/en-cat.json @@ -14,7 +14,9 @@ "dm.key.too.large": "meowchat key too large :o", "dm.key.not.found": "meowchat key not found :c", "dm.key.updated": "meowchat key updated successfully :3", - "body.too.large": "request too large ><", + "body.too.large": "Meow is too big! Max meow is {0} MB.", + "message.too.long": "Meowssage exceeds maximum allowed size ({0}).", + "reaction.too.long": "Re-meow-ction exceeds maximum allowed size ({0}).", "invite.revoked": "invite revoked successfully", "invite.declined": "invite declined successfully", "account.creation.request.expired": "cat creation request expired. try again", diff --git a/webroot/blah/en-us.json b/webroot/blah/en-us.json index e550f1b1..dc3c41f2 100644 --- a/webroot/blah/en-us.json +++ b/webroot/blah/en-us.json @@ -14,7 +14,9 @@ "dm.key.too.large": "DM key too large", "dm.key.not.found": "DM key not found", "dm.key.updated": "DM key updated successfully", - "body.too.large": "Request too large", + "body.too.large": "Request too large. Max limit is {0} MB", + "message.too.long": "Message exceeds maximum allowed size ({0}).", + "reaction.too.long": "Reaction exceeds maximum allowed size ({0}).", "invite.revoked": "Invite revoked successfully", "invite.declined": "Invite declined successfully", "account.creation.request.expired": "Account creation request expired. Try again", diff --git a/webroot/blah/pl-pl.json b/webroot/blah/pl-pl.json index 7274282e..d59ae8b3 100644 --- a/webroot/blah/pl-pl.json +++ b/webroot/blah/pl-pl.json @@ -14,7 +14,9 @@ "dm.key.too.large": "Klucz wiadomości prywatnej jest zbyt duży", "dm.key.not.found": "Nie znaleziono klucza wiadomości prywatnej", "dm.key.updated": "Klucz wiadomości prywatnej został pomyślnie zaktualizowany", - "body.too.large": "Treść żądania jest zbyt duża", + "body.too.large": "Treść żądania jest zbyt duża. Maksymalny limit to {0} MB", + "message.too.long": "Wiadomość przekracza dozwolony rozmiar ({0}).", + "reaction.too.long": "Reakcja przekracza dozwolony rozmiar ({0}).", "invite.revoked": "Zaproszenie zostało cofnięte", "invite.declined": "Zaproszenie zostało odrzucone", "account.creation.request.expired": "Żądanie utworzenia konta wygasło. Spróbuj ponownie", diff --git a/webroot/main.js b/webroot/main.js index 869ce2b6..3e8a72e7 100644 --- a/webroot/main.js +++ b/webroot/main.js @@ -2900,9 +2900,12 @@ async function sendMessage(sendbutton = document.getElementById("chat-sendmessag } if (res.status === 413) { - throw new Error("error.body.too.large"); + throw new Error("error:body.too.large"); } let text = await res.text(); + if (text.startsWith("error:")) { + throw new Error(text); + } let decText; try { decText = await decryptString(text, passwordHash);