message

src/app/services/chat/message.service.ts

@@ -12,6 +12,7 @@ import { MessageModel, DeleteMessageModel } from '../../models/beast-orm'
 import { AESEncrypt } from '../aesencrypt.service'
 import { HttpClient, HttpEventType } from '@angular/common/http';
 import { AttachmentsService } from 'src/app/services/attachments.service';
+import { NetworkServiceService , ConnectionStatus} from 'src/app/services/network-service.service';
 
 @Injectable({
   providedIn: 'root'
@@ -62,7 +63,8 @@ export class MessageService {
     private ChatStorageService: ChatStorageService,
     private ChatMethodsService: ChatMethodsService,
     private AESEncrypt: AESEncrypt,
-    private AttachmentsService: AttachmentsService,) {
+    private AttachmentsService: AttachmentsService,
+    private NetworkServiceService: NetworkServiceService) {
   }
 
   setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference , viewed = [], received = [], delate = false, delateRequest =false, }:Message) {
@@ -184,24 +186,29 @@ export class MessageService {
       delete params?.attachments?.image_url
     }
 
-    this.ChatMethodsService.send(params).subscribe(
-      (response: any) => {
-        const ChatMessage = response.message
-        this.messageSend = true
-        this.redefinedMessage(ChatMessage)
 
-      },
-      (error) => {
-        this.WsChatService.registerCallback({
-          type: 'reConnect',
-          funx: async ()=> {
-            
-            this.send()
-            return true
-          }
-        })
-      }
-    )
+    if(this.NetworkServiceService.getCurrentNetworkStatus() == ConnectionStatus.Online) {
+      
+      this.WsChatService.send(params).then(
+        (ChatMessage: any) => {
+          ChatMessage = ChatMessage.message.result
+
+          this.messageSend = true
+          this.redefinedMessage(ChatMessage)
+        }
+      )
+
+    } else {
+      this.WsChatService.registerCallback({
+        type: 'reConnect',
+        funx: async ()=> {
+          
+          this.send()
+          return true
+        }
+      })
+    }
+
   }
 
   async redefinedMessage(ChatMessage , update = true) {