From 78bc60605fe6db05d4d1e4e9f0c7c7f6903381d1 Mon Sep 17 00:00:00 2001
From: Dimas Restu H <dimas.restu@student.upi.edu>
Date: Thu, 21 Apr 2022 11:00:28 +0700
Subject: [PATCH] update some improvement

---
 pkg/whatsapp/whatsapp.go | 44 ++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/pkg/whatsapp/whatsapp.go b/pkg/whatsapp/whatsapp.go
index 4b4cced..c0983eb 100644
--- a/pkg/whatsapp/whatsapp.go
+++ b/pkg/whatsapp/whatsapp.go
@@ -149,6 +149,20 @@ func WhatsAppLogout(jid string) error {
 	return errors.New("WhatsApp Client is not Valid")
 }
 
+func WhatsAppClientIsOK(jid string) error {
+	// Make Sure WhatsApp Client is Connected
+	if !WhatsAppClient[jid].IsConnected() {
+		return errors.New("WhatsApp Client is not Connected")
+	}
+
+	// Make Sure WhatsApp Client is Logged In
+	if !WhatsAppClient[jid].IsLoggedIn() {
+		return errors.New("WhatsApp Client is not Logged In")
+	}
+
+	return nil
+}
+
 func WhatsAppComposeJID(jid string) types.JID {
 	// Check if JID Contains '@' Symbol
 	if strings.ContainsRune(jid, '@') {
@@ -158,7 +172,7 @@ func WhatsAppComposeJID(jid string) types.JID {
 		jid = buffers[0]
 	}
 
-	// Check if JID First Chracter is '+' Symbol
+	// Check if JID First Character is '+' Symbol
 	if jid[0] == '+' {
 		// Remove '+' Symbol from JID
 		jid = jid[1:]
@@ -179,24 +193,24 @@ func WhatsAppComposeJID(jid string) types.JID {
 
 func WhatsAppSendText(jid string, rjid string, message string) error {
 	if WhatsAppClient[jid] != nil {
-		// Make Sure WhatsApp Client WebSocket is Connected and Logged In
-		if WhatsAppClient[jid].IsConnected() && WhatsAppClient[jid].IsLoggedIn() {
-			// Compose WhatsApp Proto
-			content := &waproto.Message{
-				Conversation: proto.String(message),
-			}
+		// Make Sure WhatsApp Client is OK
+		err := WhatsAppClientIsOK(jid)
+		if err != nil {
+			return err
+		}
 
-			// Send WhatsApp Message Proto
-			_, err := WhatsAppClient[jid].SendMessage(WhatsAppComposeJID(rjid), "", content)
-			if err != nil {
-				return err
-			}
+		// Compose WhatsApp Proto
+		content := &waproto.Message{
+			Conversation: proto.String(message),
+		}
 
-			return nil
+		// Send WhatsApp Message Proto
+		_, err = WhatsAppClient[jid].SendMessage(WhatsAppComposeJID(rjid), "", content)
+		if err != nil {
+			return err
 		}
 
-		// Return Error WhatsApp Client is not Connected or Logged In
-		return errors.New("WhatsApp Client is not Connected or Logged In")
+		return nil
 	}
 
 	// Return Error WhatsApp Client is not Valid