mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-20 12:24:24 -04:00
Fixed up the retroshare message system.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
07a458367b
commit
8527a5e53f
17 changed files with 947 additions and 609 deletions
|
@ -98,24 +98,20 @@ virtual void unlockData() = 0;
|
|||
const PersonInfo *getPerson(std::string id);
|
||||
const DirInfo *getDirectory(std::string id, std::string path);
|
||||
|
||||
const std::list<MessageInfo> &getMessages()
|
||||
{ return mMessageList; }
|
||||
|
||||
const std::map<RsChanId, ChannelInfo> &getChannels()
|
||||
{ return mChannelMap; }
|
||||
|
||||
const std::map<RsChanId, ChannelInfo> &getOurChannels()
|
||||
{ return mChannelOwnMap; }
|
||||
|
||||
const MessageInfo *getMessage(std::string cId, std::string mId);
|
||||
const MessageInfo *getChannelMsg(std::string chId, std::string mId);
|
||||
//const MessageInfo *getChannelMsg(std::string chId, std::string mId);
|
||||
|
||||
std::list<ChatInfo> getChatNew()
|
||||
{
|
||||
std::list<ChatInfo> newList = mChatList;
|
||||
mChatList.clear();
|
||||
return newList;
|
||||
}
|
||||
//std::list<ChatInfo> getChatNew()
|
||||
// {
|
||||
// std::list<ChatInfo> newList = mChatList;
|
||||
// mChatList.clear();
|
||||
// return newList;
|
||||
// }
|
||||
|
||||
const std::list<FileInfo> &getRecommendList()
|
||||
{ return mRecommendList; }
|
||||
|
@ -162,10 +158,10 @@ void fillLists(); /* create some dummy data to display */
|
|||
std::list<PersonInfo> mRemoteDirList;
|
||||
std::list<PersonInfo> mLocalDirList;
|
||||
std::list<FileTransferInfo> mTransferList;
|
||||
std::list<MessageInfo> mMessageList;
|
||||
//std::list<MessageInfo> mMessageList;
|
||||
std::map<RsChanId, ChannelInfo> mChannelMap;
|
||||
std::map<RsChanId, ChannelInfo> mChannelOwnMap;
|
||||
std::list<ChatInfo> mChatList;
|
||||
//std::list<ChatInfo> mChatList;
|
||||
std::list<FileInfo> mRecommendList;
|
||||
|
||||
bool mChanged[NumOfFlags];
|
||||
|
@ -218,9 +214,9 @@ virtual int FileSetBandwidthTotals(float outkB, float inkB) = 0;
|
|||
|
||||
/****************************************/
|
||||
/* Message Items */
|
||||
virtual int MessageSend(MessageInfo &info) = 0;
|
||||
virtual int MessageDelete(std::string mid) = 0;
|
||||
virtual int MessageRead(std::string mid) = 0;
|
||||
//virtual int MessageSend(MessageInfo &info) = 0;
|
||||
//virtual int MessageDelete(std::string mid) = 0;
|
||||
//virtual int MessageRead(std::string mid) = 0;
|
||||
|
||||
/* Channel Items */
|
||||
virtual int ChannelCreateNew(ChannelInfo &info) = 0;
|
||||
|
@ -228,7 +224,7 @@ virtual int ChannelSendMsg(ChannelInfo &info) = 0;
|
|||
|
||||
/****************************************/
|
||||
/* Chat */
|
||||
virtual int ChatSend(ChatInfo &ci) = 0;
|
||||
//virtual int ChatSend(ChatInfo &ci) = 0;
|
||||
|
||||
/****************************************/
|
||||
|
||||
|
@ -244,6 +240,9 @@ virtual int ClearInBroadcast() = 0;
|
|||
virtual int ClearInSubscribe() = 0;
|
||||
virtual int ClearInRecommend() = 0;
|
||||
|
||||
virtual bool IsInChat(std::string id) = 0; /* friend : chat msgs */
|
||||
virtual bool IsInMsg(std::string id) = 0; /* friend : msg recpts*/
|
||||
|
||||
/****************************************/
|
||||
/* RsIface Networking */
|
||||
//virtual int NetworkDHTActive(bool active) = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue