Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b66daccd authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

fair use fix

parent 60157696

Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ 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

patches/020-fairuse-notification-fix.patch

0 → 100644
+15 −0
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 11:09:37.794640100 +0530

@@ -311,10 +311,8 @@

 			 * 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';

+

+			$pushAllowed = 'yes';

 			$this->cache->set('push_fair_use', $pushAllowed, 3600);

 		}

 		return $pushAllowed === 'yes';