pull/24536/head
Pierre Lehnen 4 years ago
parent 656cd4beb8
commit 8f8852ba6c
  1. 2
      app/discussion/client/index.js
  2. 3
      app/discussion/server/index.js
  3. 1
      app/livechat/client/index.js
  4. 1
      app/livechat/server/index.js
  5. 1
      app/tokenpass/client/index.js
  6. 8
      client/lib/rooms/roomTypes/direct.ts
  7. 2
      client/lib/rooms/roomTypes/private.ts
  8. 2
      client/lib/rooms/roomTypes/public.ts
  9. 4
      client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx

@ -3,5 +3,3 @@ import './lib/messageTypes/discussionMessage';
import './createDiscussionMessageAction';
import './discussionFromMessageBox';
import './tabBar';
import '../lib/discussionRoomType';

@ -5,6 +5,3 @@ import './hooks/propagateDiscussionMetadata';
// Methods
import './methods/createDiscussion';
// Lib
import '../lib/discussionRoomType';

@ -1,5 +1,4 @@
import '../lib/messageTypes';
import './roomType';
import './route';
import './ui';
import './tabBar';

@ -4,7 +4,6 @@ import './startup';
import './visitorStatus';
import './agentStatus';
import '../lib/messageTypes';
import './roomType';
import './hooks/beforeCloseRoom';
import './hooks/beforeDelegateAgent';
import './hooks/leadCapture';

@ -1,6 +1,5 @@
import '../lib/common';
import './startup';
import './roomType';
import './tokenChannelsList.html';
import './tokenChannelsList';
import './tokenpassChannelSettings.html';

@ -104,9 +104,8 @@ roomCoordinator.add(DirectMessageRoomType, {
if (this.isGroupChat(room)) {
return getAvatarURL({
username: (room.uids || []).length + (room.usernames || []).join(),
roomId: undefined,
cache: room.avatarETag,
});
}) as string;
}
const sub = Subscriptions.findOne({ rid: room._id }, { fields: { name: 1 } });
@ -142,10 +141,7 @@ roomCoordinator.add(DirectMessageRoomType, {
const query = {
t: 'd',
$or: [
{ name: identifier },
{ rid: identifier},
]
$or: [{ name: identifier }, { rid: identifier }],
};
const subscription = Subscriptions.findOne(query);

@ -74,7 +74,7 @@ roomCoordinator.add(PrivateRoomType, {
},
getAvatarPath(room: Partial<IRoom> & { username?: IRoom['_id'] }): string {
return getAvatarURL({ roomId: room._id, cache: room.avatarETag, username: undefined });
return getAvatarURL({ roomId: room._id, cache: room.avatarETag }) as string;
},
getIcon(room: Partial<IRoom>): string | undefined {

@ -73,7 +73,7 @@ roomCoordinator.add(PublicRoomType, {
},
getAvatarPath(room: Partial<IRoom> & { username?: IRoom['_id'] }): string {
return getAvatarURL({ roomId: room._id, cache: room.avatarETag, username: undefined });
return getAvatarURL({ roomId: room._id, cache: room.avatarETag }) as string;
},
getIcon(room: Partial<IRoom>): string | undefined {

@ -6,7 +6,7 @@ import { IRoom } from '../../../../../../definition/IRoom';
import { Serialized } from '../../../../../../definition/Serialized';
import RoomAvatar from '../../../../../components/avatar/RoomAvatar';
import { useEndpointData } from '../../../../../hooks/useEndpointData';
import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
type RoomsInputProps = {
value: Serialized<IRoom>[];
@ -34,7 +34,7 @@ const useRoomsAutoComplete = (
}
return data.items.map((room: Serialized<IRoom>) => ({
label: roomCoordinator.getRoomName(room.t, room),
label: roomCoordinator.getRoomName(room.t, room as unknown as IRoom),
value: room._id,
}));
}, [data]);

Loading…
Cancel
Save