@chat21/chat21-web-widget 5.1.0-rc6 → 5.1.0-rc7

package/CHANGELOG.md

@@ -6,6 +6,9 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 5.1.0-rc.7
+- **added**: ability to allows emoji after message is sent
+
 # 5.1.0-rc.6
 - **removed**: hideRestartConversationOptionsMenu
 

package/Dockerfile

@@ -15,7 +15,7 @@ COPY . .
 
 ## Build the angular app in production mode and store the artifacts in dist folder
 
-RUN npm run ng build -- --configuration="prod" --output-path=dist --base-href="./" --output-hashing=none
+RUN npx ng build --configuration="prod" --output-path=dist --base-href=./ --output-hashing=none
 
 
 ### STAGE 2: Setup ###

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.1.0-rc6",
+  "version": "5.1.0-rc7",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

package/src/app/component/conversation-detail/conversation/conversation.component.html

@@ -112,7 +112,7 @@
             [attributes]="g?.attributes"
             [senderId]="senderId"
             [tenant]="g?.tenant"
-            [projectid]="g?.projectid"
+            [project]="g?.project"
             [channelType]="g?.channelType"
             [userFullname]="g?.userFullname"
             [userEmail]="g?.userEmail"

package/src/app/component/conversation-detail/conversation-footer/conversation-footer.component.ts

@@ -11,7 +11,8 @@ import { ChatManager } from 'src/chat21-core/providers/chat-manager';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { TYPE_MSG_FILE, TYPE_MSG_IMAGE, TYPE_MSG_TEXT } from 'src/chat21-core/utils/constants';
 import { convertColorToRGBA } from 'src/chat21-core/utils/utils';
-import { isImage } from 'src/chat21-core/utils/utils-message';
+import { findAndRemoveEmoji, isImage } from 'src/chat21-core/utils/utils-message';
+import { ProjectModel } from 'src/models/project';
 
 @Component({
   selector: 'chat-conversation-footer',
@@ -24,7 +25,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
   @Input() attributes: string;
   @Input() senderId: string;
   @Input() tenant: string;
-  @Input() projectid: string;
+  @Input() project: ProjectModel;
   @Input() channelType: string;
   @Input() userFullname: string;
   @Input() userEmail: string;
@@ -83,8 +84,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
 
   convertColorToRGBA = convertColorToRGBA;
   private logger: LoggerService = LoggerInstance.getInstance()
-  constructor(public g: Globals,
-              private chatManager: ChatManager,
+  constructor(private chatManager: ChatManager,
               private typingService: TypingService,
               private uploadService: UploadService) { }
 
@@ -253,7 +253,6 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
       //     return snapshot.ref.getDownloadURL();   // Will return a promise with the download link
       // }).then(downloadURL => {
       //     that.logger.log('[CONV-FOOTER] AppComponent::uploadSingle:: downloadURL', downloadURL]);
-      //     that.g.wdLog([`Successfully uploaded file and got download link - ${downloadURL}`]);
 
       //     metadata.src = downloadURL;
       //     let type_message = TYPE_MSG_TEXT;
@@ -321,6 +320,8 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
     (metadata) ? metadata = metadata : metadata = '';
     this.onEmojiiPickerShow.emit(false)
     this.logger.log('[CONV-FOOTER] SEND MESSAGE: ', msg, type, metadata, additional_attributes);
+
+    msg = this.checkForEmojii(msg)
     if (msg && msg.trim() !== '' || type === TYPE_MSG_IMAGE || type === TYPE_MSG_FILE ) {
 
       // msg = htmlEntities(msg);
@@ -345,7 +346,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
         // fine-sponziello
       // this.conversationHandlerService = this.chatManager.getConversationHandlerByConversationId(this.conversationWith)
       const senderId = this.senderId;
-      const projectid = this.projectid;
+      const projectid = this.project.id;
       const channelType = this.channelType;
       const userFullname = this.userFullname;
       const userEmail = this.userEmail;
@@ -514,6 +515,15 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
     //}, false);
   }
 
+
+  checkForEmojii(text){
+    //remove emojii only if "emojii" exist and is set to false
+    if(this.project && this.project.settings?.allow_send_emoji === false){
+      return findAndRemoveEmoji(text)
+    }
+    return text
+  }
+
   
 
   onTextAreaChange(){
@@ -632,7 +642,6 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
    * @param str
    */
   setWritingMessages(str) {
-    //this.messagingService.setWritingMessages(str, this.g.channelType);
     this.typingService.setTyping(this.conversationWith, str, this.senderId, this.userFullname )
   }
 

package/src/app/component/message/audio/audio.component.ts

@@ -1,5 +1,7 @@
 import { Component, ElementRef, AfterViewInit, Input, ViewChild } from '@angular/core';
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { convertColorToRGBA } from 'src/chat21-core/utils/utils';
 
 @Component({
@@ -26,13 +28,13 @@ export class AudioComponent implements AfterViewInit {
   currentTime: number = 0;
   isPlaying: boolean = false;
 
+  private logger: LoggerService = LoggerInstance.getInstance();
   constructor(
     private sanitizer: DomSanitizer,
     private elementRef: ElementRef
   ) {}
 
   ngAfterViewInit() {
-    console.log('stylesssss', this.stylesMap)
     if (this.audioBlob) {
       this.rawAudioUrl = URL.createObjectURL(this.audioBlob);
       this.audioUrl = this.sanitizer.bypassSecurityTrustUrl(this.rawAudioUrl);
@@ -136,21 +138,33 @@ export class AudioComponent implements AfterViewInit {
     return `${minutes}:${sec < 10 ? '0' + sec : sec}`;
   }
 
-  getAudioDuration() {
-    const audio = new Audio();
-    audio.src = this.rawAudioUrl!;
-    audio.addEventListener('loadedmetadata', () => {
-      if (audio.duration === Infinity) {
-        audio.currentTime = Number.MAX_SAFE_INTEGER;
-        audio.ontimeupdate = () => {
-          audio.ontimeupdate = null; 
-          audio.currentTime = 0;
-          this.audioDuration = audio.duration;
-        };
-      } else {
-        this.audioDuration = audio.duration;
-      }
-    });
+  async getAudioDuration() {
+    // const audio = new Audio();
+    // audio.src = this.rawAudioUrl!;
+    // audio.addEventListener('loadedmetadata', () => {
+    //   if (audio.duration === Infinity) {
+    //     audio.currentTime = Number.MAX_SAFE_INTEGER;
+    //     audio.ontimeupdate = () => {
+    //       audio.ontimeupdate = null; 
+    //       audio.currentTime = 0;
+    //       this.audioDuration = audio.duration;
+    //     };
+    //   } else {
+    //     this.audioDuration = audio.duration;
+    //   }
+    // });
+
+    const response = await fetch(this.rawAudioUrl!);
+    this.logger.debug('getAudioDuration: response ---> ', response)
+    const arrayBuffer = await response.arrayBuffer();
+    this.logger.debug('getAudioDuration: arrayBuffer ---> ', arrayBuffer)
+    const audioContext = new (window.AudioContext || (window as any).webkitAudioContext)();
+    this.logger.debug('getAudioDuration: audioContext ---> ', audioContext)
+    const audioBuffer = await audioContext.decodeAudioData(arrayBuffer);
+    this.logger.debug('getAudioDuration: audioBuffer ---> ', audioBuffer)
+    this.audioDuration = audioBuffer.duration;
+    this.logger.debug('getAudioDuration: audioDuration ---> ', this.audioDuration)
+
   }
 
   extractFirstColor(gradient: string): string | null {

package/src/assets/twp/chatbot-panel.html

@@ -613,7 +613,7 @@
                     var brandJson = JSON.parse(xhr.response)
                     if(brandJson){
                         /** TITLE AND FAVICON **/
-                        brandJson['WIDGET'].META_TITLE? document.body.title = brandJson['WIDGET'].META_TITLE : null;
+                        brandJson['WIDGET'].META_TITLE? document.title = brandJson['WIDGET'].META_TITLE : null;
                         brandJson['WIDGET'].FAVICON_URL?  document.querySelector("link[rel~='icon']").setAttribute('href', brandJson['WIDGET'].FAVICON_URL) : null;
                         /** FOOTER-LOGO **/
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('footer-logo').src = brandJson['COMMON'].COMPANY_LOGO : null;
@@ -624,6 +624,13 @@
                         brandJson['COMMON'].BRAND_PRIMARY_COLOR? document.body.style.setProperty('--base-company-logo', brandJson['COMMON'].BRAND_PRIMARY_COLOR): null;
                         /** IFRAME TITLE**/
                         brandJson['COMMON'].COMPANY_NAME? document.getElementById('tiledeskiframe').title = brandJson['COMMON'].COMPANY_NAME + ' Widget' : null;
+                        /** META sharing ELEMENTS */
+                        if(brandJson['WIDGET'].META_SHARE_INFO && Object.keys(brandJson['WIDGET'].META_SHARE_INFO).length > 0){
+                            Object.keys(brandJson['WIDGET'].META_SHARE_INFO).forEach(key => {
+                                var meta = document.querySelector("meta[property^='og:"+key.toLowerCase()+"']");
+                                meta.setAttribute('content', brandJson['WIDGET'].META_SHARE_INFO[key])
+                            })
+                        }
                     }
                 }
                     

package/src/assets/twp/index-dev.html

@@ -719,7 +719,7 @@
                     var brandJson = JSON.parse(xhr.response)
                     if(brandJson){
                         /** TITLE AND FAVICON **/
-                        brandJson['WIDGET'].META_TITLE? document.body.title = brandJson['WIDGET'].META_TITLE : null;
+                        brandJson['WIDGET'].META_TITLE? document.title = brandJson['WIDGET'].META_TITLE : null;
                         brandJson['WIDGET'].FAVICON_URL?  document.querySelector("link[rel~='icon']").setAttribute('href', brandJson['WIDGET'].FAVICON_URL) : null;
                         /** FOOTER-LOGO **/    
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('footer-logo').src = brandJson['COMMON'].COMPANY_LOGO : null;
@@ -737,6 +737,13 @@
                         }
                         /** IFRAME TITLE**/
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('tiledeskiframe').title = brandJson['COMMON'].COMPANY_NAME + ' Widget' : null;
+                        /** META sharing ELEMENTS */
+                        if(brandJson['WIDGET'].META_SHARE_INFO && Object.keys(brandJson['WIDGET'].META_SHARE_INFO).length > 0){
+                            Object.keys(brandJson['WIDGET'].META_SHARE_INFO).forEach(key => {
+                                var meta = document.querySelector("meta[property^='og:"+key.toLowerCase()+"']");
+                                meta.setAttribute('content', brandJson['WIDGET'].META_SHARE_INFO[key])
+                            })
+                        }
                     }
                 }
             }

package/src/assets/twp/index.html

@@ -6,7 +6,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> 
 
-    <title>Widget test page </title>
+    <title>Widget test page</title>
     <style>
 
         @-moz-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Firefox */
@@ -295,7 +295,10 @@
         window.Tiledesk('onBeforeInit', function(event_data) {
             console.log("onBeforeInit Tiledesk FN", event_data);
 
-            var brandSrc = event_data.detail.appConfigs.brandSrc? getBrandResources(event_data.detail.appConfigs.brandSrc) : null;
+            if(event_data.detail.appConfigs.brandSrc){
+                getBrandResources(event_data.detail.appConfigs.brandSrc)
+            }
+            // var brandSrc = event_data.detail.appConfigs.brandSrc?  : null;
 
             setTimeout(() => {
                 if(event_data && event_data.detail && event_data.detail.appConfigs){
@@ -408,7 +411,7 @@
                     var brandJson = JSON.parse(xhr.response)
                     if(brandJson){
                         /** TITLE AND FAVICON **/
-                        brandJson['WIDGET'].META_TITLE? document.body.title = brandJson['WIDGET'].META_TITLE : null;
+                        brandJson['WIDGET'].META_TITLE? document.title = brandJson['WIDGET'].META_TITLE : null;
                         brandJson['WIDGET'].FAVICON_URL?  document.querySelector("link[rel~='icon']").setAttribute('href', brandJson['WIDGET'].FAVICON_URL) : null;
                         /** FOOTER-LOGO **/    
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('footer-logo').src = brandJson['COMMON'].COMPANY_LOGO : null;
@@ -421,6 +424,13 @@
                         brandJson['COMMON'].DOCS? null: document.getElementById('share').style.display = 'none'
                         /** IFRAME TITLE**/
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('tiledeskiframe').title = brandJson['COMMON'].COMPANY_NAME + ' Widget' : null;
+                        /** META sharing ELEMENTS */
+                        if(brandJson['WIDGET'].META_SHARE_INFO && Object.keys(brandJson['WIDGET'].META_SHARE_INFO).length > 0){
+                            Object.keys(brandJson['WIDGET'].META_SHARE_INFO).forEach(key => {
+                                var meta = document.querySelector("meta[property^='og:"+key.toLowerCase()+"']");
+                                meta.setAttribute('content', brandJson['WIDGET'].META_SHARE_INFO[key])
+                            })
+                        }
                     }
                     
                 }

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

@@ -194,9 +194,13 @@ export function isEmojii(message: any){
   // https://localcoder.org/javascript-detect-if-a-string-contains-only-unicode-emojis
   try {
     if(!message) return false;
+    // Removes all characters that are NOT emojis (unicode > \u1eeff)
     const onlyEmojis = message.replace(new RegExp('[\u0000-\u1eeff]', 'g'), '')
+    // Removes spaces, line breaks, and carriage returns from the string
     const visibleChars = message.replace(new RegExp('[\n\r\s]+|( )+', 'g'), '')
+    // Removes Chinese characters from the string
     const chineseChars = message.replace(new RegExp('[\u4e00-\u9fa5]', 'g'), '')
+    
     if(onlyEmojis === '' || visibleChars == '' || chineseChars=='') return false
     return (onlyEmojis.length === visibleChars.length && onlyEmojis.length <= 2)
   } catch(e) {
@@ -204,6 +208,22 @@ export function isEmojii(message: any){
   }
 }
 
+export function findAndRemoveEmoji(text): string{
+
+  if (!text) return text;
+
+  // Regex to find most unicode emojis
+  // Source: https://thekevinscott.com/emojis-in-javascript/
+  const emojiRegex = /([\u2700-\u27BF]|[\uE000-\uF8FF]|[\uD83C-\uDBFF][\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83D[\uDE00-\uDE4F])/g;
+
+  // Removes all found emojis
+  text = text.replace(emojiRegex, '');
+
+  // Removes any multiple spaces left by the removal of emojis
+  text = text.replace(/\s{2,}/g, ' ').trim();
+  return text
+}
+
 export function isJustRecived(startedAt, time) {
   if (time > startedAt) {
     return true;

package/src/models/project.ts

@@ -24,7 +24,8 @@ export class ProjectModel {
         public color?: string,
         public welcomeTitle?: string,
         public welcomeMsg?: string,
-        public attributes?: IRules
+        public attributes?: IRules,
+        public settings?:{ [key: string]: any },
     ) { }
 
     initialize (
@@ -43,6 +44,7 @@ export class ProjectModel {
         trialDaysLeft?: number,
         trialExpired?: boolean,
         updatedAt?: string,
+        settings?: { [key: string]: any },
         versions?: string,
     ) {
         this.id = id;
@@ -60,6 +62,7 @@ export class ProjectModel {
         this.trialDaysLeft = trialDaysLeft;
         this.trialExpired = trialExpired;
         this.updatedAt = updatedAt;
+        this.settings = settings;
         this.versions = versions;
     }