@chat21/chat21-ionic 3.0.95 → 3.0.96-rc.2

package/.github/workflows/docker-community-push-latest.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2	     
       name: Check out the repo
-    - uses: docker/build-push-action@v2
+    - uses: docker/build-push-action@v1
       with:	    
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

package/.github/workflows/docker-image-tag-community-tag-push.yml

@@ -13,7 +13,7 @@ jobs:
      - name: Check out the repo
        uses: actions/checkout@v2
      - name: Push to Docker Hub
-       uses: docker/build-push-action@v2
+       uses: docker/build-push-action@v1
        with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # chat21-ionic ver 3.0
 
+### 3.0.96-rc.2
+- changed: chat21client.js to v0.1.12.5 (window scope fixed)
+
+### 3.0.96-rc.1
+- added: isFirstMessage, isSameSender, isLastMessage, isFirstMessage function to utils-message
+- added: online/offline status check for offline automatic email -> presence service impl
+- added: websocket as mqtt-presence service dep
+- added: tip message if lead has an email and is offline, when agent is on chat section in conversation-detail footer component
+
 ### 3.0.95 in PROD
 - bug-fixed: cannot upload PDF files
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.95",
+    "version": "3.0.96-rc.2",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.module.ts

@@ -29,6 +29,7 @@ import { CHAT_ENGINE_MQTT, CHAT_ENGINE_FIREBASE, UPLOAD_ENGINE_NATIVE } from '..
 // SERVICES
 import { AppConfigProvider } from './services/app-config';
 import { EventsService } from './services/events-service';
+import { WebsocketService } from './services/websocket/websocket.service';
 
 // ABSTRACT SERVICES
 import { MessagingAuthService } from 'src/chat21-core/providers/abstract/messagingAuth.service';
@@ -197,10 +198,10 @@ export function typingFactory(appConfig: AppConfigProvider) {
   }
 }
 
-export function presenceFactory(appConfig: AppConfigProvider) {
+export function presenceFactory(chat21Service: Chat21Service, appConfig: AppConfigProvider, webSockerService: WebsocketService) {
   const config = appConfig.getConfig()
   if (config.chatEngine === CHAT_ENGINE_MQTT) {
-    return new MQTTPresenceService();
+    return new MQTTPresenceService(chat21Service, webSockerService)
   } else {
     return new FirebasePresenceService();
   }
@@ -317,7 +318,7 @@ const appInitializerFn = (appConfig: AppConfigProvider, logger: NGXLogger) => {
     {
       provide: PresenceService,
       useFactory: presenceFactory,
-      deps: [AppConfigProvider]
+      deps: [Chat21Service, AppConfigProvider, WebsocketService]
     },
     {
       provide: TypingService,

package/src/app/chatlib/conversation-detail/conversation-content/conversation-content.component.ts

@@ -5,7 +5,7 @@ import { MSG_STATUS_SENT, MSG_STATUS_RETURN_RECEIPT, MSG_STATUS_SENT_SERVER, MAX
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { UploadService } from 'src/chat21-core/providers/abstract/upload.service';
-import { isEmojii, isInfo, isMine, messageType } from 'src/chat21-core/utils/utils-message';
+import { isEmojii, isFirstMessage, isInfo, isLastMessage, isMine, isSameSender, messageType } from 'src/chat21-core/utils/utils-message';
 @Component({
   selector: 'tiledeskwidget-conversation-content',
   templateUrl: './conversation-content.component.html',
@@ -255,26 +255,29 @@ export class ConversationContentComponent implements OnInit {
     }, showDelay);
   }
 
-  isLastMessage(idMessage: string) {
-    // console.log('idMessage: ' + idMessage + 'id LAST Message: ' + this.messages[this.messages.length - 1].uid);
-    if (idMessage === this.messages[this.messages.length - 1].uid) {
-      return true;
-    }
-    return false;
+  isLastMessage(idMessage: string):boolean {
+    return isLastMessage(this.messages, idMessage)
+    // if (idMessage === this.messages[this.messages.length - 1].uid) {
+    //   return true;
+    // }
+    // return false;
   }
 
   isSameSender(senderId, index):boolean{
-    if(senderId && this.messages[index - 1] && (senderId === this.messages[index - 1].sender)){
-      return true;
-    }
-    return false;
+    return isSameSender(this.messages, senderId, index)
+    // if(senderId && this.messages[index - 1] && (senderId === this.messages[index - 1].sender)){
+    //   return true;
+    // }
+    // return false;
   }
 
+
   isFirstMessage(senderId, index):boolean{
-    if(senderId && index == 0 && this.messages[index] && (this.messages[index] !== senderId)){
-      return true;
-    }
-    return false;
+    return isFirstMessage(this.messages, senderId, index)
+    // if(senderId && index == 0 && this.messages[index] && (this.messages[index] !== senderId)){
+    //   return true;
+    // }
+    // return false;
   }
 
   hideOutsideElements() {

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.scss

@@ -2,13 +2,6 @@
     color: lightblue;
 }
 
-:host .base_sent .msg_sent ::ng-deep div > div > div > chat-text > p > p {
-    margin-top: 12px !important;
-    // white-space: nowrap;
-    // overflow: hidden;
-    // text-overflow: ellipsis;
-}
-
 :host .base_sent .msg_sent ::ng-deep > div > div > chat-image > div {
     // display: none !important;
     // border-radius: unset !important;

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.ts

@@ -50,7 +50,6 @@ export class IonConversationDetailComponent extends ConversationContentComponent
 
   isMine = isMine;
   isInfo = isInfo;
-  isFirstMessage = isFirstMessage;
   messageType = messageType;
   isChannelTypeGroup = isChannelTypeGroup;
   isEmojii = isEmojii;

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.scss

@@ -83,21 +83,6 @@
         height: auto;
         object-fit: cover;
     }
-
-    .message_innerhtml {
-        margin: 0px;
-        // padding: 0px 14px;
-        &.marked {
-            padding: 8px;
-            margin-block-start: -1em !important;
-            margin-block-end: -1em !important;
-        }
-
-        .text-message {
-            padding-top: 14px;
-        }
-    }
-
 }
 // > .button-native
 

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.ts

@@ -105,7 +105,6 @@ export class BubbleMessageComponent implements OnInit, OnChanges {
     }
     if(this.message && this.message.sender_fullname && this.message.sender_fullname.trim() !== ''){
       this.fullnameColor = getColorBck(this.message.sender_fullname)
-      console.log('colorrrrrr', this.fullnameColor)
     }
   }
 

package/src/app/chatlib/conversation-detail/message/text/text.component.scss

@@ -5,8 +5,8 @@
     // padding: 0px 14px;
     &.marked{
         padding:8px;
-        margin-block-start: -1em!important;
-        margin-block-end: -1em!important;
+        margin-block-start: 0em!important;
+        margin-block-end: 0em!important;
 
         a {
             word-break: break-all
@@ -31,4 +31,9 @@ p ::ng-deep a {
     word-break: break-word
 }
 
+p ::ng-deep p{
+    margin-block-end: 0em;
+    margin-block-start: 0em
+}
+
 

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.html

@@ -14,6 +14,11 @@
         {{translationMap.get('LABEL_EMAIL')}}
       </ion-button>
     </div>
+
+    <div *ngIf="section==='chat' && messageString && leadInfo?.presence['status']==='offline'" class="section-option offline-lead-tip" >
+      {{translationMap.get('EMAIL_OFFLINE_TIP')}}
+    </div>
+
   </div>
 
   <ion-row id="message-email" [style.display]="section==='email'? 'flex': 'none'">

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.scss

@@ -33,6 +33,13 @@
             }
         }
     }
+
+    .offline-lead-tip{
+        font-size: 12px;
+        width: 100%;
+        display: block;
+        text-align: right;
+    }
 }
 
 #message-email{

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.ts

@@ -48,7 +48,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @Input() tagsCannedCount: number;
   @Input() areVisibleCAR: boolean;
   @Input() supportMode: boolean;
-  @Input() leadInfo: {lead_id: string, hasEmail: boolean, email: string, projectId: string};
+  @Input() leadInfo: {lead_id: string, hasEmail: boolean, email: string, projectId: string, presence: {}};
   @Input() fileUploadAccept: string;
   @Input() emailSection: boolean;
   @Input() isOpenInfoConversation: boolean;

package/src/app/components/navbar/navbar.component.ts

@@ -21,7 +21,7 @@ export class NavbarComponent implements OnInit {
   private logger: LoggerService = LoggerInstance.getInstance();
   private tiledeskToken: string;
 
-  public projects: Project[];
+  public projects: Project[] = [];
   public project: any = [];
   private USER_ROLE: string;
 

package/src/app/pages/conversation-detail/conversation-detail.page.ts

@@ -84,6 +84,7 @@ import { TiledeskService } from '../../services/tiledesk/tiledesk.service'
 import { NetworkService } from '../../services/network-service/network.service'
 import { EventsService } from '../../services/events-service'
 import { ScrollbarThemeDirective } from 'src/app/utils/scrollbar-theme.directive'
+import { WebsocketService } from 'src/app/services/websocket/websocket.service';
 
 @Component({
   selector: 'app-conversation-detail',
@@ -114,7 +115,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   public groupDetail: GroupModel
   public messageSelected: any
   public channelType: string
-  public leadIsOnline: boolean
   public lastConnectionDate: string
   public showMessageWelcome: boolean
   public openInfoConversation = false
@@ -126,7 +126,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   public translationsHeaderMap: Map<string, string> = new Map() 
   public translationsContentMap: Map<string, string> = new Map()
   public conversationAvatar: any
-  public leadInfo: {lead_id: string, hasEmail: boolean , email: string, projectId: string};
+  public leadInfo: {lead_id: string, hasEmail: boolean , email: string, projectId: string, presence: {}};
   public liveInfo: {sourcePage: string, sourceTitle: string}
   public member: UserModel
   public isFileSelected: boolean
@@ -230,6 +230,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     public tiledeskService: TiledeskService,
     private networkService: NetworkService,
     private events: EventsService,
+    private webSocketService: WebsocketService,
     private sanitizer: DomSanitizer
   ) {
     // Change list on date change
@@ -626,6 +627,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
       "LABEL_CHAT",
       "LABEL_EMAIL",
+      "EMAIL_OFFLINE_TIP",
       "EMAIL_PLACEHOLDER",
       "EMAIL_NOT_FOUND_PLACEHOLDER",
       "SUBJECT",
@@ -917,8 +919,17 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.tiledeskService.getRequest(this.conversationWith, projectId, tiledeskToken).subscribe((request: any)=>{
         that.logger.debug('[CONVS-DETAIL] getLeadDetail - selected REQUEST detail', request)
         if(request.lead && request.lead.email){
-          that.leadInfo = {lead_id: request.lead.lead_id, hasEmail: true, email: request.lead.email, projectId: projectId}
+          that.leadInfo = {
+            lead_id: request.lead.lead_id, 
+            hasEmail: true, 
+            email: request.lead.email, 
+            projectId: projectId,
+            presence: {
+              status: 'offline'
+            }
+          }
           that.presenceService.userIsOnline(this.leadInfo.lead_id);
+          that.webSocketService.subscribeToWS_RequesterPresence(projectId, that.leadInfo.lead_id)
         }
       }, (error)=>{
         this.logger.error('[CONVS-DETAIL] - getLeadDetail - GET REQUEST DETAIL - ERROR  ', error)
@@ -1022,29 +1033,29 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
     if ((msg && msg.trim() !== '') || type !== TYPE_MSG_TEXT) {
 
-      //FIX TEMPORARY
-      this.leadIsOnline = true;
       
-      if(this.isEmailEnabled && !this.leadIsOnline && this.leadInfo && this.leadInfo.email && !emailSectionMsg){
+      if(this.isEmailEnabled && 
+          this.leadInfo && this.leadInfo.presence && this.leadInfo.presence['status']=== 'offline' &&  
+          this.leadInfo.email && !emailSectionMsg){
         this.logger.log('[CONVS-DETAIL] - SEND MESSAGE --> SENDING EMAIL', msg, this.leadInfo.email)
-        // this.sendEmail(msg).subscribe(status => {
-        //   if(status){
-        //     //SEND MESSAGE ALSO AS EMAIL
-        //     attributes['channel']= 'offline_'+TYPE_MSG_EMAIL
-        //   }
-
-        //   this.conversationHandlerService.sendMessage(
-        //     msg,
-        //     type,
-        //     metadata,
-        //     this.conversationWith,
-        //     this.conversationWithFullname,
-        //     this.loggedUser.uid,
-        //     fullname,
-        //     this.channelType,
-        //     attributes,
-        //   )
-        // })
+        this.sendEmail(msg).subscribe(status => {
+          if(status){
+            //SEND MESSAGE ALSO AS EMAIL
+            attributes['channel']= 'offline_'+TYPE_MSG_EMAIL
+          }
+
+          this.conversationHandlerService.sendMessage(
+            msg,
+            type,
+            metadata,
+            this.conversationWith,
+            this.conversationWithFullname,
+            this.loggedUser.uid,
+            fullname,
+            this.channelType,
+            attributes,
+          )
+        })
       }else {
         //send STANDARD TEXT MESSAGE
         this.conversationHandlerService.sendMessage(
@@ -1147,7 +1158,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
           const userId = data.uid;
           const isOnline = data.isOnline;
           if (this.leadInfo && this.leadInfo.lead_id === userId) {
-            this.leadIsOnline = isOnline;
+            this.leadInfo.presence['status'] = isOnline? 'online': 'offline';
           }
         }
       });
@@ -1243,6 +1254,9 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         subscription.value.unsubscribe() // vedere come fare l'unsubscribe!!!!
       })
       this.subscriptions = []
+    if(this.leadInfo){
+      this.webSocketService.unsubscribeToWS_RequesterPresence(this.leadInfo.projectId, this.leadInfo.lead_id)
+    }
 
       // https://www.w3schools.com/jsref/met_element_removeeventlistener.asp
       window.removeEventListener('keyboardWillShow', null)

package/src/app/services/websocket/websocket.service.ts

@@ -307,19 +307,19 @@ export class WebsocketService {
     this.webSocketJs.ref(path, 'subscribeToWS_RequesterPresence',
 
       function (data, notification) {
-        // self.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - CREATE data ", data);
+        // this.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - CREATE data ", data);
 
         self.wsRequesterStatus$.next(data);
 
       }, function (data, notification) {
-        self.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - UPDATE data ", data);
+        // this.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - UPDATE data ", data);
 
         self.wsRequesterStatus$.next(data);
 
       }, function (data, notification) {
 
         if (data) {
-          // self.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - ON-DATA data ", data);
+          // this.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - ON-DATA data ", data);
         }
       }
     );

package/src/assets/i18n/ar.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "إرسال",
   "LABEL_CHAT":"دردشة",
+  "EMAIL_OFFLINE_TIP":"تحذير: المستخدم غير متصل! سيتم إرسال الرسالة عبر البريد الإلكتروني",
   "EMAIL_PLACEHOLDER":"المسودة متاحة هنا - انقر للتعديل",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"لم يقدم هذا المستخدم عنوان بريد إلكتروني. قم بتحديث عنوان الزائر لإرسال بريد إلكتروني",
   "SUBJECT":"موضوعات",

package/src/assets/i18n/az.json

@@ -23,6 +23,7 @@
     ],
     "LABEL_SEND": "Göndər",
     "LABEL_CHAT":"Söhbət",
+    "EMAIL_OFFLINE_TIP":"Xəbərdarlıq: istifadəçi oflayndır! Mesaj e-poçt vasitəsilə göndəriləcək",
     "EMAIL_PLACEHOLDER":"Qaralama burada mövcuddur - redaktə etmək üçün klikləyin",
     "EMAIL_NOT_FOUND_PLACEHOLDER":"Bu istifadəçi e-poçt ünvanı təqdim etməyib. E-poçt göndərmək üçün ziyarətçinin ünvanını yeniləyin",
     "SUBJECT":"Mövzu",

package/src/assets/i18n/de.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "Senden",
   "LABEL_CHAT":"Plaudern",
+  "EMAIL_OFFLINE_TIP":"Achtung: Benutzer ist offline! Die Nachricht wird per E-Mail versendet",
   "EMAIL_PLACEHOLDER":"Entwurf hier verfügbar - zum Bearbeiten klicken",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"Dieser Benutzer hat keine E-Mail-Adresse angegeben. Aktualisieren Sie die Adresse des Besuchers, um eine E-Mail zu senden",
   "SUBJECT":"Thema",

package/src/assets/i18n/en.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "Send",
   "LABEL_CHAT":"Chat",
+  "EMAIL_OFFLINE_TIP":"Warning: user is offline! The message will be sent by email",
   "EMAIL_PLACEHOLDER":"Draft available here - click to edit",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"This user has not provided an email address. Update the visitor's address to send an email",
   "SUBJECT":"Subject",

package/src/assets/i18n/es.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "Send",
   "LABEL_CHAT":"Charla",
+  "EMAIL_OFFLINE_TIP":"Advertencia: ¡el usuario está desconectado! El mensaje será enviado por correo electrónico",
   "EMAIL_PLACEHOLDER":"Borrador disponible aquí - haga clic para editar",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"Este usuario no ha proporcionado una dirección de correo electrónico. Actualizar la dirección del visitante para enviar un correo electrónico",
   "SUBJECT":"Sujeto",

package/src/assets/i18n/fr.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "Envoyer",
   "LABEL_CHAT":"Chatter",
+  "EMAIL_OFFLINE_TIP":"Attention : l'utilisateur est hors ligne ! Le message sera envoyé par email",
   "EMAIL_PLACEHOLDER":"Brouillon disponible ici - cliquez pour modifier",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"Cet utilisateur n'a pas fourni d'adresse e-mail. Mettre à jour l'adresse du visiteur pour envoyer un e-mail",
   "SUBJECT":"Matière",

package/src/assets/i18n/it.json

@@ -23,6 +23,7 @@
     ],
     "LABEL_SEND": "Invia",
     "LABEL_CHAT":"Chat",
+    "EMAIL_OFFLINE_TIP":"Attenzione: l'utente è offline! Il messaggio sarà mandato per email",
     "EMAIL_PLACEHOLDER":"Bozza disponibile qui - clicca per modificare",
     "EMAIL_NOT_FOUND_PLACEHOLDER":"Questo utente non ha fornito un indirizzo email. Aggiorna l'indirizzo del visitatore per inviare un'e-mail",
     "SUBJECT":"Oggetto",

package/src/assets/i18n/kk.json

@@ -23,6 +23,7 @@
     ],
     "LABEL_SEND": "Жіберу",
     "LABEL_CHAT":"Чат",
+    "EMAIL_OFFLINE_TIP":"Ескерту: пайдаланушы желіден тыс! Хабарлама электрондық пошта арқылы жіберіледі",
     "EMAIL_PLACEHOLDER":"Жоба осы жерде қолжетімді - өңдеу үшін басыңыз",
     "EMAIL_NOT_FOUND_PLACEHOLDER":"Бұл пайдаланушы электрондық пошта мекенжайын көрсетпеді. Электрондық поштаны жіберу үшін келушінің мекенжайын жаңартыңыз",
     "SUBJECT":"Тақырып",

package/src/assets/i18n/pt.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "Mandar",
   "LABEL_CHAT":"Bater papo",
+  "EMAIL_OFFLINE_TIP":"Aviso: o usuário está offline! A mensagem será enviada por e-mail",
   "EMAIL_PLACEHOLDER":"Rascunho disponível aqui - clique para editar",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"Este usuário não forneceu um endereço de e-mail. Atualize o endereço do visitante para enviar um e-mail",
   "SUBJECT":"Sujeito",

package/src/assets/i18n/ru.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "Отправлять",
   "LABEL_CHAT":"Чат",
+  "EMAIL_OFFLINE_TIP":"Внимание: пользователь не в сети! Сообщение будет отправлено по электронной почте",
   "EMAIL_PLACEHOLDER":"Черновик доступен здесь - нажмите, чтобы изменить",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"Этот пользователь не указал адрес электронной почты. Обновите адрес посетителя, чтобы отправить электронное письмо",
   "SUBJECT":"Предмет",

package/src/assets/i18n/sr.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "Пошаљи",
   "LABEL_CHAT":"Ћаскање",
+  "EMAIL_OFFLINE_TIP":"Упозорење: корисник није на мрежи! Порука ће бити послата е-поштом",
   "EMAIL_PLACEHOLDER":"Нацрт је доступан овде - кликните да бисте уредили",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"Овај корисник није навео адресу е-поште. Ажурирајте адресу посетиоца да бисте послали е-поштуОвај корисник није навео адресу е-поште. Ажурирајте адресу посетиоца да бисте послали е-пошту",
   "SUBJECT":"Предмет",

package/src/assets/i18n/sv.json

@@ -23,6 +23,7 @@
     ],
     "LABEL_SEND": "Skicka",
     "LABEL_CHAT":"Chat",
+    "EMAIL_OFFLINE_TIP":"Varning: användaren är offline! Meddelandet kommer att skickas via e-post",
     "EMAIL_PLACEHOLDER":"Utkast tillgängligt här - klicka för att redigera",
     "EMAIL_NOT_FOUND_PLACEHOLDER":"Den här användaren har inte angett någon e-postadress. Uppdatera besökarens adress för att skicka ett e-postmeddelande",
     "SUBJECT":"Ämne",

package/src/assets/i18n/tr.json

@@ -23,6 +23,7 @@
   ],
   "LABEL_SEND": "Göndermek",
   "LABEL_CHAT":"Sohbet",
+  "EMAIL_OFFLINE_TIP":"Uyarı: kullanıcı çevrimdışı! Mesaj e-posta ile gönderilecek",
   "EMAIL_PLACEHOLDER":"Taslak burada mevcut - düzenlemek için tıklayın",
   "EMAIL_NOT_FOUND_PLACEHOLDER":"Bu kullanıcı bir e-posta adresi sağlamadı. E-posta göndermek için ziyaretçinin adresini güncelleyin",
   "SUBJECT":"Ders",

package/src/assets/i18n/uk.json

@@ -23,6 +23,7 @@
     ],
     "LABEL_SEND": "Надіслати",
     "LABEL_CHAT":"Чат",
+    "EMAIL_OFFLINE_TIP":"Попередження: користувач офлайн! Повідомлення буде надіслано електронною поштою",
     "EMAIL_PLACEHOLDER":"Чернетка доступна тут - натисніть, щоб змінити",
     "EMAIL_NOT_FOUND_PLACEHOLDER":"Цей користувач не вказав адресу електронної пошти. Оновіть адресу відвідувача, щоб надіслати електронний лист",
     "SUBJECT":"Тема",

package/src/assets/i18n/uz.json

@@ -24,6 +24,7 @@
     ],
     "LABEL_SEND": "Yuborish",
     "LABEL_CHAT":"Chat",
+    "EMAIL_OFFLINE_TIP":"Ogohlantirish: foydalanuvchi oflayn! Xabar elektron pochta orqali yuboriladi",
     "EMAIL_PLACEHOLDER":"Qoralama bu yerda mavjud - tahrirlash uchun bosing",
     "EMAIL_NOT_FOUND_PLACEHOLDER":"Bu foydalanuvchi elektron pochta manzilini ko'rsatmagan. Elektron pochta xabarini yuborish uchun tashrif buyuruvchining manzilini yangilang",
     "SUBJECT":"Mavzu",

package/src/assets/js/chat21client.js

@@ -1,9 +1,10 @@
 /*
     Chat21Client
 
-    v0.1.12.4
+    v0.1.12.5
 
     @Author Andrea Sponziello
+    @Member Gabriele Panico
     (c) Tiledesk 2020
 */
 
@@ -29,6 +30,9 @@ class Chat21Client {
                     console.log("MQTTendpoint relative url");
                 }
                 var loc = window.location, new_uri;
+                if(window.frameElement && window.frameElement.getAttribute('tiledesk_context') === 'parent'){
+                    loc = window.parent.location
+                }
                 if (loc.protocol === "https:") {
                     // new_uri = "wss:";
                     new_uri = "mqtt:";

package/src/chat21-core/providers/abstract/archivedconversations-handler.service.ts

@@ -7,14 +7,14 @@ import { ImageRepoService } from './image-repo.service';
 export abstract class ArchivedConversationsHandlerService {
 
   // BehaviorSubject
-  abstract BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract archivedConversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract archivedConversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract archivedConversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+  abstract BSConversationDetail: BehaviorSubject<ConversationModel>;
+  abstract archivedConversationAdded: BehaviorSubject<ConversationModel>;
+  abstract archivedConversationChanged: BehaviorSubject<ConversationModel>;
+  abstract archivedConversationRemoved: BehaviorSubject<ConversationModel>;
   // abstract readAllMessages: BehaviorSubject<string> = new BehaviorSubject<string>(null);
 
   // params
-  abstract archivedConversations: Array<ConversationModel> = [];
+  abstract archivedConversations: Array<ConversationModel>;
   abstract uidConvSelected: string;
   //abstract imageRepo: ImageRepoService;
 

package/src/chat21-core/providers/abstract/conversation-handler.service.ts

@@ -12,15 +12,15 @@ import { UserModel } from '../../models/user';
 export abstract class ConversationHandlerService {
 
   // BehaviorSubject
-  abstract messageAdded: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);
-  abstract messageChanged: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);
-  abstract messageRemoved: BehaviorSubject<string> = new BehaviorSubject<string>(null);
-  abstract messageWait: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-  abstract messageInfo: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);
+  abstract messageAdded: BehaviorSubject<MessageModel>;
+  abstract messageChanged: BehaviorSubject<MessageModel>;
+  abstract messageRemoved: BehaviorSubject<string>;
+  abstract messageWait: BehaviorSubject<any>;
+  abstract messageInfo: BehaviorSubject<MessageModel>;
   
   // params
   abstract attributes: any;
-  abstract messages: Array<MessageModel> = [];
+  abstract messages: Array<MessageModel>;
   abstract conversationWith: string;
 
   constructor() {}

package/src/chat21-core/providers/abstract/conversations-handler.service.ts

@@ -14,20 +14,19 @@ import { ConversationModel } from './../../models/conversation';
 export abstract class ConversationsHandlerService {
 
   // BehaviorSubject
-  abstract BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract conversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract conversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract conversationChangedDetailed: BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}> = new BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}>(null);
-  abstract conversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+  abstract BSConversationDetail: BehaviorSubject<ConversationModel>;
+  abstract conversationAdded: BehaviorSubject<ConversationModel>;
+  abstract conversationChanged: BehaviorSubject<ConversationModel>;
+  abstract conversationChangedDetailed: BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}>;
+  abstract conversationRemoved: BehaviorSubject<ConversationModel>;
   // abstract readAllMessages: BehaviorSubject<string> = new BehaviorSubject<string>(null);
  
   // params
-  abstract conversations: Array<ConversationModel> = [];
+  abstract conversations: Array<ConversationModel>;
   abstract uidConvSelected: string;
 
   // functions
   abstract initialize(tenant: string, userId: string, translationMap: Map<string, string>): void;
-  // abstract connect(): void;
   abstract subscribeToConversations(lastConversatioTimestamp: number, callback: any): void;
   abstract countIsNew(): number;
   abstract setConversationRead(conversationId: string): void;

package/src/chat21-core/providers/abstract/groups-handler.service.ts

@@ -11,11 +11,11 @@ import { UserModel } from 'src/chat21-core/models/user';
 export abstract class GroupsHandlerService {
 
   // BehaviorSubject
-  abstract BSgroupDetail: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
-  abstract SgroupDetail: Subject<GroupModel> = new Subject<GroupModel>();
-  abstract groupAdded: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
-  abstract groupChanged: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
-  abstract groupRemoved: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+  abstract BSgroupDetail: BehaviorSubject<GroupModel>;
+  abstract SgroupDetail: Subject<GroupModel>;
+  abstract groupAdded: BehaviorSubject<GroupModel>;
+  abstract groupChanged: BehaviorSubject<GroupModel>;
+  abstract groupRemoved: BehaviorSubject<GroupModel>;
 
   abstract initialize(tenant: string, loggedUserId: string): void;
   abstract connect(): void;

package/src/chat21-core/providers/abstract/messagingAuth.service.ts

@@ -12,8 +12,8 @@ import { UserModel } from '../../models/user';
 export abstract class MessagingAuthService {
 
   // BehaviorSubject
-  abstract BSAuthStateChanged: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-  abstract BSSignOut: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  abstract BSAuthStateChanged: BehaviorSubject<any>;
+  abstract BSSignOut: BehaviorSubject<any>;
 
   // params
   public DEFAULT_PERSISTENCE: string = 'NONE';

package/src/chat21-core/providers/abstract/presence.service.ts

@@ -9,8 +9,8 @@ import { environment } from 'src/environments/environment';
 export abstract class PresenceService {
 
   // BehaviorSubject
-  abstract BSIsOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-  abstract BSLastOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  abstract BSIsOnline: BehaviorSubject<any>;
+  abstract BSLastOnline: BehaviorSubject<any>;
 
   // params
   // abstract tenant = environment.tenant;
@@ -30,5 +30,6 @@ export abstract class PresenceService {
   abstract userIsOnline(userid: string): Observable<any>
   abstract lastOnlineForUser(userid: string): void;
   abstract setPresence(userid: string): void;
+  abstract imHere():void;
   abstract removePresence(): void;
 }

package/src/chat21-core/providers/abstract/typing.service.ts

@@ -9,8 +9,8 @@ import { environment } from 'src/environments/environment';
 export abstract class TypingService {
 
   // BehaviorSubject
-  BSIsTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-  BSSetTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  abstract BSIsTyping: BehaviorSubject<any>;
+  abstract BSSetTyping: BehaviorSubject<any>;
 
   // params
   // private _tenant: string;

package/src/chat21-core/providers/abstract/upload.service.ts

@@ -28,7 +28,7 @@ export abstract class UploadService {
   }
 
   //BehaviorSubject
-  abstract BSStateUpload: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  abstract BSStateUpload: BehaviorSubject<any>;
 
   // params
   // abstract tenant = environment.tenant;

package/src/chat21-core/providers/firebase/firebase-presence.service.ts

@@ -146,6 +146,10 @@ export class FirebasePresenceService extends PresenceService {
     });
   }
 
+  public imHere(){
+    //NOT IMPLEMENTED FOR FIREBASE ENGINE
+  }
+
   /**
    * removePresence
    * richiamato prima del logout

package/src/chat21-core/providers/mqtt/mqtt-presence.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Inject, Injectable, Optional } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 
 // firebase
@@ -11,6 +11,7 @@ import 'firebase/database';
 import { PresenceService } from '../abstract/presence.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
+import { Chat21Service } from './chat-service';
 
 
 @Injectable({
@@ -27,7 +28,8 @@ export class MQTTPresenceService extends PresenceService {
   private urlNodePresence: string;
   private logger: LoggerService = LoggerInstance.getInstance();
   constructor(
-    // private events: EventsService
+    public chat21Service: Chat21Service,
+    @Optional() @Inject('webSocketService') public webSocketService?: any,
   ) {
     super();
   }
@@ -40,20 +42,20 @@ export class MQTTPresenceService extends PresenceService {
   }
 
   userIsOnline(userid: string): Observable<any> {
-    // console.log('userIsOnline', userid);
-    // const that = this;
-    // const urlNodeConnections = this.urlNodePresence + userid + '/connections';
-    // console.log('userIsOnline: ', urlNodeConnections);
-    // const connectionsRef = firebase.database().ref().child(urlNodeConnections);
-    // connectionsRef.on('value', (child) => {
-    //   console.log('is-online-' + userid);
-    //   if (child.val()) {
-    //     that.events.publish('is-online-' + userid, userid, true);
-    //   } else {
-    //     that.events.publish('is-online-' + userid, userid, false);
-    //   }
-    // });
-    return this.BSIsOnline
+    const that = this;
+    let local_BSIsOnline = new BehaviorSubject<any>(null);
+    this.webSocketService.wsRequesterStatus$.subscribe((data: any) => {
+    this.logger.log('[NATIVEPresenceSERVICE] $subs to wsService - data ', data, userid);
+    if (data && data.presence && data.presence.status === 'online' ) {
+        that.BSIsOnline.next({ uid: data.uuid_user, isOnline: true });
+        local_BSIsOnline.next({ uid: data.uuid_user, isOnline: true });
+    } else {
+        that.BSIsOnline.next({ uid: data.uuid_user, isOnline: false });
+        local_BSIsOnline.next({ uid: data.uuid_user, isOnline: false });
+    }
+    });
+
+    return local_BSIsOnline
   }
 
   lastOnlineForUser(userid: string) {
@@ -93,6 +95,13 @@ export class MQTTPresenceService extends PresenceService {
     // });
   }
 
+  public imHere(): void {
+    this.logger.debug('[MQTT-PRESENCE] imHere', this.tenant);
+    setTimeout(() => {
+      this.chat21Service.chatClient.ImHere()
+    }, 2000);
+  }
+
   /**
    * removePresence
    * richiamato prima del logout

package/src/chat21-core/utils/utils-message.ts

@@ -1,3 +1,6 @@
+import { MessageModel } from '../models/message';
+import { ConversationModel } from '../models/conversation';
+import { v4 as uuidv4 } from 'uuid';
 import {
   MESSAGE_TYPE_INFO,
   MESSAGE_TYPE_MINE,
@@ -7,22 +10,6 @@ import {
   TYPE_SUPPORT_GROUP
 } from '../../chat21-core/utils/constants';
 
-/**  */
-export function isFirstMessage(i: number) {
-  if (i > 0) {
-    try {
-      const message = this.messages[i];
-      const prevMessage = this.messages[i - 1];
-      if (prevMessage.sender !== message.sender || message.headerDate || (prevMessage && this.isInfo(prevMessage))) {
-        return true;
-      }
-      return false;
-    } catch (err) {
-      console.error('error: ', err);
-    }
-  }
-}
-
 /** */
 export function isImage(message: any) {
   if (message && message.type && message.metadata && message.metadata.src && message.type === 'image') {
@@ -74,6 +61,27 @@ export function isSender(sender: string, currentUserId: string) {
   }
 }
 
+export function isSameSender(messages, senderId, index):boolean{
+  if(senderId && messages[index - 1] && (senderId === messages[index - 1].sender)){
+    return true;
+  }
+  return false;
+}
+
+export function isLastMessage(messages, idMessage):boolean {
+  if (idMessage === messages[messages.length - 1].uid) {
+    return true;
+  }
+  return false;
+}
+
+export function isFirstMessage(messages, senderId, index):boolean{
+  if(senderId && index == 0 && messages[index] && (messages[index] !== senderId)){
+    return true;
+  }
+  return false;
+}
+
 /** */
 export function messageType(msgType: string, message: any) {
   
@@ -153,6 +161,13 @@ export function isEmojii(message: any){
   }
 }
 
+export function isJustRecived(startedAt, time) {
+  if (time > startedAt) {
+    return true;
+  }
+  return false;
+}
+
 export function checkIfIsMemberJoinedGroup(msg, loggedUser): boolean{
   if(msg && msg.attributes && msg.attributes.messagelabel
       && msg.attributes.messagelabel['key']=== "MEMBER_JOINED_GROUP" 
@@ -186,4 +201,42 @@ export function getProjectIdSelectedConversation(conversationWith: string): stri
   return projectId
 }
 
+export function conversationToMessage(conversation: ConversationModel, currentUserId: string): MessageModel{
+  let message: any = {}
+  message.uid = conversation['message_id']? conversation['message_id'] : uuidv4()
+  message.text = conversation.text? conversation.text.trim(): conversation.last_message_text.trim()
+  message.sender = conversation.sender
+  message.sender_fullname = conversation.sender_fullname
+  message.recipient = conversation.recipient
+  message.recipient_fullname = conversation.recipient_fullname
+  message.status = +conversation.status
+  message.timestamp = conversation.timestamp
+  message.metadata = conversation['metadata']
+  message.channel_type = conversation.channel_type
+  message.type = conversation.type
+  message.isSender = isSender(message.sender, currentUserId)
+  message.attributes = conversation.attributes
+
+  return message as MessageModel
+}
+
+export function commandToMessage(msg: MessageModel, conversation: ConversationModel, currentUserId: string): MessageModel{
+  let message: any = {}
+  message.uid = conversation['message_id']? conversation['message_id'] : uuidv4()
+  message.text = msg.text? msg.text.trim(): '';
+  message.sender = conversation.sender
+  message.sender_fullname = conversation.sender_fullname
+  message.recipient = conversation.recipient
+  message.recipient_fullname = conversation.recipient_fullname
+  message.status = +conversation.status
+  message.timestamp = conversation.timestamp
+  message.metadata = msg['metadata']
+  message.channel_type = conversation.channel_type
+  message.type = msg.type
+  message.isSender = isSender(message.sender, currentUserId)
+  message.attributes = conversation.attributes
+
+  return message as MessageModel
+}
+