alamin
/
go-whatsapp-multidevice-rest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update optimize jid checking, composing, and error handling

pull/28/head v1.3.1
Dimas Restu H 4 years ago
parent
5c43382374
commit
f4e0d5843c
2 changed files with 92 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      internal/whatsapp/whatsapp.go
  2. 125
      pkg/whatsapp/whatsapp.go

50
internal/whatsapp/whatsapp.go
View File

@ -101,51 +101,49 @@ func Login(c echo.Context) error {
return router.ResponseSuccessWithData(c, "Successfully Generated QR Code", resLogin) return router.ResponseSuccessWithData(c, "Successfully Generated QR Code", resLogin)
} }
// Logout
// @Summary Logout Device from WhatsApp Multi-Device
// @Description Make Device Logout from WhatsApp Multi-Device
// Registered
// @Summary Check If Phone Number is Registered in WhatsApp
// @Description Check Phone Number is Registered in WhatsApp
// @Tags WhatsApp Authentication // @Tags WhatsApp Authentication
// @Produce json // @Produce json
// @Param msisdn query string true "Phone Number to Check"
// @Success 200 // @Success 200
// @Security BearerAuth // @Security BearerAuth
// @Router /api/v1/whatsapp/logout [post]
func Logout(c echo.Context) error {
var err error
// @Router /api/v1/whatsapp/registered [get]
func Registered(c echo.Context) error {
jid := jwtPayload(c).JID jid := jwtPayload(c).JID
remoteJID := strings.TrimSpace(c.QueryParam("msisdn"))
err = pkgWhatsApp.WhatsAppLogout(jid)
if len(remoteJID) == 0 {
return router.ResponseInternalError(c, "Missing Query Value MSISDN")
}
_, err := pkgWhatsApp.WhatsAppComposeJID(jid, remoteJID)
if err != nil { if err != nil {
return router.ResponseInternalError(c, err.Error())
return router.ResponseNotFound(c, err.Error())
} }
return router.ResponseSuccess(c, "Successfully Logged Out")
return router.ResponseSuccess(c, "Phone Number is Registered")
} }
// Registered
// @Summary Check If Phone Number is Registered in WhatsApp
// @Description Check Phone Number is Registered in WhatsApp
// Logout
// @Summary Logout Device from WhatsApp Multi-Device
// @Description Make Device Logout from WhatsApp Multi-Device
// @Tags WhatsApp Authentication // @Tags WhatsApp Authentication
// @Produce json // @Produce json
// @Param msisdn query string true "Phone Number to Check"
// @Success 200 // @Success 200
// @Security BearerAuth // @Security BearerAuth
// @Router /api/v1/whatsapp/registered [get]
func Registered(c echo.Context) error {
// @Router /api/v1/whatsapp/logout [post]
func Logout(c echo.Context) error {
var err error
jid := jwtPayload(c).JID jid := jwtPayload(c).JID
rjid := strings.TrimSpace(c.QueryParam("msisdn"))
if len(rjid) == 0 {
return router.ResponseInternalError(c, "Missing Param Value MSISDN")
}
rjid = pkgWhatsApp.WhatsAppDecomposeJID(rjid)
_, isJIDRegistered := pkgWhatsApp.WhatsAppCheckJID(jid, rjid)
if !isJIDRegistered {
return router.ResponseNotFound(c, "Phone Number is Not Registered")
err = pkgWhatsApp.WhatsAppLogout(jid)
if err != nil {
return router.ResponseInternalError(c, err.Error())
} }
return router.ResponseSuccess(c, "Phone Number is Registered")
return router.ResponseSuccess(c, "Successfully Logged Out")
} }
// SendText // SendText

125
pkg/whatsapp/whatsapp.go
View File

@ -224,48 +224,50 @@ func WhatsAppClientIsOK(jid string) error {
return nil return nil
} }
func WhatsAppCheckJID(jid string, phone string) (types.JID, bool) {
func WhatsAppJIDIsOK(jid types.JID) error {
// Make Sure JID is not Empty
if jid.IsEmpty() {
return errors.New("Phone Number is not Registered")
}
return nil
}
func WhatsAppGetJID(jid string, phone string) types.JID {
if WhatsAppClient[jid] != nil { if WhatsAppClient[jid] != nil {
var phones []string var phones []string
phones = append(phones, "+"+phone) phones = append(phones, "+"+phone)
jidInfos, err := WhatsAppClient[jid].IsOnWhatsApp(phones) jidInfos, err := WhatsAppClient[jid].IsOnWhatsApp(phones)
if err == nil { if err == nil {
// If Phone Number is Registered in WhatsApp
// If Phone Number is Registered as JID
if jidInfos[0].IsIn { if jidInfos[0].IsIn {
// Return JID Information // Return JID Information
return jidInfos[0].JID, true
return jidInfos[0].JID
} }
} }
} }
// Return Empty JID Information // Return Empty JID Information
return types.EmptyJID, false
return types.EmptyJID
} }
func WhatsAppComposeJID(jid string, phone string) types.JID {
func WhatsAppComposeJID(jid string, phone string) (types.JID, error) {
// Decompose Phone Number First Before Recomposing // Decompose Phone Number First Before Recomposing
phone = WhatsAppDecomposeJID(phone) phone = WhatsAppDecomposeJID(phone)
// Check if Phone Number is Registered in WhatsApp
jidInfo, jidOK := WhatsAppCheckJID(jid, phone)
// If Phone Number Registered Then
// Check if JID Server is in Group Server
// Or it's Default User Server
if jidOK {
// Check if JID Info is in Group Server
if jidInfo.Server == types.GroupServer {
// Return JID as Group Server (@g.us)
return types.NewJID(phone, types.GroupServer)
}
// Get Registered JID Information from Phone Number
jidInfo := WhatsAppGetJID(jid, phone)
// Return JID as Default User Server (@s.whatsapp.net)
return types.NewJID(phone, types.DefaultUserServer)
// Check if JID Information is OK
err := WhatsAppJIDIsOK(jidInfo)
if err != nil {
// Return Empty JID
return types.EmptyJID, err
} }
// Return Empty JID
return types.EmptyJID
// Return New Composed JID from Phone Number and JID Server Information
return types.NewJID(phone, jidInfo.Server), nil
} }
func WhatsAppDecomposeJID(phone string) string { func WhatsAppDecomposeJID(phone string) string {
@ -317,10 +319,11 @@ func WhatsAppSendText(jid string, rjid string, message string) (string, error) {
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence
@ -356,10 +359,11 @@ func WhatsAppSendLocation(jid string, rjid string, latitude float64, longitude f
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence
@ -398,10 +402,11 @@ func WhatsAppSendDocument(jid string, rjid string, fileBytes []byte, fileType st
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence
@ -453,10 +458,11 @@ func WhatsAppSendImage(jid string, rjid string, imageBytes []byte, imageType str
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence
@ -576,10 +582,11 @@ func WhatsAppSendAudio(jid string, rjid string, audioBytes []byte, audioType str
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence
@ -629,10 +636,11 @@ func WhatsAppSendVideo(jid string, rjid string, videoBytes []byte, videoType str
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence
@ -684,10 +692,11 @@ func WhatsAppSendContact(jid string, rjid string, contactName string, contactNum
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence
@ -728,10 +737,11 @@ func WhatsAppSendLink(jid string, rjid string, linkCaption string, linkURL strin
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence
@ -784,10 +794,11 @@ func WhatsAppSendSticker(jid string, rjid string, stickerBytes []byte) (string,
return "", err return "", err
} }
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
// Check if Remote JID is Registered and
// Compose New Remote JID
remoteJID, err := WhatsAppComposeJID(jid, rjid)
if err != nil {
return "", err
} }
// Set Chat Presence // Set Chat Presence

Write Preview
Loading…
Cancel
Save