Skip to content

Commit 07f7853

Browse files
mo3etmo3et
authored
refactor: renamed non-standard package aliases and field names. (#549)
* fix: fix uncurrent err handle. * refactor: renamed non-standard aliases and field names.
1 parent 4f4ece4 commit 07f7853

35 files changed

+296
-276
lines changed

‎internal/api/chat/chat.go‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,26 @@
1515
package chat
1616

1717
import (
18-
"github.com/openimsdk/chat/internal/api/util"
1918
"io"
2019
"time"
2120

21+
"github.com/openimsdk/chat/internal/api/util"
22+
2223
"github.com/gin-gonic/gin"
2324
"github.com/openimsdk/chat/pkg/common/apistruct"
24-
chatconstant "github.com/openimsdk/chat/pkg/common/constant"
25+
"github.com/openimsdk/chat/pkg/common/constant"
2526
"github.com/openimsdk/chat/pkg/common/imapi"
2627
"github.com/openimsdk/chat/pkg/common/mctx"
2728
"github.com/openimsdk/chat/pkg/protocol/admin"
28-
"github.com/openimsdk/chat/pkg/protocol/chat"
29-
"github.com/openimsdk/protocol/constant"
29+
chatpb "github.com/openimsdk/chat/pkg/protocol/chat"
30+
constantpb "github.com/openimsdk/protocol/constant"
3031
"github.com/openimsdk/protocol/sdkws"
3132
"github.com/openimsdk/tools/a2r"
3233
"github.com/openimsdk/tools/apiresp"
3334
"github.com/openimsdk/tools/errs"
3435
)
3536

36-
func New(chatClient chat.ChatClient, adminClient admin.AdminClient, imApiCaller imapi.CallerInterface, api *util.Api) *Api {
37+
func New(chatClient chatpb.ChatClient, adminClient admin.AdminClient, imApiCaller imapi.CallerInterface, api *util.Api) *Api {
3738
return &Api{
3839
Api: api,
3940
chatClient: chatClient,
@@ -44,15 +45,15 @@ func New(chatClient chat.ChatClient, adminClient admin.AdminClient, imApiCaller
4445

4546
type Api struct {
4647
*util.Api
47-
chatClient chat.ChatClient
48+
chatClient chatpb.ChatClient
4849
adminClient admin.AdminClient
4950
imApiCaller imapi.CallerInterface
5051
}
5152

5253
// ################## ACCOUNT ##################
5354

5455
func (o *Api) SendVerifyCode(c *gin.Context) {
55-
req, err := a2r.ParseRequest[chat.SendVerifyCodeReq](c)
56+
req, err := a2r.ParseRequest[chatpb.SendVerifyCodeReq](c)
5657
if err != nil {
5758
apiresp.GinError(c, err)
5859
return
@@ -72,11 +73,11 @@ func (o *Api) SendVerifyCode(c *gin.Context) {
7273
}
7374

7475
func (o *Api) VerifyCode(c *gin.Context) {
75-
a2r.Call(chat.ChatClient.VerifyCode, o.chatClient, c)
76+
a2r.Call(chatpb.ChatClient.VerifyCode, o.chatClient, c)
7677
}
7778

7879
func (o *Api) RegisterUser(c *gin.Context) {
79-
req, err := a2r.ParseRequest[chat.RegisterUserReq](c)
80+
req, err := a2r.ParseRequest[chatpb.RegisterUserReq](c)
8081
if err != nil {
8182
apiresp.GinError(c, err)
8283
return
@@ -130,7 +131,7 @@ func (o *Api) RegisterUser(c *gin.Context) {
130131
}
131132

132133
func (o *Api) Login(c *gin.Context) {
133-
req, err := a2r.ParseRequest[chat.LoginReq](c)
134+
req, err := a2r.ParseRequest[chatpb.LoginReq](c)
134135
if err != nil {
135136
apiresp.GinError(c, err)
136137
return
@@ -159,17 +160,17 @@ func (o *Api) Login(c *gin.Context) {
159160
}
160161

161162
func (o *Api) ResetPassword(c *gin.Context) {
162-
a2r.Call(chat.ChatClient.ResetPassword, o.chatClient, c)
163+
a2r.Call(chatpb.ChatClient.ResetPassword, o.chatClient, c)
163164
}
164165

165166
func (o *Api) ChangePassword(c *gin.Context) {
166-
a2r.Call(chat.ChatClient.ChangePassword, o.chatClient, c)
167+
a2r.Call(chatpb.ChatClient.ChangePassword, o.chatClient, c)
167168
}
168169

169170
// ################## USER ##################
170171

171172
func (o *Api) UpdateUserInfo(c *gin.Context) {
172-
req, err := a2r.ParseRequest[chat.UpdateUserInfoReq](c)
173+
req, err := a2r.ParseRequest[chatpb.UpdateUserInfoReq](c)
173174
if err != nil {
174175
apiresp.GinError(c, err)
175176
return
@@ -185,10 +186,10 @@ func (o *Api) UpdateUserInfo(c *gin.Context) {
185186
return
186187
}
187188
var imToken string
188-
if opUserType == chatconstant.NormalUser {
189+
if opUserType == constant.NormalUser {
189190
imToken, err = o.imApiCaller.ImAdminTokenWithDefaultAdmin(c)
190-
} else if opUserType == chatconstant.AdminUser {
191-
imToken, err = o.imApiCaller.UserToken(c, o.GetDefaultIMAdminUserID(), constant.AdminPlatformID)
191+
} else if opUserType == constant.AdminUser {
192+
imToken, err = o.imApiCaller.UserToken(c, o.GetDefaultIMAdminUserID(), constantpb.AdminPlatformID)
192193
} else {
193194
apiresp.GinError(c, errs.ErrArgs.WrapMsg("opUserType unknown"))
194195
return
@@ -220,23 +221,23 @@ func (o *Api) UpdateUserInfo(c *gin.Context) {
220221
}
221222

222223
func (o *Api) FindUserPublicInfo(c *gin.Context) {
223-
a2r.Call(chat.ChatClient.FindUserPublicInfo, o.chatClient, c)
224+
a2r.Call(chatpb.ChatClient.FindUserPublicInfo, o.chatClient, c)
224225
}
225226

226227
func (o *Api) FindUserFullInfo(c *gin.Context) {
227-
a2r.Call(chat.ChatClient.FindUserFullInfo, o.chatClient, c)
228+
a2r.Call(chatpb.ChatClient.FindUserFullInfo, o.chatClient, c)
228229
}
229230

230231
func (o *Api) SearchUserFullInfo(c *gin.Context) {
231-
a2r.Call(chat.ChatClient.SearchUserFullInfo, o.chatClient, c)
232+
a2r.Call(chatpb.ChatClient.SearchUserFullInfo, o.chatClient, c)
232233
}
233234

234235
func (o *Api) SearchUserPublicInfo(c *gin.Context) {
235-
a2r.Call(chat.ChatClient.SearchUserPublicInfo, o.chatClient, c)
236+
a2r.Call(chatpb.ChatClient.SearchUserPublicInfo, o.chatClient, c)
236237
}
237238

238239
func (o *Api) GetTokenForVideoMeeting(c *gin.Context) {
239-
a2r.Call(chat.ChatClient.GetTokenForVideoMeeting, o.chatClient, c)
240+
a2r.Call(chatpb.ChatClient.GetTokenForVideoMeeting, o.chatClient, c)
240241
}
241242

242243
// ################## APPLET ##################
@@ -259,8 +260,8 @@ func (o *Api) OpenIMCallback(c *gin.Context) {
259260
apiresp.GinError(c, err)
260261
return
261262
}
262-
req := &chat.OpenIMCallbackReq{
263-
Command: c.Query(constant.CallbackCommand),
263+
req := &chatpb.OpenIMCallbackReq{
264+
Command: c.Query(constantpb.CallbackCommand),
264265
Body: string(body),
265266
}
266267
if _, err := o.chatClient.OpenIMCallback(c, req); err != nil {
@@ -273,7 +274,7 @@ func (o *Api) OpenIMCallback(c *gin.Context) {
273274
func (o *Api) SearchFriend(c *gin.Context) {
274275
req, err := a2r.ParseRequest[struct {
275276
UserID string `json:"userID"`
276-
chat.SearchUserInfoReq
277+
chatpb.SearchUserInfoReq
277278
}](c)
278279
if err != nil {
279280
apiresp.GinError(c, err)
@@ -293,7 +294,7 @@ func (o *Api) SearchFriend(c *gin.Context) {
293294
return
294295
}
295296
if len(userIDs) == 0 {
296-
apiresp.GinSuccess(c, &chat.SearchUserInfoResp{})
297+
apiresp.GinSuccess(c, &chatpb.SearchUserInfoResp{})
297298
return
298299
}
299300
req.SearchUserInfoReq.UserIDs = userIDs

‎internal/api/chat/start.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package chat
33
import (
44
"context"
55
"fmt"
6+
67
"github.com/gin-gonic/gin"
78
chatmw "github.com/openimsdk/chat/internal/api/mw"
89
"github.com/openimsdk/chat/internal/api/util"

‎internal/api/mw/mw.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/gin-gonic/gin"
2121
"github.com/openimsdk/chat/pkg/common/constant"
2222
"github.com/openimsdk/chat/pkg/protocol/admin"
23-
constant2 "github.com/openimsdk/protocol/constant"
23+
constantpb "github.com/openimsdk/protocol/constant"
2424
"github.com/openimsdk/tools/apiresp"
2525
"github.com/openimsdk/tools/errs"
2626
)
@@ -66,8 +66,8 @@ func (o *MW) isValidToken(c *gin.Context, userID string, token string) error {
6666
}
6767
if v, ok := resp.TokensMap[token]; ok {
6868
switch v {
69-
case constant2.NormalToken:
70-
case constant2.KickedToken:
69+
case constantpb.NormalToken:
70+
case constantpb.KickedToken:
7171
return errs.ErrTokenExpired.Wrap()
7272
default:
7373
return errs.ErrTokenUnknown.Wrap()

‎internal/rpc/admin/admin.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ package admin
1717
import (
1818
"context"
1919
"fmt"
20+
"math/rand"
21+
"time"
22+
2023
"github.com/openimsdk/tools/errs"
2124
"github.com/openimsdk/tools/mcontext"
2225
"github.com/openimsdk/tools/utils/datautil"
23-
"math/rand"
24-
"time"
2526

2627
"github.com/openimsdk/chat/pkg/common/constant"
2728
"github.com/openimsdk/chat/pkg/common/db/dbutil"
28-
admin2 "github.com/openimsdk/chat/pkg/common/db/table/admin"
29+
admindb "github.com/openimsdk/chat/pkg/common/db/table/admin"
2930
"github.com/openimsdk/chat/pkg/common/mctx"
3031
"github.com/openimsdk/chat/pkg/eerrs"
3132
"github.com/openimsdk/chat/pkg/protocol/admin"
@@ -77,7 +78,7 @@ func (o *adminServer) AddAdminAccount(ctx context.Context, req *admin.AddAdminAc
7778
return nil, errs.ErrDuplicateKey.WrapMsg("the account is registered")
7879
}
7980

80-
adm := &admin2.Admin{
81+
adm := &admindb.Admin{
8182
Account: req.Account,
8283
Password: req.Password,
8384
FaceURL: req.FaceURL,
@@ -86,7 +87,7 @@ func (o *adminServer) AddAdminAccount(ctx context.Context, req *admin.AddAdminAc
8687
Level: 80,
8788
CreateTime: time.Now(),
8889
}
89-
if err = o.Database.AddAdminAccount(ctx, []*admin2.Admin{adm}); err != nil {
90+
if err = o.Database.AddAdminAccount(ctx, []*admindb.Admin{adm}); err != nil {
9091
return nil, err
9192
}
9293
return &admin.AddAdminAccountResp{}, nil

‎internal/rpc/admin/applet.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ package admin
1616

1717
import (
1818
"context"
19-
"github.com/openimsdk/tools/utils/datautil"
2019
"strings"
2120
"time"
2221

22+
"github.com/openimsdk/tools/utils/datautil"
23+
2324
"github.com/google/uuid"
2425
"github.com/openimsdk/tools/errs"
2526

2627
"github.com/openimsdk/chat/pkg/common/constant"
27-
admin2 "github.com/openimsdk/chat/pkg/common/db/table/admin"
28+
admindb "github.com/openimsdk/chat/pkg/common/db/table/admin"
2829
"github.com/openimsdk/chat/pkg/common/mctx"
2930
"github.com/openimsdk/chat/pkg/protocol/admin"
3031
"github.com/openimsdk/chat/pkg/protocol/common"
@@ -43,7 +44,7 @@ func (o *adminServer) AddApplet(ctx context.Context, req *admin.AddAppletReq) (*
4344
if !(req.Status == constant.StatusOnShelf || req.Status == constant.StatusUnShelf) {
4445
return nil, errs.ErrArgs.WrapMsg("invalid status")
4546
}
46-
m := admin2.Applet{
47+
m := admindb.Applet{
4748
ID: req.Id,
4849
Name: req.Name,
4950
AppID: req.AppID,
@@ -59,7 +60,7 @@ func (o *adminServer) AddApplet(ctx context.Context, req *admin.AddAppletReq) (*
5960
if m.ID == "" {
6061
m.ID = uuid.New().String()
6162
}
62-
if err := o.Database.CreateApplet(ctx, []*admin2.Applet{&m}); err != nil {
63+
if err := o.Database.CreateApplet(ctx, []*admindb.Applet{&m}); err != nil {
6364
return nil, err
6465
}
6566
return &admin.AddAppletResp{}, nil
@@ -76,7 +77,7 @@ func (o *adminServer) DelApplet(ctx context.Context, req *admin.DelAppletReq) (*
7677
if err != nil {
7778
return nil, err
7879
}
79-
if ids := datautil.Single(req.AppletIds, datautil.Slice(applets, func(e *admin2.Applet) string { return e.ID })); len(ids) > 0 {
80+
if ids := datautil.Single(req.AppletIds, datautil.Slice(applets, func(e *admindb.Applet) string { return e.ID })); len(ids) > 0 {
8081
return nil, errs.ErrArgs.WrapMsg("ids not found: " + strings.Join(ids, ", "))
8182
}
8283
if err := o.Database.DelApplet(ctx, req.AppletIds); err != nil {

‎internal/rpc/admin/check.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package admin
1616

1717
import (
1818
"context"
19+
1920
"github.com/openimsdk/chat/pkg/common/db/dbutil"
2021
"github.com/openimsdk/chat/pkg/eerrs"
2122
"github.com/openimsdk/chat/pkg/protocol/admin"

‎internal/rpc/admin/invitation.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ package admin
1616

1717
import (
1818
"context"
19-
"github.com/openimsdk/tools/utils/datautil"
2019
"math/rand"
2120
"strings"
2221
"time"
2322

23+
"github.com/openimsdk/tools/utils/datautil"
24+
2425
"github.com/openimsdk/tools/errs"
2526

26-
admin2 "github.com/openimsdk/chat/pkg/common/db/table/admin"
27+
admindb "github.com/openimsdk/chat/pkg/common/db/table/admin"
2728
"github.com/openimsdk/chat/pkg/common/mctx"
2829
"github.com/openimsdk/chat/pkg/eerrs"
2930
"github.com/openimsdk/chat/pkg/protocol/admin"
@@ -44,13 +45,13 @@ func (o *adminServer) AddInvitationCode(ctx context.Context, req *admin.AddInvit
4445
return nil, err
4546
}
4647
if len(irs) > 0 {
47-
ids := datautil.Slice(irs, func(info *admin2.InvitationRegister) string { return info.InvitationCode })
48+
ids := datautil.Slice(irs, func(info *admindb.InvitationRegister) string { return info.InvitationCode })
4849
return nil, errs.ErrArgs.WrapMsg("code existed", "ids", ids)
4950
}
5051
now := time.Now()
51-
codes := make([]*admin2.InvitationRegister, 0, len(req.Codes))
52+
codes := make([]*admindb.InvitationRegister, 0, len(req.Codes))
5253
for _, code := range req.Codes {
53-
codes = append(codes, &admin2.InvitationRegister{
54+
codes = append(codes, &admindb.InvitationRegister{
5455
InvitationCode: code,
5556
UsedByUserID: "",
5657
CreateTime: now,
@@ -73,7 +74,7 @@ func (o *adminServer) GenInvitationCode(ctx context.Context, req *admin.GenInvit
7374
req.Chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
7475
}
7576
now := time.Now()
76-
invitationRegisters := make([]*admin2.InvitationRegister, 0, req.Num)
77+
invitationRegisters := make([]*admindb.InvitationRegister, 0, req.Num)
7778
codes := make([]string, 0, req.Num)
7879
for i := int32(0); i < req.Num; i++ {
7980
buf := make([]byte, req.Len)
@@ -82,7 +83,7 @@ func (o *adminServer) GenInvitationCode(ctx context.Context, req *admin.GenInvit
8283
buf[i] = req.Chars[b%byte(len(req.Chars))]
8384
}
8485
codes = append(codes, string(buf))
85-
invitationRegisters = append(invitationRegisters, &admin2.InvitationRegister{
86+
invitationRegisters = append(invitationRegisters, &admindb.InvitationRegister{
8687
InvitationCode: string(buf),
8788
UsedByUserID: "",
8889
CreateTime: now,
@@ -96,7 +97,7 @@ func (o *adminServer) GenInvitationCode(ctx context.Context, req *admin.GenInvit
9697
return nil, err
9798
}
9899
if len(irs) > 0 {
99-
ids := datautil.Single(codes, datautil.Slice(irs, func(ir *admin2.InvitationRegister) string { return ir.InvitationCode }))
100+
ids := datautil.Single(codes, datautil.Slice(irs, func(ir *admindb.InvitationRegister) string { return ir.InvitationCode }))
100101
return nil, errs.ErrArgs.WrapMsg(strings.Join(ids, ", "))
101102
}
102103
if err := o.Database.CreatInvitationRegister(ctx, invitationRegisters); err != nil {
@@ -173,7 +174,7 @@ func (o *adminServer) DelInvitationCode(ctx context.Context, req *admin.DelInvit
173174
return nil, err
174175
}
175176
if len(irs) != len(req.Codes) {
176-
ids := datautil.Single(req.Codes, datautil.Slice(irs, func(ir *admin2.InvitationRegister) string { return ir.InvitationCode }))
177+
ids := datautil.Single(req.Codes, datautil.Slice(irs, func(ir *admindb.InvitationRegister) string { return ir.InvitationCode }))
177178
return nil, errs.ErrArgs.WrapMsg("code not found " + strings.Join(ids, ", "))
178179
}
179180
if err := o.Database.DelInvitationRegister(ctx, req.Codes); err != nil {

‎internal/rpc/admin/ip_forbidden.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"time"
2020

21-
admin2 "github.com/openimsdk/chat/pkg/common/db/table/admin"
21+
admindb "github.com/openimsdk/chat/pkg/common/db/table/admin"
2222
"github.com/openimsdk/chat/pkg/common/mctx"
2323
"github.com/openimsdk/chat/pkg/protocol/admin"
2424
)
@@ -51,9 +51,9 @@ func (o *adminServer) AddIPForbidden(ctx context.Context, req *admin.AddIPForbid
5151
return nil, err
5252
}
5353
now := time.Now()
54-
tables := make([]*admin2.IPForbidden, 0, len(req.Forbiddens))
54+
tables := make([]*admindb.IPForbidden, 0, len(req.Forbiddens))
5555
for _, forbidden := range req.Forbiddens {
56-
tables = append(tables, &admin2.IPForbidden{
56+
tables = append(tables, &admindb.IPForbidden{
5757
IP: forbidden.Ip,
5858
LimitLogin: forbidden.LimitLogin,
5959
LimitRegister: forbidden.LimitRegister,

0 commit comments

Comments
 (0)