clean: just clean up some codes

Author: k1m0ch1

docs/journal.md

@@ -8,17 +8,23 @@ upgrade client version to
 wac.SetClientVersion(2, 2123, 7)
 ```
 
-- problem with stability of NeMO, whenever it comes to fault or error, it will force close, it will be much better if I add the restart NeMo in a specific feature:
+- [`21:00`]problem with stability of NeMO, whenever it comes to fault or error, it will force close, it will be much better if I add the restart NeMo in a specific feature:
 
   1. Startup
   2. Validate the coral
   2. Send Message
   3. Read Message
 
-- `log.Fatalf` will trigger the error and will be fail with a non-zero exit code
-- so the main function in this app is using asynchronous, and we need the async/await to retry the connection if failed
-- I need to research this again
-- so I hold this feature
-- and then I add the env key `WHATSAPP_CLIENT_VERSION_MAJOR` `WHATSAPP_CLIENT_VERSION_MINOR` and `WHATSAPP_CLIENT_VERSION_HOTFIX` so user can customize the whatsapp client version
-- the best way to do is by get the client version on device and set this automatically so we don't need to do this
-- in case the user using the old version of whatsapp, the env key must still exist
+- [`21:30`] `log.Fatalf` will trigger the error and will be fail with a non-zero exit code
+- [`22:10`] so the main function in this app is using asynchronous, and we need the async/await to retry the connection if failed
+- [`22:30`] I need to research this again
+- [`22:30`] so I hold this feature
+- [`22:30`] and then I add the env key `WHATSAPP_CLIENT_VERSION_MAJOR` `WHATSAPP_CLIENT_VERSION_MINOR` and `WHATSAPP_CLIENT_VERSION_HOTFIX` so user can customize the whatsapp client version
+- [`22:30`] the best way to do is by get the client version on device and set this automatically so we don't need to do this
+- [`22:30`] in case the user using the old version of whatsapp, the env key must still exist
+- [`1:28`] I move all handler to `handlers` dir, I need to clean it up more detail
+
+## 19 August 2021
+
+- [`9:42`] clean up code and move some to utils
+- [`11:32`] now much cleaner than before

handlers/init.go

@@ -0,0 +1,23 @@
+package handlers
+
+import (
+	whatsapp "github.com/Rhymen/go-whatsapp"
+	
+	// "github.com/eFishery/NeMo/utils"
+)
+
+// var BuildGreetings []utils.BuildGreeting
+// var BuildCommands []utils.BuildCommand
+// var Settings *utils.Setting
+
+type WaHandler struct {
+	C         *whatsapp.Conn
+	StartTime uint64
+	Chats map[string]struct{}
+}
+
+// func init() {
+// 	Settings = utils.LoadSetting()
+//     BuildGreetings = utils.ReadGreetingsFile()
+// 	BuildCommands = utils.ReadBuildCommandsFiles()
+// }

wa_default_handler.go handlers/wa_default_handler.go

@@ -1,65 +1,65 @@
-package main
+package handlers
 
 import (
 	"fmt"
 	"os"
 	"log"
 	"strings"
+	"time"
 
 	whatsapp "github.com/Rhymen/go-whatsapp"
 	req "github.com/imroc/req"
 
 	"github.com/eFishery/NeMo/utils"
 )
 
-
 func currently_it_do_nothing(wac *whatsapp.Conn, RJID string) {
 	phone_number := strings.Split(RJID, "@")[0]
 
 	// if the user suddenly sent the image this will trigger error because there is no available session
 	// need to test this
-	_, err := loadSession(phone_number)
+	_, err := utils.LoadSession(phone_number)
 	if err != nil {
 		log.Println("I don't know what you do but it do nothing")
 		return
 	}
 }
 
-func (wh *waHandler) HandleDocumentMessage(message whatsapp.DocumentMessage) {
-	if !(message.Info.Timestamp < wh.startTime) {
-		go currently_it_do_nothing(wh.c, message.Info.RemoteJid)
+func (wh *WaHandler) HandleDocumentMessage(message whatsapp.DocumentMessage) {
+	if !(message.Info.Timestamp < wh.StartTime) {
+		go currently_it_do_nothing(wh.C, message.Info.RemoteJid)
 	}
 }
 
-func (wh *waHandler) HandleVideoMessage(message whatsapp.VideoMessage) {
-	if !(message.Info.Timestamp < wh.startTime) {
-		go currently_it_do_nothing(wh.c, message.Info.RemoteJid)
+func (wh *WaHandler) HandleVideoMessage(message whatsapp.VideoMessage) {
+	if !(message.Info.Timestamp < wh.StartTime) {
+		go currently_it_do_nothing(wh.C, message.Info.RemoteJid)
 	}
 }
 
-func (wh *waHandler) HandleContactMessage(message whatsapp.ContactMessage) {
-	if !(message.Info.Timestamp < wh.startTime) {
-		go currently_it_do_nothing(wh.c, message.Info.RemoteJid)
+func (wh *WaHandler) HandleContactMessage(message whatsapp.ContactMessage) {
+	if !(message.Info.Timestamp < wh.StartTime) {
+		go currently_it_do_nothing(wh.C, message.Info.RemoteJid)
 	}
 }
 
 // need to test if the greeting is function well and return nothing after send message
 func greeting(wac *whatsapp.Conn, RJID string, message string){
-	for gIndex := range(BuildGreetings) {
-		for pIndex := range(BuildGreetings[gIndex].ExpectedUsers) {
-			if(strings.Split(RJID, "@")[1] == "g.us" && BuildGreetings[gIndex].ExpectedUsers[pIndex] == "any"){
+	for gIndex := range(utils.BuildGreetings) {
+		for pIndex := range(utils.BuildGreetings[gIndex].ExpectedUsers) {
+			if(strings.Split(RJID, "@")[1] == "g.us" && utils.BuildGreetings[gIndex].ExpectedUsers[pIndex] == "any"){
 				fmt.Println("The any default message is enabled, and only accepted by direct message")
 				return
 			}
-			if(BuildGreetings[gIndex].ExpectedUsers[pIndex] == RJID || BuildGreetings[gIndex].ExpectedUsers[pIndex] == "any"){
-				url := BuildGreetings[gIndex].Webhook.URL
+			if(utils.BuildGreetings[gIndex].ExpectedUsers[pIndex] == RJID || utils.BuildGreetings[gIndex].ExpectedUsers[pIndex] == "any"){
+				url := utils.BuildGreetings[gIndex].Webhook.URL
 
 				logGreeting := utils.LogGreeting {
 					Message: message,
 					PhoneNumber: strings.Split(RJID, "@")[0],
 				}
 
-				switch BuildGreetings[gIndex].Webhook.Service {
+				switch utils.BuildGreetings[gIndex].Webhook.Service {
 				case "DISCORD":
 					_, LogErr := LogToDiscord(url, logGreeting)
 					if LogErr != nil {
@@ -72,7 +72,7 @@ func greeting(wac *whatsapp.Conn, RJID string, message string){
 					}
 				}
 
-				go sendMessage(wac, BuildGreetings[gIndex].Message, RJID)
+				go utils.SendMessage(wac, utils.BuildGreetings[gIndex].Message, RJID)
 
 				return
 			}
@@ -121,4 +121,20 @@ func sendImage(wac *whatsapp.Conn, RJID string, imageUrl string, caption string)
 	} else {
 		fmt.Println("Message Sent -> ID : " + msgId)
 	}
+}
+
+//HandleError needs to be implemented to be a valid WhatsApp handler
+func (h *WaHandler) HandleError(err error) {
+	if e, ok := err.(*whatsapp.ErrConnectionFailed); ok {
+		log.Printf("Connection failed, underlying error: %v", e.Err)
+		log.Println("Waiting 30sec...")
+		<-time.After(30 * time.Second)
+		log.Println("Reconnecting...")
+		err := h.C.Restore()
+		if err != nil {
+			log.Fatalf("Restore failed: %v", err)
+		}
+	} else {
+		log.Printf("Error occured: %v\n", err)
+	}
 }

wa_image_handler.go handlers/wa_image_handler.go

@@ -1,4 +1,4 @@
-package main
+package handlers 
 
 import (
 	"encoding/json"
@@ -16,13 +16,13 @@ import (
 	"github.com/eFishery/NeMo/utils"
 )
 
-func (wh *waHandler)  HandleImageMessage(message whatsapp.ImageMessage) {
-	if !(message.Info.Timestamp < wh.startTime) {
+func (wh *WaHandler)  HandleImageMessage(message whatsapp.ImageMessage) {
+	if !(message.Info.Timestamp < wh.StartTime) {
 
 		phone_number := strings.Split(message.Info.RemoteJid, "@")[0]
 
 		// if the user suddenly sent the image this will trigger error because there is no available session
-		Sessions, err := loadSession(phone_number)
+		Sessions, err := utils.LoadSession(phone_number)
 		if err != nil {
 			log.Println(phone_number + " sent me image but it does nothing")
 			return
@@ -41,15 +41,15 @@ func (wh *waHandler)  HandleImageMessage(message whatsapp.ImageMessage) {
 
 			// prevent for user put image on any rule
 			if coral.Process.Questions[sIndex].Question.Validation.Rule != "image" {
-				go sendMessage(wh.c, coral.Process.Questions[sIndex].Question.Validation.Message, message.Info.RemoteJid)
+				go utils.SendMessage(wh.C, coral.Process.Questions[sIndex].Question.Validation.Message, message.Info.RemoteJid)
 			}
 
 			data, err := message.Download()
 			if err != nil {
 				if err != whatsapp.ErrMediaDownloadFailedWith410 && err != whatsapp.ErrMediaDownloadFailedWith404 {
 					return
 				}
-				if _, err = wh.c.LoadMediaInfo(message.Info.RemoteJid, message.Info.Id, strconv.FormatBool(message.Info.FromMe)); err == nil {
+				if _, err = wh.C.LoadMediaInfo(message.Info.RemoteJid, message.Info.Id, strconv.FormatBool(message.Info.FromMe)); err == nil {
 					data, err = message.Download()
 					if err != nil {
 						return
@@ -68,7 +68,7 @@ func (wh *waHandler)  HandleImageMessage(message whatsapp.ImageMessage) {
 			}
 			log.Printf("%v %v\n\timage received, saved at:%v\n", message.Info.Timestamp, message.Info.RemoteJid, filename)
 
-			uploadS3 := Settings.AddFileToS3(filename)
+			uploadS3 := utils.Settings.AddFileToS3(filename)
 
 			log.Println("Files Uploaded and here is the link : " + uploadS3)
 
@@ -87,7 +87,7 @@ func (wh *waHandler)  HandleImageMessage(message whatsapp.ImageMessage) {
 				_ = ioutil.WriteFile(utils.FileSession(phone_number), file, 0644)
 
 				if reply != "timeout" {
-					go sendMessage(wh.c, reply, message.Info.RemoteJid)
+					go utils.SendMessage(wh.C, reply, message.Info.RemoteJid)
 				}
 
 				return
@@ -112,7 +112,7 @@ func (wh *waHandler)  HandleImageMessage(message whatsapp.ImageMessage) {
 
 			Sessions.Datas = append(Sessions.Datas, dataBaru)
 
-			go saveSession(Sessions, phone_number)
+			go utils.SaveSession(Sessions, phone_number)
 
 			if coral.Process.Log {
 				logged := SentTo(coral.Log.Service, coral.Log.URL, Sessions)
@@ -132,14 +132,14 @@ func (wh *waHandler)  HandleImageMessage(message whatsapp.ImageMessage) {
 
 			if reply != "timeout" {
 				if Sessions.ProcessStatus != "WAIT_ANSWER" {
-					go sendMessage(wh.c, reply, message.Info.RemoteJid)
+					go utils.SendMessage(wh.C, reply, message.Info.RemoteJid)
 
 					if Sessions.ProcessStatus != "DONE" {
 						log.Println(Sessions.ProcessStatus)
 						Sessions.ProcessStatus = "WAIT_ANSWER"
 					}
 
-					go saveSession(Sessions, phone_number)
+					go utils.SaveSession(Sessions, phone_number)
 				}
 			}
 		}