@chat21/chat21-web-widget 5.1.0-rc9 → 5.1.0

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

@@ -835,6 +835,63 @@
             return true;
         }
 
+
+        /** WIDGET POSITION SECTION : start*/
+        function onClickSize(){
+            let status = document.querySelector('input[name="size"]:checked').value
+            window.tiledeskSettings['size'] = status
+            console.log('onClickSize: status-->',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
+        
+        function onClickFullScreenMode(){
+            let status = document.querySelector('input[name="fullscreenMode"]:checked').value
+            window.tiledeskSettings['fullscreenMode'] = stringToBoolean(status)
+            console.log('onClickFullScreenMode: status-->',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
+
+        function onClickAlign(){
+            let status = document.querySelector('input[name="align"]:checked').value
+            window.tiledeskSettings['align'] = status
+            console.log('onClickAlign: status-->',window.tiledeskSettings)
+            window.Tiledesk('restart')
+        }
+
+        function onClickMarginX(){
+            let text = document.getElementById('marginX').value
+            text === ""? text= '100px': text
+            window.tiledeskSettings['marginX'] = text
+            console.log('onClickMarginX:',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
+
+        function onClickMarginY(){
+            let text = document.getElementById('marginY').value
+            text === ""? text= '50px' : text //set default value if user not write a value
+            window.tiledeskSettings['marginY'] = text
+            console.log('onClickMarginY:',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
+
+        function onClickMobileMarginX(){
+            let text = document.getElementById('mobileMarginX').value
+            text === ""? text= '100px': text
+            window.tiledeskSettings['mobileMarginX'] = text
+            console.log('onClickMobileMarginX:',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
+
+        function onClickMobileMarginY(){
+            let text = document.getElementById('mobileMarginY').value
+            text === ""? text= '50px' : text //set default value if user not write a value
+            window.tiledeskSettings['mobileMarginY'] = text
+            console.log('onClickMobileMarginY:',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
+        /** WIDGET POSITION SECTION : end*/
+
+        /** WIDGET SETTINGS SECTION : start*/
         function onClickDisconnectTime(){
             let status = document.querySelector('input[name="disconnetTime"]:checked');
             let value;
@@ -869,13 +926,6 @@
             window.Tiledesk('restart')
         }
 
-        function onClickAlign(){
-            let status = document.querySelector('input[name="align"]:checked').value
-            window.tiledeskSettings['align'] = status
-            console.log('onClickAlign: status-->',window.tiledeskSettings)
-            window.Tiledesk('restart')
-        }
-
         function onClickCalloutTimer(){
             let status = document.querySelector('input[name="calloutTimer"]:checked');
             let value;
@@ -962,13 +1012,6 @@
             window.Tiledesk('restart')
         }
 
-        function onClickFullScreenMode(){
-            let status = document.querySelector('input[name="fullscreenMode"]:checked').value
-            window.tiledeskSettings['fullscreenMode'] = stringToBoolean(status)
-            console.log('onClickFullScreenMode: status-->',window.tiledeskSettings);
-            window.Tiledesk('restart')
-        }
-
         function onClickThemeColor(){
             let color = document.getElementById('themeColor').value
             document.getElementById('themeColorText').value = color
@@ -1043,38 +1086,6 @@
             window.Tiledesk('restart')
         }
 
-        function onClickMarginX(){
-            let text = document.getElementById('marginX').value
-            text === ""? text= '100px': text
-            window.tiledeskSettings['marginX'] = text
-            console.log('onClickMarginX:',window.tiledeskSettings);
-            window.Tiledesk('restart')
-        }
-
-        function onClickMarginY(){
-            let text = document.getElementById('marginY').value
-            text === ""? text= '50px' : text //set default value if user not write a value
-            window.tiledeskSettings['marginY'] = text
-            console.log('onClickMarginY:',window.tiledeskSettings);
-            window.Tiledesk('restart')
-        }
-
-        function onClickMobileMarginX(){
-            let text = document.getElementById('mobileMarginX').value
-            text === ""? text= '100px': text
-            window.tiledeskSettings['mobileMarginX'] = text
-            console.log('onClickMobileMarginX:',window.tiledeskSettings);
-            window.Tiledesk('restart')
-        }
-
-        function onClickMobileMarginY(){
-            let text = document.getElementById('mobileMarginY').value
-            text === ""? text= '50px' : text //set default value if user not write a value
-            window.tiledeskSettings['mobileMarginY'] = text
-            console.log('onClickMobileMarginY:',window.tiledeskSettings);
-            window.Tiledesk('restart')
-        }
-
         function onClickAutoStart(){
             let status = document.querySelector('input[name="autoStart"]:checked').value
             window.tiledeskSettings['autoStart'] = stringToBoolean(status)
@@ -1227,7 +1238,9 @@
             console.log('onClickNativeRating:', window.tiledeskSettings)
             window.Tiledesk('restart')
         }
+        /** WIDGET SETTINGS SECTION : end*/
 
+        /** WIDGET SOCIAL CHANNELS SECTION : start*/
         function onClickWhatsappNumber(){
             let status = document.getElementById('whatsappNumber').value
             window.tiledeskSettings['whatsappNumber'] = status
@@ -1248,6 +1261,15 @@
             console.log('onClickTelegramUsername:', window.tiledeskSettings)
             window.Tiledesk('restart')
         }
+        /** WIDGET SOCIAL CHANNELS SECTION : end*/
+
+        /** WIDGET CONVERSATION DETAIL SECTION : start*/
+        function onClickHideHeaderConversation(){
+            let status = document.querySelector('input[name="hideHeaderConversation"]:checked').value
+            window.tiledeskSettings['hideHeaderConversation'] = stringToBoolean(status)
+            console.log('onClickHideHeaderConversation: status-->',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
         
         function onClickHideHeaderCloseButton(){
             let status = document.querySelector('input[name="hideHeaderCloseButton"]:checked').value
@@ -1360,10 +1382,9 @@
             console.log('onClickshowAudioRecorderFooterButton:', window.tiledeskSettings)
             window.Tiledesk('restart')
         }
+        /** WIDGET CONVERSATION DETAIL SECTION : end*/
 
-
-
-
+        /** WIDGET BUBBLE MESSAGE SECTION : start*/
         function onClickFontSize(){
             let text = document.getElementById('fontSize').value
             text === ""? text= '1.4em': text
@@ -1372,7 +1393,21 @@
             window.Tiledesk('restart')
         }
 
+        function onClickFontFamily(){
+            let text = document.getElementById('fontFamily').value
+            window.tiledeskSettings['fontFamily'] = text
+
+            let source = document.getElementById('fontFamilySource').value
+            // text === ""? text= '1.4em': text
+            window.tiledeskSettings['fontFamilySource'] = source
+
+            console.log('onClickFontFamily:',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
 
+        /** WIDGET BUBBLE MESSAGE SECTION : end*/
+       
+        /**WIDGET BUTTON STYLE SECTION : start */
         function onClickButtonFontSize(){
             let text = document.getElementById('buttonFontSize').value
             text === ""? text= '15px': text
@@ -1380,19 +1415,7 @@
             console.log('onClickButtonFontSize:',window.tiledeskSettings);
             window.Tiledesk('restart')
         }
-
-       
-
-        
-
-       
-
-        
-
-        
-
-        
-
+        /**WIDGET BUTTON STYLE SECTION : end */
 
         function onClickTestAll(){
             inputs = document.getElementsByTagName('input');
@@ -1784,6 +1807,78 @@
                             <button class="btn btn-light" onclick="onClickOpenConversationById()">Open conversation <i class="fa-regular fa-comment" aria-hidden="true"></i></button>
                         </div>
                     </div>
+                    <!-- WIDGET POSITION SECTION : start-->
+                    <div class="row section">
+                        <div><h3 style="line-height: 0.3;">Widget <em><strong>POSITION</strong></em></h3></div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>size</strong></em></span></div>
+                            <div class="col-md-5">
+                                <input class="form-check-input" type="radio" name="size" value="min" checked><label class="form-check-label" for="size">min</label>
+                                <input class="form-check-input" type="radio" name="size" value="max"><label class="form-check-label" for="size">max</label>
+                                <input class="form-check-input" type="radio" name="size" value="top"><label class="form-check-label" for="size">top</label>
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickSize()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>fullscreenMode</strong></em></span></div>
+                            <div class="col-md-5">
+                                <input class="form-check-input" type="radio" name="fullscreenMode" value="true"><label>True</label>
+                                <input class="form-check-input" type="radio" name="fullscreenMode" value="false" checked ><label>False</label>
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickFullScreenMode()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>align</strong></em></span></div>
+                            <div class="col-md-5">
+                                <input class="form-check-input" type="radio" name="align" value="left"><label class="form-check-label" for="preChatForm">Left</label>
+                                <input class="form-check-input" type="radio" name="align" value="right" checked><label class="form-check-label" for="preChatForm">Right</label>
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickAlign()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>marginX</strong></em></span></div>
+                            <div class="col-md-5 formElement">
+                                <input class="form-control col-sm-2" type="text" id="marginX" name="marginX" placeholder="Ex. 100px, 1em">
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickMarginX()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>marginY</strong></em></span></div>
+                            <div class="col-md-5 formElement">
+                                <input class="form-control col-sm-2" type="text" id="marginY" name="marginY" placeholder="Ex. 100px, 1em">
+                            </div>
+                            <div class="col-md-2 ">
+                                <button class="btn btn-light" onclick="onClickMarginY()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>mobileMarginX</strong></em></span></div>
+                            <div class="col-md-5 formElement">
+                                <input class="form-control col-sm-2" type="text" id="mobileMarginX" name="mobileMarginX" placeholder="Ex. 100px, 1em">
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickMobileMarginX()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>mobileMarginY</strong></em></span></div>
+                            <div class="col-md-5 formElement">
+                                <input class="form-control col-sm-2" type="text" id="mobileMarginY" name="mobileMarginY" placeholder="Ex. 100px, 1em">
+                            </div>
+                            <div class="col-md-2 ">
+                                <button class="btn btn-light" onclick="onClickMobileMarginY()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- WIDGET POSITION SECTION : end-->
                     <div class="row section c21-parameters">
                         <div><h3 style="line-height: 0.3;">MANAGE <em><strong>widget settings</strong></em></h3></div>
                         <div class="docs">Select an option for Tiledesk settings parameter</div>
@@ -1830,16 +1925,6 @@
                                 <button class="btn btn-light" onclick="onClickPreChatForm()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
                             </div>
                         </div>
-                        <div class="row">
-                            <div class="col-md-5 formElement"><span><em><strong>align</strong></em></span></div>
-                            <div class="col-md-5">
-                                <input class="form-check-input" type="radio" name="align" value="left"><label class="form-check-label" for="preChatForm">Left</label>
-                                <input class="form-check-input" type="radio" name="align" value="right" checked><label class="form-check-label" for="preChatForm">Right</label>
-                            </div>
-                            <div class="col-md-2">
-                                <button class="btn btn-light" onclick="onClickAlign()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
-                            </div>
-                        </div>
                         <div class="row">
                             <div class="col-md-5 formElement"><span><em><strong>calloutTimer</strong></em></span></div>
                             <div class="col-md-5">
@@ -1937,8 +2022,6 @@
                                 <button class="btn btn-light" onclick="onClickRestartConversation()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
                             </div>
                         </div>
-                        
-                       
                         <div class="row">
                             <div class="col-md-5 formElement"><span><em><strong>hideSettings</strong></em></span></div>
                             <div class="col-md-5">
@@ -1949,17 +2032,6 @@
                                 <button class="btn btn-light" onclick="onClickHideSettings()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
                             </div>
                         </div>
-                        
-                        <div class="row">
-                            <div class="col-md-5 formElement"><span><em><strong>fullscreenMode</strong></em></span></div>
-                            <div class="col-md-5">
-                                <input class="form-check-input" type="radio" name="fullscreenMode" value="true"><label>True</label>
-                                <input class="form-check-input" type="radio" name="fullscreenMode" value="false" checked ><label>False</label>
-                            </div>
-                            <div class="col-md-2">
-                                <button class="btn btn-light" onclick="onClickFullScreenMode()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
-                            </div>
-                        </div>
                         <div class="row">
                             <div class="col-md-5 formElement"><span><em><strong>themeColor</strong></em></span></div>
                             <div class="col-md-5 formElement">
@@ -1998,42 +2070,6 @@
                                 <button class="btn btn-light" onclick="onClickDepartmentId()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
                             </div>
                         </div>
-                        <div class="row">
-                            <div class="col-md-5 formElement"><span><em><strong>marginX</strong></em></span></div>
-                            <div class="col-md-5 formElement">
-                                <input class="form-control col-sm-2" type="text" id="marginX" name="marginX" placeholder="Ex. 100px, 1em">
-                            </div>
-                            <div class="col-md-2">
-                                <button class="btn btn-light" onclick="onClickMarginX()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-5 formElement"><span><em><strong>marginY</strong></em></span></div>
-                            <div class="col-md-5 formElement">
-                                <input class="form-control col-sm-2" type="text" id="marginY" name="marginY" placeholder="Ex. 100px, 1em">
-                            </div>
-                            <div class="col-md-2 ">
-                                <button class="btn btn-light" onclick="onClickMarginY()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-5 formElement"><span><em><strong>mobileMarginX</strong></em></span></div>
-                            <div class="col-md-5 formElement">
-                                <input class="form-control col-sm-2" type="text" id="mobileMarginX" name="mobileMarginX" placeholder="Ex. 100px, 1em">
-                            </div>
-                            <div class="col-md-2">
-                                <button class="btn btn-light" onclick="onClickMobileMarginX()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-5 formElement"><span><em><strong>mobileMarginY</strong></em></span></div>
-                            <div class="col-md-5 formElement">
-                                <input class="form-control col-sm-2" type="text" id="mobileMarginY" name="mobileMarginY" placeholder="Ex. 100px, 1em">
-                            </div>
-                            <div class="col-md-2 ">
-                                <button class="btn btn-light" onclick="onClickMobileMarginY()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
-                            </div>
-                        </div>
                         <div class="row">
                             <div class="col-md-5 formElement"><span><em><strong>autoStart</strong></em></span></div>
                             <div class="col-md-5">
@@ -2247,6 +2283,16 @@
                         
 
                         <div><h3 style="line-height: 0.3;">MANAGE <em><strong>CONVERSATION DETAIL</strong></em></h3></div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>hideHeaderConversation</strong></em></span></div>
+                            <div class="col-md-5">
+                                <input class="form-check-input" type="radio" name="hideHeaderConversation" value="true"><label>True</label>
+                                <input class="form-check-input" type="radio" name="hideHeaderConversation" value="false" checked><label>False</label>
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickHideHeaderConversation()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
                         <div class="row">
                             <div class="col-md-5 formElement"><span><em><strong>hideHeaderCloseButton</strong></em></span></div>
                             <div class="col-md-5">
@@ -2455,6 +2501,16 @@
                                 <button class="btn btn-light" onclick="onClickFontSize()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
                             </div>
                         </div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>fontFamily</strong></em></span></div>
+                            <div class="col-md-5 formElement">
+                                <input class="form-control col-sm-2" type="text" id="fontFamily" name="fontFamily" placeholder="Family">
+                                <input class="form-control col-sm-2" type="text" id="fontFamilySource" name="fontFamilySource" placeholder="Source">
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickFontFamily()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
         
 
                         <div><h3 style="line-height: 0.3;">MANAGE <em><strong>BUTTON STYLES</strong></em></h3></div>

package/src/chat21-core/providers/firebase/firebase-conversation-handler.ts

@@ -15,7 +15,7 @@ import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 
 // utils
-import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE } from '../../utils/constants';
+import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE, MESSAGE_TYPE_PRIVATE } from '../../utils/constants';
 import { compareValues, searchIndexInArrayForUid, conversationMessagesRef } from '../../utils/utils';
 import { v4 as uuidv4 } from 'uuid';
 import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender, infoMessageType } from '../../utils/utils-message';
@@ -230,6 +230,12 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     private addedNew(message:MessageModel){
         const msg = this.messageCommandGenerate(message);
         if(this.isValidMessage(msg)){
+
+            // do not add 'private' msg in widget array messages
+            let isPrivateMessage = messageType(MESSAGE_TYPE_PRIVATE, msg)
+            if(isPrivateMessage){
+                return;
+            }
             // msg.attributes && msg.attributes['subtype'] === 'info'
             let isInfoMessage = messageType(MESSAGE_TYPE_INFO, msg)
             if(isInfoMessage){
@@ -464,6 +470,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         const that = this;
         const commands = msg.attributes.commands;
         let i=0;
+        if(commands.length === 0) return;
         return new Promise((resolve, reject)=>{
             function execute(command){
                 if(command.type === "message"){

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -15,7 +15,7 @@ import { UserModel } from '../../models/user';
 import { ConversationHandlerService } from '../abstract/conversation-handler.service';
 
 // utils
-import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE } from '../../utils/constants';
+import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE, MESSAGE_TYPE_PRIVATE } from '../../utils/constants';
 import { compareValues, searchIndexInArrayForUid } from '../../utils/utils';
 import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender, infoMessageType } from '../../utils/utils-message';
 import { v4 as uuidv4 } from 'uuid';
@@ -262,6 +262,13 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     /** */
     private addedMessage(messageSnapshot: MessageModel): Promise<boolean> {
         const msg = this.messageGenerate(messageSnapshot);
+
+        // do not add 'private' msg in widget array messages
+        let isPrivateMessage = messageType(MESSAGE_TYPE_PRIVATE, msg)
+        if(isPrivateMessage){
+            return;
+        }
+
         let isInfoMessage = messageType(MESSAGE_TYPE_INFO, msg)
         if(isInfoMessage){
             this.messageInfo.next(msg)
@@ -458,6 +465,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const that = this;
         const commands = msg.attributes.commands;
         let i=0;
+        if(commands.length === 0) return;
         return new Promise((resolve, reject)=>{
             function execute(command){
                 if(command.type === "message"){

package/src/chat21-core/providers/tiledesk/tiledesk-requests.service.ts

@@ -68,4 +68,18 @@ export class TiledeskRequestsService {
       return res
     })
   }
+
+  public getMyRequests(): Promise<{ requests: Array<any>}> {
+    this.tiledeskToken = this.appStorage.getItem('tiledeskToken')
+    const url = this.URL_TILEDESK_REQUEST + '/me?preflight=true'
+    this.logger.log('[TILEDESK-SERVICE] - GET REQUEST url ', url);
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    }
+    
+    return this.http.get<{ requests: Array<any>}>(url, httpOptions).toPromise()
+  }
 }

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

@@ -71,6 +71,8 @@ export const TYPE_POPUP_DETAIL_MESSAGE = 'DETAIL_MESSAGE';
 export const MESSAGE_TYPE_INFO = 'INFO';
 export const MESSAGE_TYPE_MINE = 'MINE';
 export const MESSAGE_TYPE_OTHERS = 'OTHERS';
+export const MESSAGE_TYPE_PRIVATE = 'PRIVATE';
+
 
 export enum INFO_MESSAGE_TYPE {
     CHAT_REOPENED = 'CHAT_REOPENED',

package/src/chat21-core/utils/user-typing/user-typing.component.scss

@@ -1,4 +1,3 @@
-// @import 'src/app/sass/variables';
 :root {
     --bubbleReceivedBackgroundColor: var(--blue);
     --foregroundColor: var(--bck-msg-sent);

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

@@ -7,7 +7,8 @@ import {
   MESSAGE_TYPE_OTHERS,
   MAX_WIDTH_IMAGES,
   INFO_MESSAGE_TYPE,
-  CHANNEL_TYPE
+  CHANNEL_TYPE,
+  MESSAGE_TYPE_PRIVATE
 } from '../../chat21-core/utils/constants';
 /** */
 export function isCarousel(message: any) {
@@ -103,10 +104,20 @@ export function isFirstMessage(messages, senderId, index):boolean{
   return false;
 }
 
+export function isPrivate(message: any) {
+  if (message && message.attributes && message.attributes.subtype === 'private') {
+    return true;
+  }
+  return false;
+}
+
 
 /** */
 export function messageType(msgType: string, message: any) {
 
+    if (msgType === MESSAGE_TYPE_PRIVATE) {
+      return isPrivate(message);
+    }
     if (msgType === MESSAGE_TYPE_INFO) {
       return isInfo(message);
     }

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

@@ -579,4 +579,89 @@ function componentFromStr(numStr, percent) {
 
 
 
+// export function isAllowedUrlInText(text: string, allowedUrls: string[]): boolean {
+//   // Regex per trovare URL o domini nudi nel testo
+//   const urlRegex = /https?:\/\/[^\s]+|www\.[^\s]+|(?:\b[\w-]+\.)+[a-z]{2,}(\/[^\s]*)?/gi;
+//   const foundUrls = text.match(urlRegex);
+
+//   if (!foundUrls) {
+//     return true; // Nessun URL => testo ammesso
+//   }
+
+//   // Normalizza dominio: rimuove schema, www., slash finali
+//   const normalize = (url: string) =>
+//     url
+//       .replace(/^https?:\/\//i, '')
+//       .replace(/^www\./i, '')
+//       .replace(/\/$/, '')
+//       .toLowerCase();
+
+//   // Normalizza tutti gli allowed pattern per confronto
+//   const normalizedAllowedPatterns = allowedUrls.map(pattern =>
+//     pattern
+//       .replace(/^https?:\/\//i, '')
+//       .replace(/^www\./i, '')
+//       .replace(/\/$/, '')
+//       .toLowerCase()
+//       .replace(/\./g, '\\.')
+//       .replace(/\//g, '\\/')
+//       .replace(/\*/g, '.*')
+//   );
+
+//   return foundUrls.every(rawUrl => {
+//     const url = normalize(rawUrl);
+//     return normalizedAllowedPatterns.some(pattern => {
+//       const regex = new RegExp(`^${pattern}$`, 'i');
+//       return regex.test(url);
+//     });
+//   });
+// }
+
+export function isAllowedUrlInText(text: string, allowedUrls: string[]) {
+  const urlsInMessage = extractUrls(text);
+
+  const allowedPatterns = allowedUrls.map((url) => {
+    try {
+      // Prova a estrarre il dominio da una URL completa
+      const hostname = new URL(url).hostname.toLowerCase();
+      return hostname;
+    } catch {
+      // Lascia il dominio nudo (es: "*.tiledesk.com" o "tiledesk.com")
+      return url.toLowerCase();
+    }
+  });
+
+  const matchesAllowed = (domain: string) => {
+    return allowedPatterns.some((pattern) => {
+      if (pattern === '*') {
+        return true; //accept all
+      }
+      if (pattern.startsWith('*.')) {
+        const base = pattern.replace(/^\*\./, '');
+        return domain === base || domain.endsWith('.' + base);
+      } else {
+        return domain === pattern;
+      }
+    });
+  };
+
+  const nonWhitelistedDomains = urlsInMessage.filter((url) => {
+    try {
+      const domain = new URL(url).hostname.toLowerCase();
+      return !matchesAllowed(domain);
+    } catch (e) {
+      return true; // Considera URL non valido come non ammesso
+    }
+  });
+
+  return nonWhitelistedDomains.length === 0;
+}
+
+function extractUrls(text: string): string[] {
+  const urlRegex = /https?:\/\/[^\s]+/g;
+  return text.match(urlRegex) || [];
+}
+
+
+