Loading Dockerfile +0 −1 Original line number Diff line number Diff line Loading @@ -134,7 +134,6 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlug RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param Loading patches/020-fairuse-notification-fix.patchdeleted 100644 → 0 +0 −26 Original line number Diff line number Diff line --- lib/private/Notification/Manager.php 2022-09-06 21:39:49.735827300 +0530 +++ lib/private/Notification/Manager-new.php 2022-10-06 12:29:29.904640100 +0530 @@ -303,21 +303,8 @@ * {@inheritDoc} */ public function isFairUseOfFreePushService(): bool { - $pushAllowed = $this->cache->get('push_fair_use'); - if ($pushAllowed === null) { - /** - * We want to keep offering our push notification service for free, but large - * 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. - */ - // TODO Remove time check after 1st March 2022 - $isFairUse = $this->timeFactory->getTime() < 1646089200 - || $this->subscription->delegateHasValidSubscription() - || $this->userManager->countSeenUsers() < 5000; - $pushAllowed = $isFairUse ? 'yes' : 'no'; - $this->cache->set('push_fair_use', $pushAllowed, 3600); - } - return $pushAllowed === 'yes'; + + return true; } /** Loading
Dockerfile +0 −1 Original line number Diff line number Diff line Loading @@ -134,7 +134,6 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlug RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param Loading
patches/020-fairuse-notification-fix.patchdeleted 100644 → 0 +0 −26 Original line number Diff line number Diff line --- lib/private/Notification/Manager.php 2022-09-06 21:39:49.735827300 +0530 +++ lib/private/Notification/Manager-new.php 2022-10-06 12:29:29.904640100 +0530 @@ -303,21 +303,8 @@ * {@inheritDoc} */ public function isFairUseOfFreePushService(): bool { - $pushAllowed = $this->cache->get('push_fair_use'); - if ($pushAllowed === null) { - /** - * We want to keep offering our push notification service for free, but large - * 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. - */ - // TODO Remove time check after 1st March 2022 - $isFairUse = $this->timeFactory->getTime() < 1646089200 - || $this->subscription->delegateHasValidSubscription() - || $this->userManager->countSeenUsers() < 5000; - $pushAllowed = $isFairUse ? 'yes' : 'no'; - $this->cache->set('push_fair_use', $pushAllowed, 3600); - } - return $pushAllowed === 'yes'; + + return true; } /**