Skip to content

Remove time check in isFairUseOfFreePushService #33565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 3 commits into from
Aug 17, 2022
Merged

Remove time check in isFairUseOfFreePushService #33565

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc5cdfb
Remove time check in isFairUseOfFreePushService
artonge Aug 16, 2022
f6081e3
Remove ITimeFactory
artonge Aug 17, 2022
227c766
Fix unit tests
nickvergessen Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions lib/private/Notification/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,7 @@ public function isFairUseOfFreePushService(): bool {
* 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;
$isFairUse = $this->subscription->delegateHasValidSubscription() || $this->userManager->countSeenUsers() < 5000;
$pushAllowed = $isFairUse ? 'yes' : 'no';
$this->cache->set('push_fair_use', $pushAllowed, 3600);
}
Expand Down