Skip to content

fix: use shared_by user in share mail if initiator is not set #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 5 commits into from
Jul 7, 2025
Merged

fix: use shared_by user in share mail if initiator is not set #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c32ac28
fix: use shared_by user in share mail if initiator is not set
icewind1991 May 28, 2025
5839733
chore(tests): Cleanup bootstrap.php to be forward-compatible
icewind1991 May 28, 2025
fdba1e7
fix(circles): wrong class type causing autoloader exception
salmart-dev Jul 4, 2025
ce7278d
fix(ci): use psalm with 1 thread
salmart-dev Jul 7, 2025
3aa58b7
fix(ci): remove wrong baseline-entry for SyncService
salmart-dev Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/psalm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ jobs:
run: composer i

- name: Run coding standards check
run: composer run psalm
run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github
7 changes: 7 additions & 0 deletions lib/Listeners/Files/ShareCreatedSendMail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
use OCA\Circles\Tools\Traits\TStringTools;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
use OCP\IUserManager;

/** @template-implements IEventListener<FileShareCreatedEvent|Event> */
class ShareCreatedSendMail implements IEventListener {
Expand All @@ -56,6 +57,8 @@ class ShareCreatedSendMail implements IEventListener {

/** @var ContactService */
private $contactService;
/** @var IUserManager */
private $userManager;

public function __construct(
ShareWrapperService $shareWrapperService,
Expand All @@ -64,13 +67,15 @@ public function __construct(
SendMailService $sendMailService,
ContactService $contactService,
ConfigService $configService,
IUserManager $userManager,
) {
$this->shareWrapperService = $shareWrapperService;
$this->shareTokenService = $shareTokenService;
$this->remoteStreamService = $remoteStreamService;
$this->sendMailService = $sendMailService;
$this->contactService = $contactService;
$this->configService = $configService;
$this->userManager = $userManager;

$this->setup('app', Application::APP_ID);
}
Expand Down Expand Up @@ -127,6 +132,8 @@ public function handle(Event $event): void {
if (!is_null($share)) {
if ($share->hasInitiator()) {
$author = $share->getInitiator()->getDisplayName();
} elseif ($user = $this->userManager->get($share->getSharedBy())) {
$author = $user->getDisplayName();
} else {
$author = 'someone';
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Service/SyncService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class SyncService {
/** @var FederatedUserService */
private $federatedUserService;

/** @var federatedEventService */
/** @var FederatedEventService */
private $federatedEventService;

/** @var CircleService */
Expand All @@ -103,7 +103,7 @@ class SyncService {
* @param CircleRequest $circleRequest
* @param MemberRequest $memberRequest
* @param FederatedUserService $federatedUserService
* @param federatedEventService $federatedEventService
* @param FederatedEventService $federatedEventService
* @param CircleService $circleService
* @param MembershipService $membershipService
* @param OutputService $outputService
Expand All @@ -115,7 +115,7 @@ public function __construct(
CircleRequest $circleRequest,
MemberRequest $memberRequest,
FederatedUserService $federatedUserService,
federatedEventService $federatedEventService,
FederatedEventService $federatedEventService,
CircleService $circleService,
MembershipService $membershipService,
OutputService $outputService,
Expand Down
10 changes: 8 additions & 2 deletions tests/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
define('PHPUNIT_RUN', 1);

use OCP\App\IAppManager;
use OCP\Server;

if (!defined('PHPUNIT_RUN')) {
define('PHPUNIT_RUN', 1);
}

require_once __DIR__ . '/../../../lib/base.php';
require_once __DIR__ . '/../vendor/autoload.php';

require_once __DIR__ . '/../../../tests/autoload.php';

\OC_App::loadApp('circles');
Server::get(IAppManager::class)->loadApp('circles');

OC_Hook::clear();
6 changes: 0 additions & 6 deletions tests/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,6 @@
<code><![CDATA[is_null($object)]]></code>
</RedundantCondition>
</file>
<file src="lib/Service/SyncService.php">
<InvalidClass>
<code><![CDATA[federatedEventService]]></code>
<code><![CDATA[federatedEventService]]></code>
</InvalidClass>
</file>
<file src="lib/Service/TimezoneService.php">
<UndefinedClass>
<code><![CDATA[TimeFactory]]></code>
Expand Down
Loading