Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-04 17:15:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated protobuf definitions to include ChatHistory,

Browse Source 
added YOURSELF to friends options,
Improved Search Results Interface.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6136 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-02-22 20:51:24 +00:00
parent ddfc9636de
commit e833fd1aaa
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsctrl/src/Makefile
View File

@ -15,7 +15,7 @@ HCODE = $(patsubst %.proto,$(CDESTPATH)/%.pb.h, $(PROTO))
PYCODE = $(patsubst %.proto,$(PYDESTPATH)/%_pb2.py, $(PROTO)) PYCODE = $(patsubst %.proto,$(PYDESTPATH)/%_pb2.py, $(PROTO))
all: allc all: allc python_proto
allc: $(CCODE) allc: $(CCODE)
echo $(CCODE) echo $(CCODE)

33
rsctrl/src/definition/chat.proto
View File

@ -19,6 +19,7 @@ enum RequestMsgIds {
MsgId_RequestSetLobbyNickname = 4; MsgId_RequestSetLobbyNickname = 4;
MsgId_RequestRegisterEvents = 5; MsgId_RequestRegisterEvents = 5;
MsgId_RequestSendMessage = 6; MsgId_RequestSendMessage = 6;
MsgId_RequestChatHistory = 7;
} }
enum ResponseMsgIds { enum ResponseMsgIds {
@ -27,6 +28,7 @@ enum ResponseMsgIds {
MsgId_ResponseSetLobbyNickname = 4; MsgId_ResponseSetLobbyNickname = 4;
MsgId_ResponseRegisterEvents = 5; MsgId_ResponseRegisterEvents = 5;
MsgId_ResponseSendMessage = 6; MsgId_ResponseSendMessage = 6;
MsgId_ResponseChatHistory = 7;
// EVENTS // EVENTS
MsgId_EventLobbyInvite = 101; MsgId_EventLobbyInvite = 101;
@ -223,21 +225,22 @@ message ResponseSendMessage {
} }
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
//// Chat History. // Chat History.
//// THIS IS NOT IMPLEMENTED YET, DONT USE. // INITIALLY THIS WILL ONLY WORK WITH PRIVATE CHATS.
// // NEED TO EXTEND INTERNALS TO HANDLE LOBBIES.
//// REQUEST: RequestChatHistory
//message RequestChatHistory { // REQUEST: RequestChatHistory
// required ChatId id = 1; /* lobby or chat, group id */ message RequestChatHistory {
// required bool incoming = 2; required ChatId id = 1; /* lobby or chat, group id */
//} }
//
//// RESPONSE: ResponseChatHistory // RESPONSE: ResponseChatHistory
//message ResponseChatHistory { message ResponseChatHistory {
// required rsctrl.core.Status status = 1; required rsctrl.core.Status status = 1;
// repeated ChatMessage msg = 2; required ChatId id = 2; /* lobby or chat, group id */
//} repeated ChatMessage msgs = 3;
// }
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////

9
rsctrl/src/definition/core.proto
View File

@ -74,10 +74,11 @@ message Location {
message Person { message Person {
enum Relationship { enum Relationship {
FRIEND = 1; YOURSELF = 1;
FRIEND_OF_MANY_FRIENDS = 2; // 3+ at the moment. FRIEND = 2;
FRIEND_OF_FRIENDS = 3; // 1 or 2. FRIEND_OF_MANY_FRIENDS = 3; // 3+ at the moment.
UNKNOWN = 4; FRIEND_OF_FRIENDS = 4; // 1 or 2.
UNKNOWN = 5;
} }
required string gpg_id = 1; required string gpg_id = 1;

4
rsctrl/src/definition/search.proto
View File

@ -33,7 +33,7 @@ message SearchHit {
required rsctrl.core.File file = 1; required rsctrl.core.File file = 1;
required uint32 loc = 2; // OR of LocFlag so uint field required uint32 loc = 2; // OR of LocFlag so uint field
required uint32 no_hits = 3; // NOT USED YET. required uint32 no_hits = 3; // NOT USED YET.
repeated string alt_names = 4;
} }
message SearchSet { message SearchSet {
@ -100,8 +100,8 @@ message RequestListSearches {
// Empty search_ids => all results. // Empty search_ids => all results.
message RequestSearchResults { message RequestSearchResults {
optional uint32 result_limit = 1;
repeated uint32 search_ids = 2; repeated uint32 search_ids = 2;
} }
// RESPONSE: ResponseSearchResults // RESPONSE: ResponseSearchResults