nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move Notify::TYPE_POKE

Browse source
This commit is contained in:
nupplaPhil 2020-02-04 22:15:33 +01:00
parent bee110dc0b
commit a78e19ea76
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
5 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boot.php
View file

@ -140,7 +140,6 @@ define('MAX_LIKERS', 75);
* Email notification options * Email notification options
* @{ * @{
*/ */
define('NOTIFY_POKE', 512);
define('NOTIFY_SHARE', 1024); define('NOTIFY_SHARE', 1024);
define('NOTIFY_SYSTEM', 32768); define('NOTIFY_SYSTEM', 32768);

2
include/enotify.php
View file

@ -242,7 +242,7 @@ function notification($params)
$itemlink = $params['link']; $itemlink = $params['link'];
} }
if ($params['type'] == NOTIFY_POKE) { if ($params['type'] == Notify\Type::POKE) {
$subject = $l10n->t('[Friendica:Notify] %1$s poked you', $params['source_name']); $subject = $l10n->t('[Friendica:Notify] %1$s poked you', $params['source_name']);
$preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename); $preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename);

2
mod/settings.php
View file

@ -1237,7 +1237,7 @@ function settings_content(App $a)
'$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::MAIL, ''], '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::MAIL, ''],
'$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''], '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''],
'$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Type::TAG_SELF), Type::TAG_SELF, ''], '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Type::TAG_SELF), Type::TAG_SELF, ''],
'$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''], '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Type::POKE), Type::POKE, ''],
'$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')],

2
src/Model/Notify/Type.php
View file

@ -29,4 +29,6 @@ class Type
* @deprecated * @deprecated
*/ */
const TAG_SHARE = 256; const TAG_SHARE = 256;
/** @var int Notification about getting poked/prodded/etc. */
const POKE = 512;
} }

2
src/Protocol/DFRN.php
View file

@ -2137,7 +2137,7 @@ class DFRN
// send a notification // send a notification
notification( notification(
[ [
"type" => NOTIFY_POKE, "type" => Type::POKE,
"notify_flags" => $importer["notify-flags"], "notify_flags" => $importer["notify-flags"],
"language" => $importer["language"], "language" => $importer["language"],
"to_name" => $importer["username"], "to_name" => $importer["username"],