clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create new DI shorthands for notification-related factories

Browse Source
This commit is contained in:
Hypolite Petovan
2021-09-19 12:56:24 -04:00
parent 7a2d5f6a8e
commit 8a1a2f658c
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/DI.php
View File

@@ -463,11 +463,26 @@ abstract class DI
return self::$dice->create(Navigation\Notifications\Depository\Notification::class);
}
public static function notificationFactory(): Navigation\Notifications\Factory\Notification
{
return self::$dice->create(Navigation\Notifications\Factory\Notification::class);
}
public static function notify(): Navigation\Notifications\Depository\Notify
{
return self::$dice->create(Navigation\Notifications\Depository\Notify::class);
}
public static function notifyFactory(): Navigation\Notifications\Factory\Notify
{
return self::$dice->create(Navigation\Notifications\Factory\Notify::class);
}
public static function formattedNotificationFactory(): Navigation\Notifications\Factory\FormattedNotification
{
return self::$dice->create(Navigation\Notifications\Factory\FormattedNotification::class);
}
//
// "Protocol" namespace instances
//

3
src/Module/Notifications/Notifications.php
View File

@@ -46,8 +46,7 @@ class Notifications extends BaseNotifications
$notificationHeader = '';
$notifications = [];
/** @var \Friendica\Navigation\Notifications\Factory\FormattedNotification $factory */
$factory = DI::getDice()->create(\Friendica\Navigation\Notifications\Factory\FormattedNotification::class);
$factory = DI::formattedNotificationFactory();
if ((DI::args()->get(1) == 'network')) {
$notificationHeader = DI::l10n()->t('Network Notifications');

2
src/Worker/PushSubscription.php
View File

@@ -82,7 +82,7 @@ class PushSubscription
}
}
$message = (new Notifications\Factory\Notification(DI::logger()))->getMessageFromNotification($Notification, DI::baseUrl(), $l10n);
$message = DI::notificationFactory()->getMessageFromNotification($Notification, DI::baseUrl(), $l10n);
$title = $message['plain'] ?: '';
$push = Subscription::create([