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

Merge pull request #13188 from annando/notification 

Improved profile summary for notifications
This commit is contained in:
Hypolite Petovan 2023-06-03 15:09:39 -04:00 committed by GitHub
parent bfefca0cb0 921e070b22
commit 9278c79917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Model/Post/UserNotification.php
View File

@ -133,7 +133,7 @@ class UserNotification
public static function setNotification(int $uri_id, int $uid)
{
$fields = ['id', 'uri-id', 'parent-uri-id', 'uid', 'body', 'parent', 'gravity', 'vid', 'gravity',
'contact-id', 'author-id', 'owner-id', 'causer-id',
'contact-id', 'author-id', 'owner-id', 'causer-id',
'private', 'thr-parent', 'thr-parent-id', 'parent-uri-id', 'parent-uri', 'verb'];
$item = Post::selectFirst($fields, ['uri-id' => $uri_id, 'uid' => $uid, 'origin' => false]);
if (!DBA::isResult($item)) {
@ -398,45 +398,23 @@ class UserNotification
*/
private static function getProfileForUser(int $uid): array
{
$notification_data = ['uid' => $uid, 'profiles' => []];
Hook::callAll('check_item_notification', $notification_data);
$profiles = $notification_data['profiles'];
$user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
if (!DBA::isResult($user)) {
return [];
}
$owner = DBA::selectFirst('contact', ['url', 'alias'], ['self' => true, 'uid' => $uid]);
$owner = User::getOwnerDataById($uid);
if (!DBA::isResult($owner)) {
return [];
}
// This is our regular URL format
$profiles[] = $owner['url'];
$profiles = [$owner['nurl']];
// Now the alias
$profiles[] = $owner['alias'];
$notification_data = ['uid' => $uid, 'profiles' => []];
Hook::callAll('check_item_notification', $notification_data);
// Notifications from Diaspora often have a URL in the Diaspora format
$profiles[] = DI::baseUrl() . '/u/' . $user['nickname'];
// Validate and add profile links
foreach ($profiles as $key => $profile) {
// Check for invalid profile urls (without scheme, host or path) and remove them
// Normalize the connector profiles
foreach ($notification_data['profiles'] as $profile) {
if (empty(parse_url($profile, PHP_URL_SCHEME)) || empty(parse_url($profile, PHP_URL_HOST)) || empty(parse_url($profile, PHP_URL_PATH))) {
unset($profiles[$key]);
continue;
$profiles[] = $profile;
} else {
$profiles[] = Strings::normaliseLink($profile);
}
// Add the normalized form
$profile = Strings::normaliseLink($profile);
$profiles[] = $profile;
// Add the SSL form
$profile = str_replace('http://', 'https://', $profile);
$profiles[] = $profile;
}
return array_unique($profiles);