Merge pull request #2106 from matrix-org/dbkr/chairman_mau_pt_2_messa…

…ge_send Support active user limit on message send
matrix-org · Aug 3, 2018 · bc1d359 · bc1d359
2 parents b322f0b + 02019a5
commit bc1d359
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
@@ -309,10 +309,14 @@ module.exports = React.createClass({
             );
         } else {
             let consentError = null;
+            let mauError = null;
             for (const m of unsentMessages) {
                 if (m.error && m.error.errcode === 'M_CONSENT_NOT_GIVEN') {
                     consentError = m.error;
                     break;
+                } else if (m.error && m.error.errcode === 'M_MAU_LIMIT_EXCEEDED') {
+                    mauError = m.error;
+                    break;
                 }
             }
             if (consentError) {
@@ -327,6 +331,8 @@ module.exports = React.createClass({
                             </a>,
                     },
                 );
+            } else if (mauError) {
+                title = _t("Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.");
             } else if (
                 unsentMessages.length === 1 &&
                 unsentMessages[0].error &&

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1035,6 +1035,7 @@
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.",
+    "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Your message wasn’t sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.",
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",