summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2022-08-31 12:42:31 +0200
committerJoas Schilling <coding@schilljs.com>2022-08-31 12:42:31 +0200
commit85eb3b2920189af24f16d8a28503bddc32989b48 (patch)
tree353164bb1be66a9285b186ee358a1abcc1d4e9a3
parent809f448ef7ee58980c56bb70a48495efd1f26894 (diff)
downloadnextcloud-server-85eb3b2920189af24f16d8a28503bddc32989b48.tar.gz
nextcloud-server-85eb3b2920189af24f16d8a28503bddc32989b48.zip
Fix wording of undeliverable push notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--core/Controller/LoginController.php2
-rw-r--r--core/js/setupchecks.js4
-rw-r--r--lib/private/Notification/Manager.php2
3 files changed, 5 insertions, 3 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 008bbc5c868..4ec6d5c38c4 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -151,7 +151,7 @@ class LoginController extends Controller {
if (!is_array($loginMessages)) {
$loginMessages = [[], []];
}
- $loginMessages[1][] = $this->l10n->t('This community release of Nextcloud is unsupported and instant notifications are unavailable.');
+ $loginMessages[1][] = $this->l10n->t('This community release of Nextcloud is unsupported and push notifications are limited.');
}
if (is_array($loginMessages)) {
[$errors, $messages] = $loginMessages;
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 320c2bea9fb..201d9a8eeba 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -261,7 +261,9 @@
}
if (!data.isFairUseOfFreePushService) {
messages.push({
- msg: t('core', 'This is the unsupported community build of Nextcloud. Given the size of this instance, performance, reliability and scalability cannot be guaranteed. Push notifications have been disabled to avoid overloading our free service. Learn more about the benefits of Nextcloud Enterprise at nextcloud.com/enterprise.'),
+ msg: t('core', 'This is the unsupported community build of Nextcloud. Given the size of this instance, performance, reliability and scalability cannot be guaranteed. Push notifications are limited to avoid overloading our free service. Learn more about the benefits of Nextcloud Enterprise at {linkstart}https://nextcloud.com/enterprise{linkend}.')
+ .replace('{linkstart}', '<a target="_blank" rel="noreferrer noopener" class="external" href="https://nextcloud.com/enterprise">')
+ .replace('{linkend}', '</a>'),
type: OC.SetupChecks.MESSAGE_TYPE_ERROR
});
}
diff --git a/lib/private/Notification/Manager.php b/lib/private/Notification/Manager.php
index 148ad3e912d..d758cae428f 100644
--- a/lib/private/Notification/Manager.php
+++ b/lib/private/Notification/Manager.php
@@ -305,7 +305,7 @@ class Manager implements IManager {
* users overload our infrastructure. For this reason we have to rate-limit the
* use of push notifications. If you need this feature, consider using Nextcloud Enterprise.
*/
- $isFairUse = $this->subscription->delegateHasValidSubscription() || $this->userManager->countSeenUsers() < 5000;
+ $isFairUse = $this->subscription->delegateHasValidSubscription() || $this->userManager->countSeenUsers() < 500;
$pushAllowed = $isFairUse ? 'yes' : 'no';
$this->cache->set('push_fair_use', $pushAllowed, 3600);
}