Skip to content

Commit ba17c45

Browse files
chyrocchyroc
committed
remove github.com/chyroc/go-ptr 
1 parent e9e6665 commit ba17c45

27 files changed

+266
-142
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ cli := lark.New(
987987

988988
tenantKey1Cli := cli.WithTenant("<TENANT_KEY_1>")
989989
resp, _, err := tenantKey1cli.Chat.CreateChat(ctx, &lark.CreateChatReq{
990-
Name: ptr.String("<CHAT_NAME_1>"),
990+
Name: ptrString("<CHAT_NAME_1>"),
991991
})
992992
fmt.Println(resp, err)
993993
```
@@ -1043,7 +1043,7 @@ create chat example:
10431043
cli := lark.New(lark.WithAppCredential("<APP_ID>", "<APP_SECRET>"))
10441044

10451045
resp, _, err := cli.Chat.CreateChat(ctx, &lark.CreateChatReq{
1046-
Name: ptr.String("<CHAT_NAME>"),
1046+
Name: ptrString("<CHAT_NAME>"),
10471047
})
10481048
fmt.Println(resp, err)
10491049
```
@@ -1078,7 +1078,7 @@ create calendar example:
10781078
cli := lark.New(lark.WithAppCredential("<APP_ID>", "<APP_SECRET>"))
10791079

10801080
resp, _, err := cli.Calendar.CreateCalendar(ctx, &lark.CreateCalendarReq{
1081-
Summary: ptr.String("<SUMMARY>"),
1081+
Summary: ptrString("<SUMMARY>"),
10821082
})
10831083
fmt.Println(resp, err)
10841084
```

‎README_CN.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ cli := lark.New(
987987

988988
tenantKey1Cli := cli.WithTenant("<TENANT_KEY_1>")
989989
resp, _, err := tenantKey1cli.Chat.CreateChat(ctx, &lark.CreateChatReq{
990-
Name: ptr.String("<CHAT_NAME_1>"),
990+
Name: ptrString("<CHAT_NAME_1>"),
991991
})
992992
fmt.Println(resp, err)
993993
```
@@ -1043,7 +1043,7 @@ fmt.Println(resp, err)
10431043
cli := lark.New(lark.WithAppCredential("<APP_ID>", "<APP_SECRET>"))
10441044

10451045
resp, _, err := cli.Chat.CreateChat(ctx, &lark.CreateChatReq{
1046-
Name: ptr.String("<CHAT_NAME>"),
1046+
Name: ptrString("<CHAT_NAME>"),
10471047
})
10481048
fmt.Println(resp, err)
10491049
```
@@ -1078,7 +1078,7 @@ fmt.Println(resp, err)
10781078
cli := lark.New(lark.WithAppCredential("<APP_ID>", "<APP_SECRET>"))
10791079

10801080
resp, _, err := cli.Calendar.CreateCalendar(ctx, &lark.CreateCalendarReq{
1081-
Summary: ptr.String("<SUMMARY>"),
1081+
Summary: ptrString("<SUMMARY>"),
10821082
})
10831083
fmt.Println(resp, err)
10841084
```

‎_examples/calendar.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ import (
1919
"context"
2020
"fmt"
2121

22-
"github.com/chyroc/go-ptr"
23-
2422
"github.com/chyroc/lark"
23+
"github.com/chyroc/lark/_examples/util"
2524
)
2625

2726
// ExampleCalendar ...
@@ -32,7 +31,7 @@ func ExampleCalendar() {
3231
// create calendar
3332
{
3433
resp, _, err := cli.Calendar.CreateCalendar(ctx, &lark.CreateCalendarReq{
35-
Summary: ptr.String("<SUMMARY>"),
34+
Summary: util.PtrString("<SUMMARY>"),
3635
})
3736
fmt.Println(resp, err)
3837
}
@@ -41,7 +40,7 @@ func ExampleCalendar() {
4140
{
4241
resp, _, err := cli.Calendar.UpdateCalendar(ctx, &lark.UpdateCalendarReq{
4342
CalendarID: "<CALENDAR_ID>",
44-
Summary: ptr.String("<SUMMARY>"),
43+
Summary: util.PtrString("<SUMMARY>"),
4544
})
4645
fmt.Println(resp, err)
4746
}
@@ -95,7 +94,7 @@ func ExampleCalendar() {
9594
// create calendar event
9695
{
9796
resp, _, err := cli.Calendar.CreateCalendarEvent(ctx, &lark.CreateCalendarEventReq{
98-
Summary: ptr.String("<SUMMARY>"),
97+
Summary: util.PtrString("<SUMMARY>"),
9998
})
10099
fmt.Println(resp, err)
101100
}
@@ -104,7 +103,7 @@ func ExampleCalendar() {
104103
{
105104
resp, _, err := cli.Calendar.UpdateCalendarEvent(ctx, &lark.UpdateCalendarEventReq{
106105
CalendarID: "<CALENDAR_ID>",
107-
Summary: ptr.String("<SUMMARY>"),
106+
Summary: util.PtrString("<SUMMARY>"),
108107
})
109108
fmt.Println(resp, err)
110109
}
@@ -188,7 +187,7 @@ func ExampleCalendar() {
188187
EventID: "<EVENT_ID>",
189188
Attendees: []*lark.CreateCalendarEventAttendeeReqAttendee{
190189
{
191-
UserID: ptr.String("<USER_ID>"),
190+
UserID: util.PtrString("<USER_ID>"),
192191
},
193192
},
194193
})
@@ -231,7 +230,7 @@ func ExampleCalendar() {
231230
resp, _, err := cli.Calendar.GetCalendarFreeBusyList(ctx, &lark.GetCalendarFreeBusyListReq{
232231
TimeMin: "2020-10-28T12:00:00+08:00",
233232
TimeMax: "2020-10-29T12:00:00+08:00",
234-
UserID: ptr.String("<USER_ID>"),
233+
UserID: util.PtrString("<USER_ID>"),
235234
})
236235
fmt.Println(resp, err)
237236
}
@@ -242,7 +241,7 @@ func ExampleCalendar() {
242241
UserID: "<USER_ID>",
243242
StartTime: "2021-01-01",
244243
EndTime: "2021-01-02",
245-
Title: ptr.String("<TITLE>"),
244+
Title: util.PtrString("<TITLE>"),
246245
})
247246
fmt.Println(resp, err)
248247
}
@@ -258,7 +257,7 @@ func ExampleCalendar() {
258257
// subscribe calendar acl
259258
{
260259
resp, _, err := cli.Calendar.GenerateCaldavConf(ctx, &lark.GenerateCaldavConfReq{
261-
DeviceName: ptr.String("DEVICE_NAME"),
260+
DeviceName: util.PtrString("DEVICE_NAME"),
262261
})
263262
fmt.Println(resp, err)
264263
}

‎_examples/chat.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ import (
1919
"context"
2020
"fmt"
2121

22-
"github.com/chyroc/go-ptr"
23-
2422
"github.com/chyroc/lark"
23+
"github.com/chyroc/lark/_examples/util"
2524
)
2625

2726
// ExampleChat ...
@@ -32,7 +31,7 @@ func ExampleChat() {
3231
// create chat
3332
{
3433
resp, _, err := cli.Chat.CreateChat(ctx, &lark.CreateChatReq{
35-
Name: ptr.String("<CHAT_NAME>"),
34+
Name: util.PtrString("<CHAT_NAME>"),
3635
})
3736
fmt.Println(resp, err)
3837
}
@@ -41,7 +40,7 @@ func ExampleChat() {
4140
{
4241
resp, _, err := cli.Chat.UpdateChat(ctx, &lark.UpdateChatReq{
4342
ChatID: "<CHAT_ID>",
44-
Name: ptr.String("<CHAT_NAME>"),
43+
Name: util.PtrString("<CHAT_NAME>"),
4544
})
4645
fmt.Println(resp, err)
4746
}
@@ -99,7 +98,7 @@ func ExampleChat() {
9998
// search chat
10099
{
101100
resp, _, err := cli.Chat.SearchChat(ctx, &lark.SearchChatReq{
102-
Query: ptr.String("<SEARCH>"),
101+
Query: util.PtrString("<SEARCH>"),
103102
})
104103
fmt.Println(resp, err)
105104
}

‎_examples/isv.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ import (
2020
"fmt"
2121
"time"
2222

23-
"github.com/chyroc/go-ptr"
24-
2523
"github.com/chyroc/lark"
24+
"github.com/chyroc/lark/_examples/util"
2625
)
2726

2827
// RedisClient use this interface to mock redis client
@@ -73,7 +72,7 @@ func ExampleISV() {
7372
tenantKey1Cli := cli.WithTenant("<TENANT_KEY_1>")
7473

7574
resp, _, err := tenantKey1Cli.Chat.CreateChat(ctx, &lark.CreateChatReq{
76-
Name: ptr.String("<CHAT_NAME_1>"),
75+
Name: util.PtrString("<CHAT_NAME_1>"),
7776
})
7877
fmt.Println(resp, err)
7978
}
@@ -82,7 +81,7 @@ func ExampleISV() {
8281
tenantKey2Cli := cli.WithTenant("<TENANT_KEY_2>")
8382

8483
resp, _, err := tenantKey2Cli.Chat.CreateChat(ctx, &lark.CreateChatReq{
85-
Name: ptr.String("<CHAT_NAME_1>"),
84+
Name: util.PtrString("<CHAT_NAME_1>"),
8685
})
8786
fmt.Println(resp, err)
8887
}

‎_examples/util/ptr.go

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package util
2+
3+
func PtrString(s string) *string {
4+
return &s
5+
}

‎go.mod

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ module github.com/chyroc/lark
22

33
go 1.16
44

5-
require (
6-
github.com/chyroc/go-ptr v1.7.0
7-
github.com/stretchr/testify v1.8.1
8-
)
5+
require github.com/stretchr/testify v1.8.1

‎go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
github.com/chyroc/go-ptr v1.7.0 h1:wwm53+SeMvpQbBcsZviNPlz2djpxyELjVOZFHtUjHho=
2-
github.com/chyroc/go-ptr v1.7.0/go.mod h1:+AAlVrPed1XbNyqZ7r/J3o79V1awCvd5wrYkxu8tsow=
31
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
42
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
53
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎internal/reflect_test.go

+13-14
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"reflect"
2020
"testing"
2121

22-
"github.com/chyroc/go-ptr"
2322
"github.com/stretchr/testify/assert"
2423
)
2524

@@ -40,19 +39,19 @@ func Test_ReflectToString(t *testing.T) {
4039
as.Equal("true", ReflectToString(reflect.ValueOf(true)))
4140
as.Equal("false", ReflectToString(reflect.ValueOf(false)))
4241
as.Equal("<map[string]string Value>", ReflectToString(reflect.ValueOf(map[string]string{})))
43-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.String(string("1")))))
44-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.Int(int(1)))))
45-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.Int8(int8(1)))))
46-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.Int16(int16(1)))))
47-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.Int32(int32(1)))))
48-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.Int64(int64(1)))))
49-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.UInt(uint(1)))))
50-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.UInt8(uint8(1)))))
51-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.UInt16(uint16(1)))))
52-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.UInt32(uint32(1)))))
53-
as.Equal("1", ReflectToString(reflect.ValueOf(ptr.UInt64(uint64(1)))))
54-
as.Equal("true", ReflectToString(reflect.ValueOf(ptr.Bool(true))))
55-
as.Equal("false", ReflectToString(reflect.ValueOf(ptr.Bool(false))))
42+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrString(string("1")))))
43+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrInt(int(1)))))
44+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrInt8(int8(1)))))
45+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrInt16(int16(1)))))
46+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrInt32(int32(1)))))
47+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrInt64(int64(1)))))
48+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrUInt(uint(1)))))
49+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrUInt8(uint8(1)))))
50+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrUInt16(uint16(1)))))
51+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrUInt32(uint32(1)))))
52+
as.Equal("1", ReflectToString(reflect.ValueOf(ptrUInt64(uint64(1)))))
53+
as.Equal("true", ReflectToString(reflect.ValueOf(ptrBool(true))))
54+
as.Equal("false", ReflectToString(reflect.ValueOf(ptrBool(false))))
5655
}
5756

5857
func TestReflectToQueryString(t *testing.T) {

‎internal/tests_test.go

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package internal
2+
3+
func ptrStringNoNonePtr(s string) *string {
4+
if s == "" {
5+
return nil
6+
}
7+
return &s
8+
}
9+
10+
func ptrString(s string) *string {
11+
return &s
12+
}
13+
14+
func ptrInt(s int) *int {
15+
return &s
16+
}
17+
18+
func ptrInt8(s int8) *int8 {
19+
return &s
20+
}
21+
22+
func ptrInt16(s int16) *int16 {
23+
return &s
24+
}
25+
26+
func ptrInt32(s int32) *int32 {
27+
return &s
28+
}
29+
30+
func ptrInt64(s int64) *int64 {
31+
return &s
32+
}
33+
34+
func ptrUInt(s uint) *uint {
35+
return &s
36+
}
37+
38+
func ptrUInt8(s uint8) *uint8 {
39+
return &s
40+
}
41+
42+
func ptrUInt16(s uint16) *uint16 {
43+
return &s
44+
}
45+
46+
func ptrUInt32(s uint32) *uint32 {
47+
return &s
48+
}
49+
50+
func ptrUInt64(s uint64) *uint64 {
51+
return &s
52+
}
53+
54+
func ptrBool(s bool) *bool {
55+
return &s
56+
}

‎larkext/folder_impl.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"io"
2323
"io/ioutil"
2424

25-
"github.com/chyroc/go-ptr"
2625
"github.com/chyroc/lark"
2726
)
2827

@@ -79,7 +78,7 @@ func (r *Folder) newFolder(ctx context.Context, title string) (*Folder, error) {
7978
func (r *Folder) newSheet(ctx context.Context, title string) (*Sheet, error) {
8079
resp, _, err := r.larkClient.Drive.CreateSpreadsheet(ctx, &lark.CreateSpreadsheetReq{
8180
Title: &title,
82-
FolderToken: ptr.StringNoNonePtr(r.folderToken),
81+
FolderToken: ptrStringNoNonePtr(r.folderToken),
8382
})
8483
if err != nil {
8584
return nil, err
@@ -94,8 +93,8 @@ func (r *Folder) newDoc(ctx context.Context, title string, blocks ...*lark.DocBl
9493
}
9594
body, _ := json.Marshal(b)
9695
resp, _, err := r.larkClient.Drive.CreateDriveDoc(ctx, &lark.CreateDriveDocReq{
97-
Content: ptr.StringNoNonePtr(string(body)),
98-
FolderToken: ptr.StringNoNonePtr(r.folderToken),
96+
Content: ptrStringNoNonePtr(string(body)),
97+
FolderToken: ptrStringNoNonePtr(r.folderToken),
9998
})
10099
if err != nil {
101100
return nil, err

‎larkext/helper.go

+19
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,22 @@ func deleteFile(ctx context.Context, larkClient *lark.Lark, fileToken string, ty
6969
}
7070
return newTask(larkClient, resp.TaskID), nil
7171
}
72+
73+
func ptrStringNoNonePtr(s string) *string {
74+
if s == "" {
75+
return nil
76+
}
77+
return &s
78+
}
79+
80+
func ptrString(s string) *string {
81+
return &s
82+
}
83+
84+
func ptrInt64(s int64) *int64 {
85+
return &s
86+
}
87+
88+
func ptrBool(s bool) *bool {
89+
return &s
90+
}

0 commit comments

Comments
 (0)