Skip to content

Commit 81e175a

Browse files
committed
feat: chaneg uid and gui to int64 #7
1 parent 8b0b092 commit 81e175a

20 files changed

+1374
-2338
lines changed

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ tools-install: ## Install tools.
5959
.PHONY: buf
6060
buf: ## run buf generate command.
6161
@printf $(COLOR) "Generating buf code..."
62+
@echo $(NEWLINE)
6263
buf generate
6364
@printf $(COLOR) "Done."
65+
@echo $(NEWLINE)
6466

6567
##################################################
6668
# General #

message/v1/message.pb.go

+194-138
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

message/v1/message.pb.validate.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

message/v1/message.proto

+23-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ syntax = "proto3";
33
package api.message.v1;
44

55
import "transport/response/response.proto";
6-
import "user/session/v1/session.proto";
76
import "validate/validate.proto";
87

98
option go_package = "github.com/go-goim/api/message/v1";
@@ -14,11 +13,22 @@ enum MessageContentType {
1413
Voice = 2;
1514
}
1615

16+
// define session type and status
17+
enum SessionType {
18+
SingleChat = 0;
19+
GroupChat = 1;
20+
// broadcast actually not a standard chat type, but we still use it here
21+
Broadcast = 2;
22+
// Channel is for user subscribed channel msgs
23+
Channel = 3;
24+
// 255 at most
25+
}
26+
1727
// SendMessageReq receive data from gateway
1828
message SendMessageReq {
19-
string from = 1 [(validate.rules).string.min_len = 20];
20-
string to = 2 [(validate.rules).string.min_len = 20];
21-
user.session.v1.SessionType session_type = 3;
29+
int64 from = 1 [(validate.rules).int64.gt = 0];
30+
int64 to = 2 [(validate.rules).int64.gt = 0];
31+
SessionType session_type = 3;
2232
optional string session_id = 4;
2333
MessageContentType content_type = 5 [(validate.rules).enum.defined_only = true];
2434
string content = 6 [(validate.rules).string = {
@@ -29,17 +39,17 @@ message SendMessageReq {
2939

3040
// SendMessageResp is response body for sendMessage
3141
message SendMessageResp {
32-
int64 session_id = 2;
33-
int64 msg_id = 3;
42+
string session_id = 1;
43+
int64 msg_id = 2;
3444
}
3545

3646
// Message is definition of message
3747
message Message {
3848
int64 msg_id = 1;
39-
string from = 2;
40-
string to = 3; // to user id or group id
41-
user.session.v1.SessionType session_type = 4;
42-
int64 session_id = 5;
49+
int64 from = 2;
50+
int64 to = 3; // user id or group id or room id etc.
51+
SessionType session_type = 4;
52+
string session_id = 5;
4353
MessageContentType content_type = 6;
4454
string content = 7;
4555
int64 create_time = 8;
@@ -49,20 +59,20 @@ message Message {
4959
message PushMessageReq {
5060
Message message = 1;
5161
// ToUsers is a list of user id who receive this message
52-
repeated string to_users = 2;
62+
repeated int64 to_users = 2;
5363
}
5464

5565
message PushMessageResp {
5666
transport.response.BaseResponse response = 1;
57-
repeated string failed_users = 2;
67+
repeated int64 failed_users = 2;
5868
}
5969

6070
service PushMessageService {
6171
rpc PushMessage(PushMessageReq) returns (PushMessageResp);
6272
}
6373

6474
message QueryOfflineMessageReq {
65-
string user_id = 1 [(validate.rules).string.min_len = 20];
75+
int64 uid = 1 [(validate.rules).int64.gt = 0];
6676
int64 last_msg_id = 2 [(validate.rules).int64.gt = 0];
6777
bool onlyCount = 3;
6878
int32 page = 4;

0 commit comments

Comments
 (0)