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

add capabilities to send contact

pull/28/head
Dimas Restu H 4 years ago
parent
4dc55dcca4
commit
e63306b3cb
7 changed files with 222 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      docs/docs.go
  2. 48
      docs/swagger.json
  3. 31
      docs/swagger.yaml
  4. 1
      internal/route.go
  5. 6
      internal/whatsapp/types/request.go
  6. 46
      internal/whatsapp/whatsapp.go
  7. 42
      pkg/whatsapp/whatsapp.go

48
docs/docs.go
View File

@ -161,6 +161,54 @@ const docTemplate = `{
}
}
},
"/api/v1/whatsapp/send/contact": {
"post": {
"security": [
{
"BearerAuth": []
}
],
"description": "Send Contact Message to Spesific Phone Number",
"consumes": [
"multipart/form-data"
],
"produces": [
"application/json"
],
"tags": [
"WhatsApp"
],
"summary": "Send Contact Message",
"parameters": [
{
"type": "string",
"description": "Destination Phone Number",
"name": "msisdn",
"in": "formData",
"required": true
},
{
"type": "string",
"description": "Contact Name",
"name": "name",
"in": "formData",
"required": true
},
{
"type": "string",
"description": "Contact Phone",
"name": "phone",
"in": "formData",
"required": true
}
],
"responses": {
"200": {
"description": ""
}
}
}
},
"/api/v1/whatsapp/send/document": {
"post": {
"security": [

48
docs/swagger.json
View File

@ -156,6 +156,54 @@
}
}
},
"/api/v1/whatsapp/send/contact": {
"post": {
"security": [
{
"BearerAuth": []
}
],
"description": "Send Contact Message to Spesific Phone Number",
"consumes": [
"multipart/form-data"
],
"produces": [
"application/json"
],
"tags": [
"WhatsApp"
],
"summary": "Send Contact Message",
"parameters": [
{
"type": "string",
"description": "Destination Phone Number",
"name": "msisdn",
"in": "formData",
"required": true
},
{
"type": "string",
"description": "Contact Name",
"name": "name",
"in": "formData",
"required": true
},
{
"type": "string",
"description": "Contact Phone",
"name": "phone",
"in": "formData",
"required": true
}
],
"responses": {
"200": {
"description": ""
}
}
}
},
"/api/v1/whatsapp/send/document": {
"post": {
"security": [

31
docs/swagger.yaml
View File

@ -96,6 +96,37 @@ paths:
summary: Send Audio Message
tags:
- WhatsApp
/api/v1/whatsapp/send/contact:
post:
consumes:
- multipart/form-data
description: Send Contact Message to Spesific Phone Number
parameters:
- description: Destination Phone Number
in: formData
name: msisdn
required: true
type: string
- description: Contact Name
in: formData
name: name
required: true
type: string
- description: Contact Phone
in: formData
name: phone
required: true
type: string
produces:
- application/json
responses:
"200":
description: ""
security:
- BearerAuth: []
summary: Send Contact Message
tags:
- WhatsApp
/api/v1/whatsapp/send/document:
post:
consumes:

1
internal/route.go
View File

@ -38,6 +38,7 @@ func Routes(e *echo.Echo) {
e.POST(router.BaseURL+"/login", ctlWhatsApp.Login, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/send/text", ctlWhatsApp.SendText, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/send/location", ctlWhatsApp.SendLocation, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/send/contact", ctlWhatsApp.SendContact, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/send/document", ctlWhatsApp.SendDocument, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/send/image", ctlWhatsApp.SendImage, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/send/audio", ctlWhatsApp.SendAudio, middleware.JWTWithConfig(authJWTConfig))

6
internal/whatsapp/types/request.go
View File

@ -14,3 +14,9 @@ type RequestSendLocation struct {
Latitude float64
Longitude float64
}
type RequestSendContact struct {
RJID string
Name string
Phone string
}

46
internal/whatsapp/whatsapp.go
View File

@ -147,6 +147,10 @@ func SendText(c echo.Context) error {
return router.ResponseBadRequest(c, "Missing Form Value MSISDN")
}
if len(reqSendMessage.Message) == 0 {
return router.ResponseBadRequest(c, "Missing Form Value Message")
}
var resSendMessage typWhatsApp.ResponseSendMessage
resSendMessage.MsgID, err = pkgWhatsApp.WhatsAppSendText(jid, reqSendMessage.RJID, reqSendMessage.Message)
if err != nil {
@ -198,6 +202,48 @@ func SendLocation(c echo.Context) error {
return router.ResponseSuccessWithData(c, "Successfully Send Location Message", resSendMessage)
}
// SendContact
// @Summary Send Contact Message
// @Description Send Contact Message to Spesific Phone Number
// @Tags WhatsApp
// @Accept multipart/form-data
// @Produce json
// @Param msisdn formData string true "Destination Phone Number"
// @Param name formData string true "Contact Name"
// @Param phone formData string true "Contact Phone"
// @Success 200
// @Security BearerAuth
// @Router /api/v1/whatsapp/send/contact [post]
func SendContact(c echo.Context) error {
var err error
jid := jwtPayload(c).JID
var reqSendContact typWhatsApp.RequestSendContact
reqSendContact.RJID = strings.TrimSpace(c.FormValue("msisdn"))
reqSendContact.Name = strings.TrimSpace(c.FormValue("name"))
reqSendContact.Phone = strings.TrimSpace(c.FormValue("phone"))
if len(reqSendContact.RJID) == 0 {
return router.ResponseBadRequest(c, "Missing Form Value MSISDN")
}
if len(reqSendContact.Name) == 0 {
return router.ResponseBadRequest(c, "Missing Form Value Name")
}
if len(reqSendContact.Phone) == 0 {
return router.ResponseBadRequest(c, "Missing Form Value Phone")
}
var resSendMessage typWhatsApp.ResponseSendMessage
resSendMessage.MsgID, err = pkgWhatsApp.WhatsAppSendContact(jid, reqSendContact.RJID, reqSendContact.Name, reqSendContact.Phone)
if err != nil {
return router.ResponseInternalError(c, err.Error())
}
return router.ResponseSuccessWithData(c, "Successfully Send Contact Message", resSendMessage)
}
// SendDocument
// @Summary Send Document Message
// @Description Send Document Message to Spesific Phone Number

42
pkg/whatsapp/whatsapp.go
View File

@ -4,6 +4,7 @@ import (
"context"
"encoding/base64"
"errors"
"fmt"
"strings"
qrCode "github.com/skip2/go-qrcode"
@ -556,3 +557,44 @@ func WhatsAppSendVideo(jid string, rjid string, videoBytes []byte, videoType str
// Return Error WhatsApp Client is not Valid
return "", errors.New("WhatsApp Client is not Valid")
}
func WhatsAppSendContact(jid string, rjid string, contactName string, contactNumber string) (string, error) {
if WhatsAppClient[jid] != nil {
var err error
// Make Sure WhatsApp Client is OK
err = WhatsAppClientIsOK(jid)
if err != nil {
return "", err
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)
defer WhatsAppComposeStatus(jid, remoteJID, false, false)
// Compose WhatsApp Proto
msgId := whatsmeow.GenerateMessageID()
msgVCard := fmt.Sprintf("BEGIN:VCARD\nVERSION:3.0\nN:;%v;;;\nFN:%v\nTEL;type=CELL;waid=%v:+%v\nEND:VCARD",
contactName, contactName, contactNumber, contactNumber)
msgContent := &waproto.Message{
ContactMessage: &waproto.ContactMessage{
DisplayName: proto.String(contactName),
Vcard: proto.String(msgVCard),
},
}
// Send WhatsApp Message Proto
_, err = WhatsAppClient[jid].SendMessage(remoteJID, msgId, msgContent)
if err != nil {
return "", err
}
return msgId, nil
}
// Return Error WhatsApp Client is not Valid
return "", errors.New("WhatsApp Client is not Valid")
}
Write Preview
Loading…
Cancel
Save