Skip to content

Commit 53c28d0

Browse files
dchaofeidchaofei
authored
Add register event && Add friendship && Add FileBox (#20)
* memory_card * Add Event * Add friendship * file-box impl * move impl/wechaty to wechaty package * generate scanstatus_string.go * fix golint * close http body
1 parent f105d3b commit 53c28d0

32 files changed

+933
-141
lines changed

‎examples/ding-dong-bot.go‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
package main
22

33
import (
4-
"fmt"
5-
6-
"github.com/wechaty/go-wechaty/wechaty"
4+
"fmt"
5+
"github.com/wechaty/go-wechaty/wechaty"
6+
"github.com/wechaty/go-wechaty/wechaty-puppet/schemas"
7+
"github.com/wechaty/go-wechaty/wechaty/user"
78
)
89

910
func main() {
10-
_ = wechaty.NewWechaty().
11-
OnScan(func(qrCode, status string) {
12-
fmt.Printf("Scan QR Code to login: %s\nhttps://api.qrserver.com/v1/create-qr-code/?data=%s\n", status, qrCode)
13-
}).
14-
OnLogin(func(user string) { fmt.Printf("User %s logined\n", user) }).
15-
OnMessage(func(message string) { fmt.Printf("Message: %s\n", message) }).
16-
Start()
11+
_ = wechaty.NewWechaty().
12+
OnScan(func(qrCode string, status schemas.ScanStatus, data string) {
13+
fmt.Printf("Scan QR Code to login: %v\nhttps://api.qrserver.com/v1/create-qr-code/?data=%s\n", status, qrCode)
14+
}).
15+
OnLogin(func(user string) {
16+
fmt.Printf("User %s logined\n", user)
17+
}).
18+
OnMessage(func(message *user.Message) {
19+
fmt.Println(fmt.Printf("Message: %v\n", message))
20+
}).
21+
Start()
1722
}

‎go.mod‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ module github.com/wechaty/go-wechaty
33
go 1.14
44

55
require (
6+
github.com/bitly/go-simplejson v0.5.0
7+
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
68
github.com/hashicorp/golang-lru v0.5.4
79
github.com/otiai10/opengraph v1.1.1
8-
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
9-
golang.org/x/tools v0.0.0-20200402223321-bcf690261a44 // indirect
10+
github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086
11+
github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
12+
github.com/willf/bitset v1.1.10 // indirect
13+
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
14+
k8s.io/apimachinery v0.18.0
15+
k8s.io/client-go v11.0.0+incompatible
1016
)

‎wechaty-puppet/file-box/file_box.go‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
package file_box
2+
3+
import (
4+
"bytes"
5+
"encoding/base64"
6+
"encoding/json"
7+
"errors"
8+
"fmt"
9+
"github.com/bitly/go-simplejson"
10+
"github.com/tuotoo/qrcode"
11+
helper_functions "github.com/wechaty/go-wechaty/wechaty-puppet/helper-functions"
12+
"io/ioutil"
13+
"mime"
14+
"os"
15+
"path/filepath"
16+
)
17+
18+
type fileImplInterface interface {
19+
toJSONMap() map[string]interface{}
20+
toBytes() ([]byte, error)
21+
}
22+
23+
// FileBox struct
24+
type FileBox struct {
25+
fileImpl fileImplInterface
26+
name string
27+
metadata map[string]interface{}
28+
boxType FileBoxType
29+
fileBytes []byte
30+
mimeType string
31+
}
32+
33+
func newFileBox(common *FileBoxJsonObjectCommon, fileImpl fileImplInterface) *FileBox {
34+
return &FileBox{
35+
fileImpl: fileImpl,
36+
name: common.Name,
37+
metadata: common.Metadata,
38+
boxType: common.BoxType,
39+
mimeType: mime.TypeByExtension(filepath.Ext(common.Name)),
40+
}
41+
}
42+
43+
func NewFileBoxFromJSONString(s string) (*FileBox, error) {
44+
newJson, err := simplejson.NewJson([]byte(s))
45+
if err != nil {
46+
return nil, err
47+
}
48+
boxType, err := newJson.Get("boxType").Int64()
49+
if err != nil {
50+
return nil, err
51+
}
52+
switch boxType {
53+
case FileBoxTypeBase64:
54+
fileBoxStruct := new(FileBoxJsonObjectBase64)
55+
if err := json.Unmarshal([]byte(s), fileBoxStruct); err != nil {
56+
return nil, err
57+
}
58+
return NewFileBoxFromJSONObjectBase64(fileBoxStruct), nil
59+
case FileBoxTypeQRCode:
60+
fileBoxStruct := new(FileBoxJsonObjectQRCode)
61+
if err := json.Unmarshal([]byte(s), fileBoxStruct); err != nil {
62+
return nil, err
63+
}
64+
return NewFileBoxFromJSONObjectQRCode(fileBoxStruct), nil
65+
case FileBoxTypeUrl:
66+
fileBoxStruct := new(FileBoxJsonObjectUrl)
67+
if err := json.Unmarshal([]byte(s), fileBoxStruct); err != nil {
68+
return nil, err
69+
}
70+
return NewFileBoxFromJSONObjectUrl(fileBoxStruct), nil
71+
default:
72+
return nil, errors.New("invalid value boxType")
73+
}
74+
}
75+
76+
func NewFileBoxFromJSONObjectBase64(data *FileBoxJsonObjectBase64) *FileBox {
77+
return newFileBox(data.FileBoxJsonObjectCommon, newFileBoxBase64(data.Base64))
78+
}
79+
80+
func NewFileBoxFromJSONObjectUrl(data *FileBoxJsonObjectUrl) *FileBox {
81+
return newFileBox(data.FileBoxJsonObjectCommon, NewFileBoxUrl(data.RemoteUrl, data.Headers))
82+
}
83+
84+
func NewFileBoxFromJSONObjectQRCode(data *FileBoxJsonObjectQRCode) *FileBox {
85+
return newFileBox(data.FileBoxJsonObjectCommon, NewFileBoxQRCode(data.QrCode))
86+
}
87+
88+
func (fb *FileBox) ToJSONString() (string, error) {
89+
jsonMap := map[string]interface{}{
90+
"name": fb.name,
91+
"metadata": fb.metadata,
92+
"boxType": fb.boxType,
93+
}
94+
implJsonMap := fb.fileImpl.toJSONMap()
95+
for k, v := range implJsonMap {
96+
jsonMap[k] = v
97+
}
98+
marshal, err := json.Marshal(jsonMap)
99+
return string(marshal), err
100+
}
101+
102+
func (fb *FileBox) ToFile(filePath string, overwrite bool) error {
103+
if filePath == "" {
104+
filePath = fb.name
105+
}
106+
path, err := os.Getwd()
107+
if err != nil {
108+
return err
109+
}
110+
fullPath := filepath.Join(path, filePath)
111+
if !overwrite && helper_functions.FileExists(fullPath) {
112+
return os.ErrExist
113+
}
114+
fileBytes, err := fb.ToBytes()
115+
if err != nil {
116+
return err
117+
}
118+
return ioutil.WriteFile(filePath, fileBytes, os.ModePerm)
119+
}
120+
121+
func (fb *FileBox) ToBytes() ([]byte, error) {
122+
if fb.fileBytes != nil {
123+
return fb.fileBytes, nil
124+
}
125+
toBytes, err := fb.fileImpl.toBytes()
126+
if err != nil {
127+
return nil, err
128+
}
129+
fb.fileBytes = toBytes
130+
return fb.fileBytes, nil
131+
}
132+
133+
func (fb *FileBox) ToBase64() (string, error) {
134+
fileBytes, err := fb.ToBytes()
135+
if err != nil {
136+
return "", err
137+
}
138+
return base64.StdEncoding.EncodeToString(fileBytes), nil
139+
}
140+
141+
func (fb *FileBox) ToDataURL() (string, error) {
142+
toBase64, err := fb.ToBase64()
143+
if err != nil {
144+
return "", nil
145+
}
146+
return fmt.Sprintf("data:%s;base64,%s", fb.mimeType, toBase64), nil
147+
}
148+
149+
func (fb *FileBox) ToQrCode() (string, error) {
150+
fileBytes, err := fb.ToBytes()
151+
if err != nil {
152+
return "", err
153+
}
154+
decode, err := qrcode.Decode(bytes.NewReader(fileBytes))
155+
if err != nil {
156+
return "", nil
157+
}
158+
return decode.Content, nil
159+
}

‎wechaty-puppet/file-box/file_box_base64.go‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package file_box
2+
3+
import (
4+
"encoding/base64"
5+
)
6+
7+
type fileBoxBase64 struct {
8+
base64Data string
9+
}
10+
11+
func newFileBoxBase64(base64Data string) *fileBoxBase64 {
12+
return &fileBoxBase64{base64Data: base64Data}
13+
}
14+
15+
func (fb *fileBoxBase64) toJSONMap() map[string]interface{} {
16+
return map[string]interface{}{
17+
"base64": fb.base64Data,
18+
}
19+
}
20+
21+
func (fb *fileBoxBase64) toBytes() ([]byte, error) {
22+
dec, err := base64.StdEncoding.DecodeString(fb.base64Data)
23+
if err != nil {
24+
return nil, err
25+
}
26+
return dec, nil
27+
}

‎wechaty-puppet/file-box/file_box_qrcode.go‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package file_box
2+
3+
import (
4+
"github.com/skip2/go-qrcode"
5+
)
6+
7+
type fileBoxQRCode struct {
8+
qrCode string
9+
}
10+
11+
func NewFileBoxQRCode(qrCode string) *fileBoxQRCode {
12+
return &fileBoxQRCode{qrCode: qrCode}
13+
}
14+
15+
func (fb *fileBoxQRCode) toJSONMap() map[string]interface{} {
16+
return map[string]interface{}{
17+
"qrCode": fb.qrCode,
18+
}
19+
}
20+
21+
func (fb *fileBoxQRCode) toBytes() ([]byte, error) {
22+
qr, err := qrcode.New(fb.qrCode, qrcode.Medium)
23+
if err != nil {
24+
return nil, err
25+
}
26+
return qr.PNG(256)
27+
}

‎wechaty-puppet/file-box/file_box_test.go‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
package file_box
2+
3+
import (
4+
"encoding/base64"
5+
"io/ioutil"
6+
"log"
7+
"os"
8+
"reflect"
9+
"testing"
10+
)
11+
12+
func TestFileBox_ToFile(t *testing.T) {
13+
expect := "test content"
14+
fileBox := NewFileBoxFromJSONObjectBase64(&FileBoxJsonObjectBase64{
15+
FileBoxJsonObjectCommon: &FileBoxJsonObjectCommon{
16+
Name: "test.text",
17+
Metadata: nil,
18+
BoxType: FileBoxTypeBase64,
19+
},
20+
Base64: base64.StdEncoding.EncodeToString([]byte(expect)),
21+
})
22+
const filename = "testdata/test.text"
23+
t.Run("toFile success", func(t *testing.T) {
24+
err := fileBox.ToFile(filename, true)
25+
if err != nil {
26+
log.Fatal(err)
27+
}
28+
file, err := os.Open(filename)
29+
if err != nil {
30+
log.Fatal(err)
31+
}
32+
got, err := ioutil.ReadAll(file)
33+
if err != nil {
34+
log.Fatal(err)
35+
}
36+
if expect != string(got) {
37+
log.Fatalf("got %s expect %s", got, expect)
38+
}
39+
})
40+
t.Run("file exists", func(t *testing.T) {
41+
err := fileBox.ToFile(filename, false)
42+
if err != os.ErrExist {
43+
log.Fatalf("got %s expect %s", err, os.ErrExist)
44+
}
45+
})
46+
}
47+
48+
func TestNewFileBoxFromJSONString(t *testing.T) {
49+
tests := []struct {
50+
jsonString string
51+
expectFileImpl reflect.Type
52+
}{
53+
{
54+
jsonString: `{
55+
"name":"test.png",
56+
"metadata": null,
57+
"boxType":1,
58+
"base64":"dGVzdCBjb250ZW50"
59+
}`,
60+
expectFileImpl: reflect.TypeOf(new(fileBoxBase64)),
61+
},
62+
{
63+
jsonString: `{
64+
"name":"test.png",
65+
"metadata": null,
66+
"boxType":2,
67+
"remoteUrl":"http://www.example.com",
68+
"header":null
69+
}`,
70+
expectFileImpl: reflect.TypeOf(new(fileBoxUrl)),
71+
},
72+
{
73+
jsonString: `{
74+
"name":"test.png",
75+
"metadata": null,
76+
"boxType":3,
77+
"qrCode":"test content"
78+
}`,
79+
expectFileImpl: reflect.TypeOf(new(fileBoxQRCode)),
80+
},
81+
}
82+
for _, t := range tests {
83+
fileBox, err := NewFileBoxFromJSONString(t.jsonString)
84+
if err != nil {
85+
log.Fatal(err)
86+
}
87+
gotReflectType := reflect.TypeOf(fileBox.fileImpl)
88+
if gotReflectType != t.expectFileImpl {
89+
log.Fatalf("got %v expect %v", gotReflectType, t.expectFileImpl)
90+
}
91+
}
92+
}

‎wechaty-puppet/file-box/file_box_url.go‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package file_box
2+
3+
import (
4+
helper_functions "github.com/wechaty/go-wechaty/wechaty-puppet/helper-functions"
5+
"io/ioutil"
6+
"net/http"
7+
)
8+
9+
type fileBoxUrl struct {
10+
remoteUrl string
11+
headers http.Header
12+
}
13+
14+
func NewFileBoxUrl(remoteUrl string, headers http.Header) *fileBoxUrl {
15+
return &fileBoxUrl{remoteUrl: remoteUrl, headers: headers}
16+
}
17+
18+
func (fb *fileBoxUrl) toJSONMap() map[string]interface{} {
19+
return map[string]interface{}{
20+
"headers": fb.headers,
21+
"remoteUrl": fb.remoteUrl,
22+
}
23+
}
24+
25+
func (fb *fileBoxUrl) toBytes() ([]byte, error) {
26+
request, err := http.NewRequest(http.MethodGet, fb.remoteUrl, nil)
27+
if err != nil {
28+
return nil, err
29+
}
30+
request.Header = fb.headers
31+
response, err := helper_functions.HttpClient.Do(request)
32+
if err != nil {
33+
return nil, err
34+
}
35+
defer response.Body.Close()
36+
return ioutil.ReadAll(response.Body)
37+
}

‎wechaty-puppet/file-box/testdata/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test.text

0 commit comments

Comments
 (0)