friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't display the "follow/unfollow" vcard-link on pages meant for follow/unfollow

pull/14076/head
Michael 2024-04-06 08:28:32 +00:00
parent ad65e56b16
commit 8b75aab4ad
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Content/Widget/VCard.php
View File

@ -43,9 +43,10 @@ class VCard
* @template widget/vcard.tpl * @template widget/vcard.tpl
* @param array $contact * @param array $contact
* @param bool $hide_mention * @param bool $hide_mention
* @param bool $hide_follow
* @return string * @return string
*/ */
public static function getHTML(array $contact, bool $hide_mention = false): string public static function getHTML(array $contact, bool $hide_mention = false, bool $hide_follow = false): string
{ {
if (!isset($contact['network']) || !isset($contact['id'])) { if (!isset($contact['network']) || !isset($contact['id'])) {
Logger::warning('Incomplete contact', ['contact' => $contact ?? []]); Logger::warning('Incomplete contact', ['contact' => $contact ?? []]);
@ -87,7 +88,7 @@ class VCard
} }
} }
if (empty($contact['self']) && Protocol::supportsFollow($contact['network'])) { if (!$hide_follow && empty($contact['self']) && Protocol::supportsFollow($contact['network'])) {
if (in_array($rel, [Contact::SHARING, Contact::FRIEND])) { if (in_array($rel, [Contact::SHARING, Contact::FRIEND])) {
$unfollow_link = 'contact/unfollow?url=' . urlencode($contact_url) . '&auto=1'; $unfollow_link = 'contact/unfollow?url=' . urlencode($contact_url) . '&auto=1';
} elseif (!$pending) { } elseif (!$pending) {

2
src/Module/Contact/Follow.php
View File

@ -186,7 +186,7 @@ class Follow extends BaseModule
$this->page['aside'] = ''; $this->page['aside'] = '';
if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) { if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) {
$this->page['aside'] = VCard::getHTML($contact); $this->page['aside'] = VCard::getHTML($contact, false, true);
$output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), $output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
['$title' => $this->t('Posts and Replies')] ['$title' => $this->t('Posts and Replies')]

2
src/Module/Contact/Unfollow.php
View File

@ -133,7 +133,7 @@ class Unfollow extends \Friendica\BaseModule
'$keywords_label' => '' '$keywords_label' => ''
]); ]);
$this->page['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false)); $this->page['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false), false, true);
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => $this->t('Posts and Replies')]); $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => $this->t('Posts and Replies')]);

2
src/Module/Profile/RemoteFollow.php
View File

@ -118,7 +118,7 @@ class RemoteFollow extends BaseModule
protected function content(array $request = []): string protected function content(array $request = []): string
{ {
$this->page['aside'] = Widget\VCard::getHTML($this->owner); $this->page['aside'] = Widget\VCard::getHTML($this->owner, false, true);
$target_addr = $this->owner['addr']; $target_addr = $this->owner['addr'];
$target_url = $this->owner['url']; $target_url = $this->owner['url'];