friendica/friendica
6
2
Fork 1
mirror of https://github.com/friendica/friendica synced 2026-02-12 13:11:36 +01:00
Code Issues Projects Releases 3 Packages Wiki Activity

Display the alias URL on follow requests

Browse source
This commit is contained in:
Michael 2025-12-31 08:36:07 +00:00
commit 332b8a09ad
5 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/code-quality.yml vendored
View file

@ -35,7 +35,7 @@ jobs:
tools: none
- name: Clone addon repository
run: git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
run: git clone -b 2025.07-rc --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
- name: Install PHP-CS-Fixer
run: composer install --working-dir=bin/dev/php-cs-fixer
@ -68,7 +68,7 @@ jobs:
tools: none
- name: Clone addon repository
run: git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
run: git clone -b 2025.07-rc --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
- name: Install Composer dependencies
uses: "ramsey/composer-install@v2"
@ -100,7 +100,7 @@ jobs:
tools: none
- name: Clone addon repository
run: git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
run: git clone -b 2025.07-rc --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
- name: Install Composer dependencies
uses: "ramsey/composer-install@v2"
@ -132,7 +132,7 @@ jobs:
tools: none
- name: Clone addon repository
run: git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
run: git clone -b 2025.07-rc --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
- name: Install Composer dependencies
uses: "ramsey/composer-install@v2"

4
.github/workflows/tests.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
tools: none
- name: Clone addon repository
run: git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
run: git clone -b 2025.07-rc --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
- name: Install Composer dependencies
uses: "ramsey/composer-install@v2"
@ -88,7 +88,7 @@ jobs:
ini-values: apc.enabled=1, apc.enable_cli=1
- name: Clone addon repository
run: git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
run: git clone -b 2025.07-rc --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
# Install composer dependencies and handle caching in one go.
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer

2
.woodpecker/.phpunit.yml
View file

@ -57,7 +57,7 @@ steps:
composer_install:
image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
commands:
- git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
- git clone -b 2025.07-rc --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
- export COMPOSER_HOME=.composer
- ./bin/composer.phar validate
- ./bin/composer.phar install --prefer-dist

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

@ -160,7 +160,7 @@ class Follow extends BaseModule
'$action' => $requestUrl,
'$name' => $contact['name'],
'$url' => $contact['alias'] ?: $contact['url'],
'$zrl' => OpenWebAuth::getZrlUrl($contact['url']),
'$zrl' => OpenWebAuth::getZrlUrl($contact['alias'] ?: $contact['url']),
'$myaddr' => $myaddr,
'$keywords' => $contact['keywords'],

14
src/Module/Notifications/Introductions.php
View file

@ -18,11 +18,13 @@ use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\User;
use Friendica\Module\BaseNotifications;
use Friendica\Module\Response;
use Friendica\Navigation\Notifications\Factory\Introduction as IntroductionFactory;
use Friendica\Navigation\Notifications\ValueObject\Introduction;
use Friendica\Security\OpenWebAuth;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
@ -102,6 +104,8 @@ class Introductions extends BaseNotifications
// We have to distinguish between these two because they use different data.
switch ($Introduction->getLabel()) {
case 'friend_suggestion':
$contact = Contact::getByURL($Introduction->getUrl());
$notificationContent[] = Renderer::replaceMacros($notificationSuggestions, [
'$type' => $Introduction->getLabel(),
'$str_notification_type' => $this->t('Notification type:'),
@ -116,8 +120,8 @@ class Introductions extends BaseNotifications
'$photo' => $Introduction->getPhoto(),
'$fullname' => $Introduction->getName(),
'$dfrn_url' => $owner['url'],
'$url' => $Introduction->getUrl(),
'$zrl' => $Introduction->getZrl(),
'$url' => $contact['alias'] ?: $Introduction->getUrl(),
'$zrl' => OpenWebAuth::getZrlUrl($contact['alias'] ?: $Introduction->getUrl()),
'$lbl_url' => $this->t('Profile URL'),
'$addr' => $Introduction->getAddr(),
'$action' => 'contact/follow',
@ -166,6 +170,8 @@ class Introductions extends BaseNotifications
$discard = '';
}
$contact = Contact::getByURL($Introduction->getUrl(), ['alias']);
$notificationContent[] = Renderer::replaceMacros($notificationTemplate, [
'$type' => $Introduction->getLabel(),
'$header' => $header,
@ -187,8 +193,8 @@ class Introductions extends BaseNotifications
'$lbl_connection_type' => $helptext,
'$friend' => $friend,
'$follower' => $follower,
'$url' => $Introduction->getUrl(),
'$zrl' => $Introduction->getZrl(),
'$url' => $contact['alias'] ?: $Introduction->getUrl(),
'$zrl' => OpenWebAuth::getZrlUrl($contact['alias'] ?: $Introduction->getUrl()),
'$lbl_url' => $this->t('Profile URL'),
'$addr' => $Introduction->getAddr(),
'$lbl_knowyou' => $lbl_knowyou,