Merge pull request #13040 from nextcloud/backport/13037/stable30

[stable30] fix: Fix some minor things found by stan
nextcloud · Aug 22, 2024 · 4df5420 · 4df5420
2 parents bc77d0f + b0b89fb
commit 4df5420
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/lib/Chat/MessageParser.php b/lib/Chat/MessageParser.php
@@ -138,13 +138,13 @@ protected function getActorInformation(Message $message, string $actorType, stri
  $actorId = MatterbridgeManager::BRIDGE_BOT_USERID;
  } elseif ($actorType === Attendee::ACTOR_GUESTS
  && !in_array($actorId, [Attendee::ACTOR_ID_CLI, Attendee::ACTOR_ID_CHANGELOG], true)) {
- if (isset($guestNames[$actorId])) {
+ if (isset($this->guestNames[$actorId])) {
  $displayName = $this->guestNames[$actorId];
  } else {
  try {
  $participant = $this->participantService->getParticipantByActor($message->getRoom(), Attendee::ACTOR_GUESTS, $actorId);
  $displayName = $participant->getAttendee()->getDisplayName();
- } catch (ParticipantNotFoundException $e) {
+ } catch (ParticipantNotFoundException) {
  }
  $this->guestNames[$actorId] = $displayName;
  }

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
@@ -1704,13 +1704,13 @@ public function joinFederatedRoom(string $token, ?string $sessionId): DataRespon
  );
  }
 
- if ($sessionId != null) {
+ if ($sessionId !== null) {
  $participant = $this->participantService->joinRoomAsFederatedUser($room, Attendee::ACTOR_FEDERATED_USERS, $this->federationAuthenticator->getCloudId(), $sessionId);
- }
 
- $session = $participant->getSession();
- if ($session instanceof Session) {
- $this->sessionService->updateLastPing($session, $this->timeFactory->getTime());
+ $session = $participant->getSession();
+ if ($session instanceof Session) {
+ $this->sessionService->updateLastPing($session, $this->timeFactory->getTime());
+ }
  }
 
  // Let the clients know if they need to reload capabilities

diff --git a/lib/Service/BotService.php b/lib/Service/BotService.php
@@ -276,7 +276,7 @@ protected function getActor(Room $room): array {
  return [
  'type' => Attendee::ACTOR_GUESTS,
  'id' => $actorId,
- 'name' => $user->getDisplayName(),
+ 'name' => '',
  ];
  }
 

diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
@@ -1350,7 +1350,7 @@ public function updateCallFlags(Room $room, Participant $participant, int $flags
 
  /**
  * @param string[] $actorIds
- * @param string[] $usersDirectlyMentioned
+ * @param string[] $actorsDirectlyMentioned
  */
  public function markUsersAsMentioned(Room $room, string $actorType, array $actorIds, int $messageId, array $actorsDirectlyMentioned): void {
  $update = $this->connection->getQueryBuilder();

diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php
@@ -900,12 +900,12 @@ public function setActiveSince(Room $room, ?Participant $participant, \DateTime
  return false;
  }
 
+ $details = [];
  if ($room->getActiveSince() instanceof \DateTime) {
  // Call is already active, just someone upgrading the call flags
  $event = new BeforeRoomModifiedEvent($room, ARoomModifiedEvent::PROPERTY_IN_CALL, $callFlag, $oldCallFlag, $participant);
  $this->dispatcher->dispatchTyped($event);
  } else {
- $details = [];
  if ($silent) {
  $details[AParticipantModifiedEvent::DETAIL_IN_CALL_SILENT] = true;
  }

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -11,11 +11,6 @@
  <code><![CDATA[NullCache]]></code>
  </UndefinedClass>
  </file>
- <file src="lib/Chat/MessageParser.php">
- <UndefinedVariable>
- <code><![CDATA[$guestNames]]></code>
- </UndefinedVariable>
- </file>
  <file src="lib/Chat/Parser/SystemMessage.php">
  <UndefinedClass>
  <code><![CDATA[\OC_Util]]></code>