Skip to content

mirror OpenProject notifications to Nextcloud #224

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

Closed
individual-it wants to merge 12 commits into from
Closed

mirror OpenProject notifications to Nextcloud #224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
32dcf03
aggregated an more data in the notifications
individual-it Aug 25, 2022
e09e74d
minimal formatting
individual-it Aug 26, 2022
5932f1e
add actors to the notification
individual-it Aug 26, 2022
816149a
button to mark notifications as read
individual-it Aug 26, 2022
0d0f9fe
fix parameter name
individual-it Sep 28, 2022
5704981
adjust label
individual-it Sep 28, 2022
dfe5c7c
mark all notifications as processed before creating new ones
individual-it Sep 28, 2022
8ad8131
get rid of anything to do with count notifications
individual-it Oct 11, 2022
6d6f124
basic check for valid data
individual-it Oct 11, 2022
f75a8e3
adjust notification PHP unit test
individual-it Oct 11, 2022
3a8c6c9
fix other php unit tests
individual-it Oct 11, 2022
7a73714
cs fixer
individual-it Oct 11, 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
Next Next commit
aggregated an more data in the notifications 
Signed-off-by: Artur Neumann <[email protected]>
  • Loading branch information
@individual-it
individual-it committed Oct 11, 2022
commit 32dcf03da9a3e0e7ff94708e52bf7848c8743f68
27 changes: 27 additions & 0 deletions lib/Notification/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,33 @@ public function prepare(INotification $notification, string $languageCode): INot
)
->setIcon($this->url->getAbsoluteURL($this->url->imagePath(Application::APP_ID, 'app-dark.svg')));
return $notification;
case 'op_notification':
$p = $notification->getSubjectParameters();

// see https://github.com/nextcloud/server/issues/1706 for docs
$richSubjectInstance = [
'type' => 'file',
'id' => 0,
'name' => $p['link'],
'path' => '',
'link' => $p['link'],
];
$message = $p['projectTitle'] . ' ';
foreach ($p['reasons'] as $reason) {
$message .= $reason . ',';
}
$message = rtrim($message, ',');
$notification->setParsedSubject('(' . $p['count']. ') ' . $p['resourceTitle'])
->setParsedMessage('--')
->setLink($p['link'] ?? '')
->setRichMessage(
$message,
[
'instance' => $richSubjectInstance,
]
)
->setIcon($this->url->getAbsoluteURL($this->url->imagePath(Application::APP_ID, 'app-dark.svg')));
return $notification;

default:
// Unknown subject => Unknown notification => throw
Expand Down
23 changes: 23 additions & 0 deletions lib/Service/OpenProjectAPIService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ private function checkNotificationsForUser(string $userId): void {
$newLastNotificationCheck = time();
$openprojectUrl = $this->config->getAppValue(Application::APP_ID, 'oauth_instance_url');
$notifications = $this->getNotifications($userId);
$aggregatedNotifications = [];
if (!isset($notifications['error']) && count($notifications) > 0) {
$this->config->setUserValue(
$userId,
Expand All @@ -160,7 +161,29 @@ private function checkNotificationsForUser(string $userId): void {
if ($createdAt->getTimestamp() > $lastNotificationCheck) {
$nbRelevantNotifications++;
}
$wpId = preg_replace('/.*\//','', $n['_links']['resource']['href']);
if (!array_key_exists($wpId, $aggregatedNotifications)) {
$aggregatedNotifications[$wpId] = [
'resourceTitle' => $n['_links']['resource']['title'],
'projectTitle' => $n['_links']['project']['title'],
'count' => 1,
// TODO according to the docs https://github.com/nextcloud/notifications/blob/master/docs/notification-workflow.md#creating-a-new-notification
// links should not be set here
'link' => self::sanitizeUrl(
$openprojectUrl . '/notifications/details/' . $wpId . '/activity/'
)
];
} else {
$aggregatedNotifications[$wpId]['count']++;
}
$aggregatedNotifications[$wpId]['reasons'][] = $n['reason'];
}
foreach ($aggregatedNotifications as $n) {
$n['reasons'] = array_unique($n['reasons']);
// TODO can we use https://github.com/nextcloud/notifications/blob/master/docs/notification-workflow.md#defer-and-flush ?
$this->sendNCNotification($userId, 'op_notification', $n);
}

if ($nbRelevantNotifications > 0) {
$this->sendNCNotification($userId, 'new_open_tickets', [
'nbNotifications' => $nbRelevantNotifications,
Expand Down