refactor: 粉丝与关注

xh-polaris · Dec 15, 2023 · b957daa · b957daa
1 parent ed613e5
commit b957daa
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/meowchat/core_api/common.proto b/meowchat/core_api/common.proto
@@ -0,0 +1,24 @@
+syntax = "proto3";
+
+package meowchat.core_api;
+
+option go_package = "meowchat/core_api";
+option java_package = "com.xhpolaris.idlgen.meowchat.coreapi";
+option java_outer_classname = "CommonProto";
+option java_multiple_files = true;
+
+import "meowchat/system/common.proto";
+
+message User {
+  string id = 1;
+  string nickname = 2;
+  string avatarUrl = 3;
+  optional string motto = 4;
+  optional int64 follower = 5;
+  optional int64 following = 6;
+  optional int64 article = 7;
+  optional int64 like = 8;
+  optional bool isFollowing = 9;
+  repeated system.Role roles = 10;
+  optional bool enableDebug = 11;
+}
diff --git a/meowchat/core_api/like.proto b/meowchat/core_api/like.proto
@@ -13,6 +13,7 @@ import "meowchat/user/common.proto";
 import "meowchat/core_api/moment.proto";
 import "meowchat/core_api/post.proto";
 import "meowchat/core_api/comment.proto";
+import "meowchat/core_api/common.proto";
 
 message DoLikeReq {
   string targetId = 1;
@@ -61,7 +62,7 @@ message GetLikedUsersReq {
 }
 
 message GetLikedUsersResp {
-  repeated user.UserPreview users = 1;
+  repeated core_api.User users = 1;
 }
 
 message GetUserLikeContentsReq {
@@ -72,7 +73,7 @@ message GetUserLikeContentsReq {
 
 message GetUserLikeContentsResp {
   repeated core_api.Moment  moments = 1;
-  repeated user.UserPreview users = 2;
+  repeated core_api.User users = 2;
   repeated core_api.Post    posts = 3;
   repeated core_api.Comment comments = 4;
   int64 total = 5;

diff --git a/meowchat/core_api/user.proto b/meowchat/core_api/user.proto
@@ -10,21 +10,7 @@ option java_multiple_files = true;
 import "basic/pagination.proto";
 
 import "meowchat/user/common.proto";
-import "meowchat/system/common.proto";
-
-message User {
-  string id = 1;
-  string nickname = 2;
-  string avatarUrl = 3;
-  optional string motto = 4;
-  optional int64 follower = 5;
-  optional int64 following = 6;
-  optional int64 article = 7;
-  optional int64 like = 8;
-  optional bool isFollowing = 9;
-  repeated system.Role roles = 10;
-  optional bool enableDebug = 11;
-}
+import "meowchat/core_api/common.proto";
 
 message GetUserInfoReq {
   optional string userId = 1;