|
@@ -2008,12 +2008,39 @@ export class WebClientService {
|
|
|
.then((titlePrefix) => {
|
|
|
const title = `${titlePrefix} ${senderName}`;
|
|
|
let body = '';
|
|
|
- switch (message.type) {
|
|
|
+ let messageType = message.type;
|
|
|
+ let caption = message.caption;
|
|
|
+ let captionString = '';
|
|
|
+ if (caption !== undefined) {
|
|
|
+ captionString = captionString + ': ' + caption;
|
|
|
+ }
|
|
|
+ let messageTypeString = this.$translate.instant('messageTypes.' + messageType);
|
|
|
+ switch (messageType) {
|
|
|
case 'text':
|
|
|
body = message.body;
|
|
|
break;
|
|
|
+ case 'location':
|
|
|
+ body = messageTypeString + ': ' + message.location.poi;
|
|
|
+ break;
|
|
|
+ case 'file':
|
|
|
+ if (message.file.type === 'image/gif') {
|
|
|
+ body = this.$translate.instant('messageTypes.' + 'gif') + captionString;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ // Display caption, if available otherwise use filename
|
|
|
+ if (captionString.length > 0) {
|
|
|
+ body = messageTypeString + captionString;
|
|
|
+ } else {
|
|
|
+ body = messageTypeString + ': ' + message.file.name;
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case 'ballot':
|
|
|
+ // TODO Show ballot title if ballot messages are implemented in the web version
|
|
|
+ body = messageTypeString;
|
|
|
+ break;
|
|
|
default:
|
|
|
- body = `[${message.type}]`;
|
|
|
+ // Image, video and audio
|
|
|
+ body = messageTypeString + captionString;
|
|
|
}
|
|
|
if (conversation.type === 'group') {
|
|
|
body = partnerName + ': ' + body;
|