Browse Source
Also load the display name
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/5146/head
Joas Schilling
5 years ago
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
2 changed files with
2 additions and
7 deletions
-
lib/Chat/MessageParser.php
-
lib/Model/AttendeeMapper.php
|
|
|
@ -26,7 +26,6 @@ namespace OCA\Talk\Chat; |
|
|
|
|
|
|
|
use OCA\Talk\Events\ChatMessageEvent; |
|
|
|
use OCA\Talk\Exceptions\ParticipantNotFoundException; |
|
|
|
use OCA\Talk\GuestManager; |
|
|
|
use OCA\Talk\Model\Attendee; |
|
|
|
use OCA\Talk\Model\Message; |
|
|
|
use OCA\Talk\Participant; |
|
|
|
@ -49,18 +48,13 @@ class MessageParser { |
|
|
|
/** @var IUserManager */ |
|
|
|
private $userManager; |
|
|
|
|
|
|
|
/** @var GuestManager */ |
|
|
|
private $guestManager; |
|
|
|
|
|
|
|
/** @var array */ |
|
|
|
protected $guestNames = []; |
|
|
|
|
|
|
|
public function __construct(IEventDispatcher $dispatcher, |
|
|
|
IUserManager $userManager, |
|
|
|
GuestManager $guestManager) { |
|
|
|
IUserManager $userManager) { |
|
|
|
$this->dispatcher = $dispatcher; |
|
|
|
$this->userManager = $userManager; |
|
|
|
$this->guestManager = $guestManager; |
|
|
|
} |
|
|
|
|
|
|
|
public function createMessage(Room $room, Participant $participant, IComment $comment, IL10N $l): Message { |
|
|
|
|
|
|
|
@ -143,6 +143,7 @@ class AttendeeMapper extends QBMapper { |
|
|
|
'room_id' => $row['room_id'], |
|
|
|
'actor_type' => $row['actor_type'], |
|
|
|
'actor_id' => $row['actor_id'], |
|
|
|
'display_name' => (string) $row['display_name'], |
|
|
|
'pin' => $row['pin'], |
|
|
|
'participant_type' => (int) $row['participant_type'], |
|
|
|
'favorite' => (bool) $row['favorite'], |
|
|
|
|
