123

bin/client_msg/common.proto

@@ -317,6 +317,8 @@ message ResFriendList{
 message FriendRequestItem{
   UserInfo info = 1;
   string request_msg = 2;
+  string create_time = 3;
+  int32 status = 4;
 }
 
 //请求好友申请列表

src/server/datacenter/request_add_friend/request_add_friend.go

@@ -112,13 +112,12 @@ func ProcessFriendRequest(requestID string, status int) (*FriendRequest, error)
 	return request_data, nil
 }
 
-func GetPendingRequests(userID string) ([]*FriendRequest, error) {
+func GetRequests(userID string) ([]*FriendRequest, error) {
 	rows, err := mysqlmgr.Query(`
 		SELECT id, create_time, request_id, from_user_id, to_user_id, message
 		FROM request_add_friend
-		WHERE to_user_id = ? AND status = ? LIMIT 100 `,
+		WHERE to_user_id = ?  LIMIT 100 `,
 		userID,
-		RequestStatusPending,
 	)
 	if err != nil {
 		return nil, err

src/server/hall/friends/friends.go

@@ -62,7 +62,7 @@ func GetFriendRquestList(args []interface{}) {
 	m := args[0].(*msg.ReqFriendRequestList)
 	a := args[1].(gate.Agent)
 	user_id := m.UserId
-	list, err := requestaddfriend.GetPendingRequests(user_id)
+	list, err := requestaddfriend.GetRequests(user_id)
 	if err != nil {
 		a.WriteMsg(&msg.ResFriendRequestList{
 			Success: false,
@@ -74,10 +74,10 @@ func GetFriendRquestList(args []interface{}) {
 		return
 	}
 	var ids = make([]string, 0)
-	var msg_list = map[string]string{}
+	var user_list = make(map[string]*requestaddfriend.FriendRequest, 0)
 	for _, v := range list {
 		ids = append(ids, v.FromUserID)
-		msg_list[v.FromUserID] = v.Message
+		user_list[v.FromUserID] = v
 	}
 	users, err := usercenter.GetUsersByIDs(ids)
 
@@ -85,7 +85,9 @@ func GetFriendRquestList(args []interface{}) {
 		var temp = make([]*msg.FriendRequestItem, 0)
 		for _, v := range users {
 			temp = append(temp, &msg.FriendRequestItem{
-				RequestMsg: msg_list[v.UserID],
+				RequestMsg: user_list[v.UserID].Message,
+				Status:     int32(user_list[v.UserID].Status),
+				CreateTime: user_list[v.UserID].CreateTime.GoString(),
 				Info: &msg.UserInfo{
 					UserId: v.UserID,
 					MHead:  v.Head,

src/server/msg/common.pb.go

@@ -2848,6 +2848,8 @@ type FriendRequestItem struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Info          *UserInfo              `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"`
 	RequestMsg    string                 `protobuf:"bytes,2,opt,name=request_msg,json=requestMsg,proto3" json:"request_msg,omitempty"`
+	CreateTime    string                 `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	Status        int32                  `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -2896,6 +2898,20 @@ func (x *FriendRequestItem) GetRequestMsg() string {
 	return ""
 }
 
+func (x *FriendRequestItem) GetCreateTime() string {
+	if x != nil {
+		return x.CreateTime
+	}
+	return ""
+}
+
+func (x *FriendRequestItem) GetStatus() int32 {
+	if x != nil {
+		return x.Status
+	}
+	return 0
+}
+
 // 请求好友申请列表
 type ReqFriendRequestList struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
@@ -3578,11 +3594,14 @@ const file_common_proto_rawDesc = "" +
 	"\rResFriendList\x12\x18\n" +
 	"\asuccess\x18\x01 \x01(\bR\asuccess\x12\"\n" +
 	"\aerr_msg\x18\x02 \x01(\v2\t.MsgErrorR\x06errMsg\x12\x1d\n" +
-	"\x04list\x18\x03 \x03(\v2\t.UserInfoR\x04list\"S\n" +
+	"\x04list\x18\x03 \x03(\v2\t.UserInfoR\x04list\"\x8c\x01\n" +
 	"\x11FriendRequestItem\x12\x1d\n" +
 	"\x04info\x18\x01 \x01(\v2\t.UserInfoR\x04info\x12\x1f\n" +
 	"\vrequest_msg\x18\x02 \x01(\tR\n" +
-	"requestMsg\"/\n" +
+	"requestMsg\x12\x1f\n" +
+	"\vcreate_time\x18\x03 \x01(\tR\n" +
+	"createTime\x12\x16\n" +
+	"\x06status\x18\x04 \x01(\x05R\x06status\"/\n" +
 	"\x14ReqFriendRequestList\x12\x17\n" +
 	"\auser_id\x18\x01 \x01(\tR\x06userId\"|\n" +
 	"\x14ResFriendRequestList\x12\x18\n" +