Skip to content

[stable22] Feed FederatedEvent with Initiator as Member #671

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
ArtificialOwl merged 1 commit into from
Jul 2, 2021
Merged

[stable22] Feed FederatedEvent with Initiator as Member #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Feed FederatedEvent with Initiator as Member 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot
ArtificialOwl authored and backportbot[bot] committed Jul 2, 2021
commit 2511c1d4acdaa6e74ada8e93ff44ec8b1e07e6a8
1 change: 1 addition & 0 deletions lib/FederatedItems/MemberDisplayName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public function manage(FederatedEvent $event): void {
$member->setDisplayName($displayName);
$this->memberRequest->updateDisplayName($member->getSingleId(), $displayName, $circle->getSingleId());

$event->setMember($member);
$this->eventService->memberNameEditing($event);
}

Expand Down
4 changes: 0 additions & 4 deletions lib/Listeners/DeprecatedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ public function __construct(
public function userAccountUpdated(IUser $user) {
$federatedUser = $this->federatedUserService->getLocalFederatedUser($user->getUID());

if ($federatedUser->getDisplayName() === $user->getUID()) {
return;
}

$this->circleRequest->updateDisplayName($federatedUser->getSingleId(), $user->getDisplayName());
$this->federatedUserService->setCurrentUser($federatedUser);

Expand Down