Merge pull request #226 from nextcloud/enh/225/notification-updates

Update recommended app notifications
nextcloud · Dec 18, 2019 · a401c3f · a401c3f
2 parents 9af74f6 + cbac75d
commit a401c3f
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 18 deletions.
diff --git a/img/apps/calendar.svg b/img/apps/calendar.svg
diff --git a/img/apps/contacts.svg b/img/apps/contacts.svg
diff --git a/img/apps/deck.svg b/img/apps/deck.svg
diff --git a/img/apps/groupfolders.svg b/img/apps/groupfolders.svg
diff --git a/img/apps/mail.svg b/img/apps/mail.svg
diff --git a/img/apps/notes.svg b/img/apps/notes.svg
diff --git a/img/apps/social.svg b/img/apps/social.svg
diff --git a/img/apps/spreed.svg b/img/apps/spreed.svg
diff --git a/img/apps/tasks.svg b/img/apps/tasks.svg
diff --git a/lib/Notification/AppHint.php b/lib/Notification/AppHint.php
@@ -50,6 +50,8 @@ class AppHint  {
 	/** @var string */
 	private $userId;
 
+	const APP_HINT_VERSION = '18';
+
 	public function __construct(INotificationManager $notificationManager, IGroupManager $groupManager, IAppManager $appManager, IConfig $config, IEventDispatcher $eventDispatcher, $userId) {
 		$this->notificationManager = $notificationManager;
 		$this->groupManager = $groupManager;
@@ -60,12 +62,13 @@ public function __construct(INotificationManager $notificationManager, IGroupMan
 	}
 
 	public function sendAppHintNotifications(): void {
-		if ($this->userId !== null && $this->groupManager->isAdmin($this->userId) && $this->config->getUserValue($this->userId, 'firstrunwizard', 'apphint') !== 'yes') {
-			$this->sendNotification('calendar', $this->userId);
-			$this->sendNotification('contacts', $this->userId);
-			$this->sendNotification('mail', $this->userId);
-			$this->sendNotification('spreed', $this->userId);
-			$this->config->setUserValue($this->userId, 'firstrunwizard', 'apphint', 'yes');
+		if ($this->userId !== null && $this->groupManager->isAdmin($this->userId) && $this->config->getUserValue($this->userId, 'firstrunwizard', 'apphint') !== self::APP_HINT_VERSION) {
+			$this->sendNotification('groupfolders', $this->userId);
+			$this->sendNotification('social', $this->userId);
+			$this->sendNotification('notes', $this->userId);
+			$this->sendNotification('deck', $this->userId);
+			$this->sendNotification('tasks', $this->userId);
+			$this->config->setUserValue($this->userId, 'firstrunwizard', 'apphint', self::APP_HINT_VERSION);
 		}
 	}
 
@@ -78,7 +81,7 @@ public function registerAppListener(): void {
 	protected function sendNotification(string $app, string $user): void {
 		$notification = $this->generateNotification($app, $user);
 		if (
-			$this->config->getUserValue($this->userId, 'firstrunwizard', 'apphint') !== 'yes'
+			$this->config->getUserValue($this->userId, 'firstrunwizard', 'apphint') !== self::APP_HINT_VERSION
 			&& $this->notificationManager->getCount($notification) === 0
 			&& !$this->appManager->isEnabledForUser($app)
 		) {

diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
@@ -105,6 +105,11 @@ public function prepare(INotification $notification, string $languageCode): INot
 			case 'apphint-contacts':
 			case 'apphint-mail':
 			case 'apphint-spreed':
+			case 'apphint-tasks':
+			case 'apphint-deck':
+			case 'apphint-notes':
+			case 'apphint-social':
+			case 'apphint-groupfolders':
 				$app = $notification->getObjectId();
 				return $this->setAppHintDetails($notification, $languageCode, $app);
 			default:
@@ -166,10 +171,31 @@ protected function setAppHintDetails(INotification $notification, $languageCode,
 				$notification->setParsedMessage($l->t('Simple email app nicely integrated with Files, Contacts and Calendar.'));
 				$appLink = '/social/mail';
 				break;
-			case 'spreed':
-				$notification->setParsedSubject($l->t('App recommendation: Nextcloud Talk'));
-				$notification->setParsedMessage($l->t('Screensharing, online meetings and web conferencing – on desktop and with mobile apps.'));
-				$appLink = '/social/spreed';
+
+			case 'tasks':
+				$notification->setParsedSubject($l->t('App recommendation: Tasks'));
+				$notification->setParsedMessage($l->t('Sync tasks from various devices with your Nextcloud and edit them online.'));
+				$appLink = '/organization/tasks';
+				break;
+			case 'deck':
+				$notification->setParsedSubject($l->t('App recommendation: Deck'));
+				$notification->setParsedMessage($l->t('Kanban style organization for personal planning and team projects.'));
+				$appLink = '/organization/deck';
+				break;
+			case 'notes':
+				$notification->setParsedSubject($l->t('App recommendation: Notes'));
+				$notification->setParsedMessage($l->t('Distraction-free notes and writing.'));
+				$appLink = '/organization/notes';
+				break;
+			case 'social':
+				$notification->setParsedSubject($l->t('App recommendation: Social'));
+				$notification->setParsedMessage($l->t('Nextcloud becomes part of the federated social networks.'));
+				$appLink = '/social/social';
+				break;
+			case 'groupfolders':
+				$notification->setParsedSubject($l->t('App recommendation: Group folders'));
+				$notification->setParsedMessage($l->t('Admin-configured folders shared by everyone in a group.'));
+				$appLink = '/files/groupfolders';
 				break;
 		}
 		$notification