X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Funfollow.php;h=10830bd103d29c51fb0d6f0bfb1bfa862e58bc17;hb=e00c12f09d51bfb16c9b08307f2f61ded9ba9777;hp=0d13c73afc03c380f88108d3d145aaacd348972e;hpb=38e5733b6ee10f5a6dd7f017b6b6e7acfde80565;p=friendica.git diff --git a/mod/unfollow.php b/mod/unfollow.php index 0d13c73afc..10830bd103 100644 --- a/mod/unfollow.php +++ b/mod/unfollow.php @@ -1,71 +1,45 @@ . + * */ use Friendica\App; +use Friendica\Content\Widget; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Profile; use Friendica\Model\User; use Friendica\Util\Strings; function unfollow_post(App $a) { - $base_return_path = 'contact'; - if (!local_user()) { notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect('login'); // NOTREACHED } - $uid = local_user(); - $url = Strings::escapeTags(trim($_REQUEST['url'] ?? '')); - - $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)", - $uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url), - Strings::normaliseLink($url), $url]; - $contact = DBA::selectFirst('contact', [], $condition); - - if (!DBA::isResult($contact)) { - notice(DI::l10n()->t("You aren't following this contact.")); - DI::baseUrl()->redirect($base_return_path); - // NOTREACHED - } - - if (!empty($_REQUEST['cancel'])) { - DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']); - } - - if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { - notice(DI::l10n()->t('Unfollowing is currently not supported by your network.')); - DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']); - // NOTREACHED - } - - $dissolve = ($contact['rel'] == Contact::SHARING); - - $owner = User::getOwnerDataById($uid); - if ($owner) { - Contact::terminateFriendship($owner, $contact, $dissolve); - } - - // Sharing-only contacts get deleted as there no relationship any more - if ($dissolve) { - Contact::remove($contact['id']); - $return_path = $base_return_path; - } else { - DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]); - $return_path = $base_return_path . '/' . $contact['id']; - } + $url = trim($_REQUEST['url'] ?? ''); - info(DI::l10n()->t('Contact unfollowed')); - DI::baseUrl()->redirect($return_path); - // NOTREACHED + unfollow_process($url); } function unfollow_content(App $a) @@ -79,13 +53,13 @@ function unfollow_content(App $a) } $uid = local_user(); - $url = Strings::escapeTags(trim($_REQUEST['url'])); + $url = trim($_REQUEST['url']); $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)", local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url), Strings::normaliseLink($url), $url]; - $contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition); + $contact = DBA::selectFirst('contact', ['url', 'id', 'uid', 'network', 'addr', 'name'], $condition); if (!DBA::isResult($contact)) { notice(DI::l10n()->t("You aren't following this contact.")); @@ -93,7 +67,7 @@ function unfollow_content(App $a) // NOTREACHED } - if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { + if (!Protocol::supportsFollow($contact['network'])) { notice(DI::l10n()->t('Unfollowing is currently not supported by your network.')); DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']); // NOTREACHED @@ -110,29 +84,19 @@ function unfollow_content(App $a) // NOTREACHED } - // Makes the connection request for friendica contacts easier - $_SESSION['fastlane'] = $contact['url']; + if (!empty($_REQUEST['auto'])) { + unfollow_process($contact['url']); + } $o = Renderer::replaceMacros($tpl, [ '$header' => DI::l10n()->t('Disconnect/Unfollow'), - '$desc' => '', - '$pls_answer' => '', - '$does_know_you' => '', - '$add_note' => '', '$page_desc' => '', - '$friendica' => '', - '$statusnet' => '', - '$diaspora' => '', - '$diasnote' => '', '$your_address' => DI::l10n()->t('Your Identity Address:'), '$invite_desc' => '', - '$emailnet' => '', '$submit' => DI::l10n()->t('Submit Request'), '$cancel' => DI::l10n()->t('Cancel'), - '$nickname' => '', - '$name' => $contact['name'], '$url' => $contact['url'], - '$zrl' => Contact::magicLink($contact['url']), + '$zrl' => Contact::magicLinkByContact($contact), '$url_label' => DI::l10n()->t('Profile URL'), '$myaddr' => $self['url'], '$request' => $request, @@ -140,8 +104,7 @@ function unfollow_content(App $a) '$keywords_label'=> '' ]); - DI::page()['aside'] = ''; - Profile::load($a, '', Contact::getDetailsByURL($contact['url'])); + DI::page()['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false)); $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]); @@ -150,3 +113,39 @@ function unfollow_content(App $a) return $o; } + +function unfollow_process(string $url) +{ + $base_return_path = 'contact'; + + $uid = local_user(); + + $owner = User::getOwnerDataById($uid); + if (!$owner) { + throw new \Friendica\Network\HTTPException\NotFoundException(); + } + + $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)", + $uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url), + Strings::normaliseLink($url), $url]; + $contact = DBA::selectFirst('contact', [], $condition); + + if (!DBA::isResult($contact)) { + notice(DI::l10n()->t("You aren't following this contact.")); + DI::baseUrl()->redirect($base_return_path); + // NOTREACHED + } + + $return_path = $base_return_path . '/' . $contact['id']; + + try { + Contact::unfollow($contact); + $notice_message = DI::l10n()->t('Contact was successfully unfollowed'); + } catch (Exception $e) { + DI::logger()->error($e->getMessage(), ['contact' => $contact]); + $notice_message = DI::l10n()->t('Unable to unfollow this contact, please contact your administrator'); + } + + notice($notice_message); + DI::baseUrl()->redirect($return_path); +}