Hello! We are running our annual fundraising. Please consider making a donation if you value this freely available service or want to support people around the world working towards liberatory social change. https://riseup.net/donate.

Commit 89c46674 authored by aguestuser's avatar aguestuser
Browse files

Merge branch 'ni-omit-recipient-number-from-rate-limit-alerts' into 'master'

[hotfix] omit recipient number from rate limit

See merge request !181
parents 3bb63653 47a9f605
......@@ -127,11 +127,7 @@ const notifyRateLimitedMessage = async (db, sock, sdMessage, resendInterval) =>
memberPhoneNumber,
sdMessageOf(
{ phoneNumber: signupPhoneNumber },
messagesIn(language).notifications.rateLimitOccurred(
sdMessage.username,
sdMessage.recipientNumber,
resendInterval,
),
messagesIn(language).notifications.rateLimitOccurred(sdMessage.username, resendInterval),
),
),
),
......
......@@ -326,10 +326,8 @@ Send HELP to list valid commands. Send HELLO to subscribe.
Please respond with ACCEPT or DECLINE.`,
rateLimitOccurred: (channelPhoneNumber, memberPhoneNumber, resendInterval) =>
`Message failed to send due to a rate limit error.
channel: ${channelPhoneNumber}
recipient: ${memberPhoneNumber}
rateLimitOccurred: (channelPhoneNumber, resendInterval) =>
`Message rate limited on channel: ${channelPhoneNumber}.
${
resendInterval
? `next resend attempt in: ${resendInterval.toString().slice(0, -3)} sec`
......
......@@ -343,10 +343,8 @@ Hasta entonces, no podrán enviar mensajes ni leer mensajes de este canal.`,
Envíe AYUDA para ver los comandos que entiendo! :)`,
rateLimitOccurred: (channelPhoneNumber, memberPhoneNumber, resendInterval) =>
`Un mensaje no se pudo enviar debido a un error de límite de velocidad.
canal: ${channelPhoneNumber}
recipiente: ${memberPhoneNumber}
rateLimitOccurred: (channelPhoneNumber, resendInterval) =>
`Error de límite de velocidad en canal: ${channelPhoneNumber}.
${
resendInterval
? `se intentará reenviar el mensaje en: ${resendInterval.toString().slice(0, -3)}s`
......
......@@ -350,10 +350,8 @@ Ielles seront incapables d’envoyer ou de lire des messages sur ce canal avant
toggles: commandResponses.toggles,
rateLimitOccurred: (channelPhoneNumber, memberPhoneNumber, resendInterval) =>
`Un message n'a pas pu être envoyé en raison d'une erreur de limite de débit.
canal: ${channelPhoneNumber}
destinataire: ${memberPhoneNumber}
rateLimitOccurred: (channelPhoneNumber, resendInterval) =>
`Erreur de limite de débit sur le canal: ${channelPhoneNumber}.
${
resendInterval
? `tentative sera faite pour renvoyer le message en: ${resendInterval.toString().slice(0, -3)}s`
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment