Skip to content

Commit 3f3b695

Browse files
gonpombo8gonpombo8
authored
Merge branch 'main' into feat/send-comms-to-peer
2 parents 54b2457 + 3614ead commit 3f3b695

File tree

5 files changed

+439
-0
lines changed

5 files changed

+439
-0
lines changed

‎proto/decentraland/social_service/v1/social_service_v1.proto

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
syntax = "proto3";
2+
package decentraland.social_service.v1;
3+
4+
// This message is a response that is sent from the server to the client
5+
message FriendshipEventResponse {
6+
oneof body {
7+
RequestResponse request = 1;
8+
AcceptResponse accept = 2;
9+
RejectResponse reject = 4;
10+
DeleteResponse delete = 5;
11+
CancelResponse cancel = 6;
12+
}
13+
}
14+
15+
message FriendshipEventResponses {
16+
repeated FriendshipEventResponse responses = 1;
17+
}
18+
19+
message FriendshipEventPayload {
20+
oneof body {
21+
RequestPayload request = 1;
22+
AcceptPayload accept = 2;
23+
RejectPayload reject = 4;
24+
DeletePayload delete = 5;
25+
CancelPayload cancel = 6;
26+
}
27+
}
28+
29+
message User { string address = 1; }
30+
31+
message Users { repeated User users = 1; }
32+
33+
message RequestResponse {
34+
User user = 1;
35+
int64 created_at = 2;
36+
optional string message = 3;
37+
}
38+
39+
message RequestPayload {
40+
User user = 1;
41+
optional string message = 3;
42+
}
43+
44+
message Requests {
45+
int64 total = 1; // Total amount of friendship requests
46+
repeated RequestResponse items = 2;
47+
}
48+
49+
message RequestEvents {
50+
Requests outgoing = 1; // Requests the authed user have sent to users
51+
Requests incoming = 2; // Requests the authed user have received from users
52+
}
53+
54+
message AcceptResponse { User user = 1; }
55+
56+
message AcceptPayload { User user = 1; }
57+
58+
message RejectResponse { User user = 1; }
59+
60+
message RejectPayload { User user = 1; }
61+
62+
message DeleteResponse { User user = 1; }
63+
64+
message DeletePayload { User user = 1; }
65+
66+
message CancelResponse { User user = 1; }
67+
68+
message CancelPayload { User user = 1; }
69+
70+
message UpdateFriendshipPayload {
71+
FriendshipEventPayload event = 1;
72+
// For internal use only, subject to change.
73+
optional Payload auth_token = 2;
74+
}
75+
76+
message MutualFriendsPayload {
77+
User user = 1;
78+
// For internal use only, subject to change.
79+
optional Payload auth_token = 2;
80+
}
81+
82+
message Payload {
83+
// For internal use only, subject to change.
84+
optional string synapse_token = 1;
85+
}
86+
87+
message BadRequestError {
88+
string message = 1;
89+
}
90+
message UnauthorizedError {
91+
string message = 1;
92+
}
93+
message ForbiddenError {
94+
string message = 1;
95+
}
96+
message TooManyRequestsError {
97+
string message = 1;
98+
}
99+
message InternalServerError {
100+
string message = 1;
101+
}
102+
103+
message UsersResponse {
104+
oneof response {
105+
Users users = 1;
106+
InternalServerError internal_server_error = 2;
107+
UnauthorizedError unauthorized_error = 3;
108+
ForbiddenError forbidden_error = 4;
109+
TooManyRequestsError too_many_requests_error = 5;
110+
BadRequestError bad_request_error = 6;
111+
}
112+
}
113+
114+
message RequestEventsResponse {
115+
oneof response {
116+
RequestEvents events = 1;
117+
InternalServerError internal_server_error = 2;
118+
UnauthorizedError unauthorized_error = 3;
119+
ForbiddenError forbidden_error = 4;
120+
TooManyRequestsError too_many_requests_error = 5;
121+
}
122+
}
123+
124+
message UpdateFriendshipResponse {
125+
oneof response {
126+
FriendshipEventResponse event = 1;
127+
InternalServerError internal_server_error = 2;
128+
UnauthorizedError unauthorized_error = 3;
129+
ForbiddenError forbidden_error = 4;
130+
TooManyRequestsError too_many_requests_error = 5;
131+
BadRequestError bad_request_error = 6;
132+
}
133+
}
134+
135+
message SubscribeFriendshipEventsUpdatesResponse {
136+
oneof response {
137+
FriendshipEventResponses events = 1;
138+
InternalServerError internal_server_error = 2;
139+
UnauthorizedError unauthorized_error = 3;
140+
ForbiddenError forbidden_error = 4;
141+
TooManyRequestsError too_many_requests_error = 5;
142+
}
143+
}
144+
145+
// @deprecated, only available for old explorer compatibility
146+
service FriendshipsService {
147+
// Get the list of friends for the authenticated user
148+
rpc GetFriends(Payload) returns (stream UsersResponse) {}
149+
150+
// Get the list of mutual friends between the authenticated user and the one in the parameter
151+
rpc GetMutualFriends(MutualFriendsPayload) returns (stream UsersResponse) {}
152+
153+
// Get the list of request events for the authenticated user
154+
rpc GetRequestEvents(Payload) returns (RequestEventsResponse) {}
155+
156+
// Update friendship status: REQUEST, ACCEPT, REJECT, CANCEL, DELETE
157+
rpc UpdateFriendshipEvent(UpdateFriendshipPayload)
158+
returns (UpdateFriendshipResponse) {}
159+
160+
// Subscribe to updates of friendship status: REQUEST, ACCEPT, REJECT, CANCEL, DELETE
161+
rpc SubscribeFriendshipEventsUpdates(Payload)
162+
returns (stream SubscribeFriendshipEventsUpdatesResponse) {}
163+
}

‎proto/decentraland/social_service/v2/social_service_v2.proto

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
syntax = "proto3";
2+
package decentraland.social_service.v2;
3+
4+
import "google/protobuf/empty.proto";
5+
6+
// Errors
7+
8+
message InvalidFriendshipAction {}
9+
10+
message InternalServerError {}
11+
12+
// Types
13+
14+
message User { string address = 1; }
15+
16+
message RequestResponse {
17+
User user = 1;
18+
int64 created_at = 2;
19+
optional string message = 3;
20+
}
21+
22+
message RequestPayload {
23+
User user = 1;
24+
optional string message = 3;
25+
}
26+
27+
message Requests {
28+
repeated RequestResponse requests = 1;
29+
}
30+
31+
message AcceptResponse { User user = 1; }
32+
33+
message AcceptPayload { User user = 1; }
34+
35+
message RejectResponse { User user = 1; }
36+
37+
message RejectPayload { User user = 1; }
38+
39+
message DeleteResponse { User user = 1; }
40+
41+
message DeletePayload { User user = 1; }
42+
43+
message CancelResponse { User user = 1; }
44+
45+
message CancelPayload { User user = 1; }
46+
47+
message UpsertFriendshipPayload {
48+
oneof action {
49+
RequestPayload request = 1;
50+
AcceptPayload accept = 2;
51+
RejectPayload reject = 4;
52+
DeletePayload delete = 5;
53+
CancelPayload cancel = 6;
54+
}
55+
}
56+
57+
message MutualFriendsPayload {
58+
User user = 1;
59+
}
60+
61+
message UsersResponse {
62+
repeated User users = 1;
63+
}
64+
65+
message FriendshipRequestsResponse {
66+
oneof response {
67+
Requests requests = 1;
68+
InternalServerError internal_server_error = 2;
69+
}
70+
}
71+
72+
message UpsertFriendshipResponse {
73+
message Accepted {}
74+
oneof response {
75+
Accepted accepted = 1;
76+
InvalidFriendshipAction invalid_friendship_action = 2;
77+
InternalServerError internal_server_error = 3;
78+
}
79+
}
80+
81+
message FriendshipUpdate {
82+
oneof update {
83+
RequestResponse request = 1;
84+
AcceptResponse accept = 2;
85+
RejectResponse reject = 4;
86+
DeleteResponse delete = 5;
87+
CancelResponse cancel = 6;
88+
}
89+
}
90+
91+
// @deprecated, used for initial migration without Matrix
92+
service SocialService {
93+
// Get the list of friends for the authenticated user
94+
rpc GetFriends(google.protobuf.Empty) returns (stream UsersResponse) {}
95+
96+
// Get the list of mutual friends between the authenticated user and the one in the parameter
97+
rpc GetMutualFriends(MutualFriendsPayload) returns (stream UsersResponse) {}
98+
99+
// Get the pending friendship requests for the authenticated user
100+
rpc GetPendingFriendshipRequests(google.protobuf.Empty) returns (FriendshipRequestsResponse) {}
101+
102+
// Get the sent friendship requests for the authenticated user
103+
rpc GetSentFriendshipRequests(google.protobuf.Empty) returns (FriendshipRequestsResponse) {}
104+
105+
// Create or update friendship status: REQUEST, ACCEPT, REJECT, CANCEL, DELETE
106+
rpc UpsertFriendship(UpsertFriendshipPayload)
107+
returns (UpsertFriendshipResponse) {}
108+
109+
// Subscribe to updates of friendship status: REQUEST, ACCEPT, REJECT, CANCEL, DELETE
110+
rpc SubscribeToFriendshipUpdates(google.protobuf.Empty)
111+
returns (stream FriendshipUpdate) {}
112+
}

0 commit comments

Comments
 (0)