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

Restructured profile generation

This commit is contained in:
Michael 2020-01-05 12:49:57 +00:00
parent bad50d31c0
commit 4e7aa33598
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Model/UserItem.php
View File

@ -125,7 +125,7 @@ class UserItem
$notification_data = ['uid' => $uid, 'profiles' => []]; $notification_data = ['uid' => $uid, 'profiles' => []];
Hook::callAll('check_item_notification', $notification_data); Hook::callAll('check_item_notification', $notification_data);
$profiles = $notification_data['profiles']; $raw_profiles = $notification_data['profiles'];
$user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]); $user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
if (!DBA::isResult($user)) { if (!DBA::isResult($user)) {
@ -138,32 +138,41 @@ class UserItem
} }
// This is our regular URL format // This is our regular URL format
$profiles[] = $owner['url']; $raw_profiles[] = $owner['url'];
// Notifications from Diaspora are often with an URL in the Diaspora format // Notifications from Diaspora are often with an URL in the Diaspora format
$profiles[] = DI::baseUrl() . '/u/' . $user['nickname']; $raw_profiles[] = DI::baseUrl() . '/u/' . $user['nickname'];
$profiles2 = []; $profiles = [];
foreach ($profiles AS $profile) { // Validate and add profile links
foreach ($raw_profiles AS $profile) {
// Check for invalid profile urls. 13 should be the shortest possible profile length: // Check for invalid profile urls. 13 should be the shortest possible profile length:
// http://a.bc/d // http://a.bc/d
// Additionally check for invalid urls that would return the normalised value "http:" // Additionally check for invalid urls that would return the normalised value "http:"
if ((strlen($profile) >= 13) && (Strings::normaliseLink($profile) != 'http:')) { if ((strlen($profile) < 13) || (Strings::normaliseLink($profile) == 'http:')) {
if (!in_array($profile, $profiles2)) continue;
$profiles2[] = $profile; }
$profile = Strings::normaliseLink($profile); // Add the profile if it wasn't already added
if (!in_array($profile, $profiles2)) if (!in_array($profile, $profiles)) {
$profiles2[] = $profile; $profiles[] = $profile;
}
$profile = str_replace('http://', 'https://', $profile); // Add the normalized form
if (!in_array($profile, $profiles2)) $profile = Strings::normaliseLink($profile);
$profiles2[] = $profile; if (!in_array($profile, $profiles)) {
$profiles[] = $profile;
}
// Add the SSL form
$profile = str_replace('http://', 'https://', $profile);
if (!in_array($profile, $profiles)) {
$profiles[] = $profile;
} }
} }
return $profiles2; return $profiles;
} }
/** /**