X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=3eb261d0d524ee31d20b852cff160d3bca036b4d;hb=1792046a4f270f15d904d591c1e9eb0444ff2349;hp=4642401a28e4d47cf5b0d0e1e6e3d235d8bc084b;hpb=4fd9db1035f555c2ea6d8400959e6326b51660be;p=friendica.git

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 4642401a28..3eb261d0d5 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -181,9 +181,11 @@ class Contact extends BaseModule
 			if ($result['success']) {
 				DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
 			}
-		} else {
+
 			// pull feed and consume it, which should subscribe to the hub.
 			Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
+		} else {
+			Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
 		}
 	}
 
@@ -516,7 +518,7 @@ class Contact extends BaseModule
 
 			$relation_text = sprintf($relation_text, $contact['name']);
 
-			$url = Model\Contact::magicLink($contact['url']);
+			$url = Model\Contact::magicLinkByContact($contact);
 			if (strpos($url, 'redir/') === 0) {
 				$sparkle = ' class="sparkle" ';
 			} else {
@@ -528,7 +530,7 @@ class Contact extends BaseModule
 			$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? DI::l10n()->t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
 
 			if ($contact['last-update'] > DBA::NULL_DATETIME) {
-				$last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? DI::l10n()->t('(Update was successful)') : DI::l10n()->t('(Update was not successful)'));
+				$last_update .= ' ' . ($contact['failed'] ? DI::l10n()->t('(Update was not successful)') : DI::l10n()->t('(Update was successful)'));
 			}
 			$lblsuggest = (($contact['network'] === Protocol::DFRN) ? DI::l10n()->t('Suggest friends') : '');
 
@@ -560,13 +562,23 @@ class Contact extends BaseModule
 			// Disable remote self for everything except feeds.
 			// There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter
 			// Problem is, you couldn't reply to both networks.
-			$allow_remote_self = in_array($contact['network'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])
+			$allow_remote_self = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])
 				&& DI::config()->get('system', 'allow_users_remote_self');
 
 			if ($contact['network'] == Protocol::FEED) {
-				$remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '1' => DI::l10n()->t('Mirror as forwarded posting'), '2' => DI::l10n()->t('Mirror as my own posting')];
+				$remote_self_options = [Model\Contact::MIRROR_DEACTIVATED => DI::l10n()->t('No mirroring'),
+					Model\Contact::MIRROR_FORWARDED => DI::l10n()->t('Mirror as forwarded posting'),
+					Model\Contact::MIRROR_OWN_POST => DI::l10n()->t('Mirror as my own posting')];
+			} elseif (in_array($contact['network'], [Protocol::ACTIVITYPUB])) {
+				$remote_self_options = [Model\Contact::MIRROR_DEACTIVATED => DI::l10n()->t('No mirroring'), 
+				Model\Contact::MIRROR_NATIVE_RESHARE => DI::l10n()->t('Native reshare')];
+			} elseif (in_array($contact['network'], [Protocol::DFRN])) {
+				$remote_self_options = [Model\Contact::MIRROR_DEACTIVATED => DI::l10n()->t('No mirroring'), 
+				Model\Contact::MIRROR_OWN_POST => DI::l10n()->t('Mirror as my own posting'),
+				Model\Contact::MIRROR_NATIVE_RESHARE => DI::l10n()->t('Native reshare')];
 			} else {
-				$remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')];
+				$remote_self_options = [Model\Contact::MIRROR_DEACTIVATED => DI::l10n()->t('No mirroring'), 
+					Model\Contact::MIRROR_OWN_POST => DI::l10n()->t('Mirror as my own posting')];
 			}
 
 			$poll_interval = null;
@@ -679,7 +691,7 @@ class Contact extends BaseModule
 				array_unshift($sql_values, 0);
 				break;
 			case 'archived':
-				$sql_extra = " AND (`archive` OR `failed`) AND NOT `blocked` AND NOT `pending`";
+				$sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
 				break;
 			case 'pending':
 				$sql_extra = " AND `pending` AND NOT `archive` AND NOT `failed` AND ((`rel` = ?)
@@ -687,7 +699,7 @@ class Contact extends BaseModule
 				$sql_values[] = Model\Contact::SHARING;
 				break;
 			default:
-				$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending` AND NOT `failed`";
+				$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
 				break;
 		}
 
@@ -1064,7 +1076,7 @@ class Contact extends BaseModule
 			}
 		}
 
-		$url = Model\Contact::magicLink($contact['url']);
+		$url = Model\Contact::magicLinkByContact($contact);
 
 		if (strpos($url, 'redir/') === 0) {
 			$sparkle = ' class="sparkle" ';