Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-06 13:46:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added history for chat lobbies and disabled it until the lobbies are saved.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-01-18 20:47:32 +00:00
parent 51cfb0c5fe
commit 3a271abf11
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretroshare/src/pqi/p3historymgr.cc
View File

@ -65,11 +65,18 @@ void p3HistoryMgr::addMessage(bool incoming, const std::string &chatPeerId, cons
return; return;
} }
const RsChatLobbyMsgItem *cli = dynamic_cast<const RsChatLobbyMsgItem*>(chatItem);
if (cli) {
// disable history for chat lobbies until they are saved
return;
}
RsHistoryMsgItem* item = new RsHistoryMsgItem; RsHistoryMsgItem* item = new RsHistoryMsgItem;
item->chatPeerId = chatPeerId; item->chatPeerId = chatPeerId;
item->incoming = incoming; item->incoming = incoming;
item->peerId = peerId; item->peerId = peerId;
item->peerName = rsPeers->getPeerName(item->peerId); item->peerName = cli ? cli->nick : rsPeers->getPeerName(item->peerId);
item->sendTime = chatItem->sendTime; item->sendTime = chatItem->sendTime;
item->recvTime = chatItem->recvTime; item->recvTime = chatItem->recvTime;

14
libretroshare/src/services/p3chatservice.cc
View File

@ -378,7 +378,7 @@ bool p3ChatService::sendPrivateChat(const std::string &id, const std::wstrin
ChatLobbyId lobby_id ; ChatLobbyId lobby_id ;
if(isLobbyId(id,lobby_id)) if(isLobbyId(id,lobby_id))
return sendLobbyChat(msg,lobby_id) ; return sendLobbyChat(id,msg,lobby_id) ;
// make chat item.... // make chat item....
#ifdef CHAT_DEBUG #ifdef CHAT_DEBUG
@ -1736,7 +1736,7 @@ void p3ChatService::locked_initLobbyBouncableObject(const ChatLobbyId& lobby_id,
item.nick = lobby.nick_name ; item.nick = lobby.nick_name ;
} }
bool p3ChatService::sendLobbyChat(const std::wstring& msg, const ChatLobbyId& lobby_id) bool p3ChatService::sendLobbyChat(const std::string &id, const std::wstring& msg, const ChatLobbyId& lobby_id)
{ {
#ifdef CHAT_DEBUG #ifdef CHAT_DEBUG
std::cerr << "Sending chat lobby message to lobby " << std::hex << lobby_id << std::dec << std::endl; std::cerr << "Sending chat lobby message to lobby " << std::hex << lobby_id << std::dec << std::endl;
@ -1759,7 +1759,11 @@ bool p3ChatService::sendLobbyChat(const std::wstring& msg, const ChatLobbyId& lo
item.message = msg; item.message = msg;
} }
bounceLobbyObject(&item,rsPeers->getOwnId()) ; std::string ownId = rsPeers->getOwnId();
mHistoryMgr->addMessage(false, id, ownId, &item);
bounceLobbyObject(&item, ownId) ;
return true ; return true ;
} }
@ -2222,6 +2226,10 @@ void p3ChatService::unsubscribeChatLobby(const ChatLobbyId& id)
sendItem(item) ; sendItem(item) ;
} }
// remove history
mHistoryMgr->clear(it->second.virtual_peer_id);
// remove lobby information // remove lobby information
_chat_lobbys.erase(it) ; _chat_lobbys.erase(it) ;

2
libretroshare/src/services/p3chatservice.h
View File

@ -229,7 +229,7 @@ class p3ChatService: public p3Service, public p3Config, public pqiMonitor
/// receive and handle chat lobby item /// receive and handle chat lobby item
bool recvLobbyChat(RsChatLobbyMsgItem*,const std::string& src_peer_id) ; bool recvLobbyChat(RsChatLobbyMsgItem*,const std::string& src_peer_id) ;
bool sendLobbyChat(const std::wstring&, const ChatLobbyId&) ; bool sendLobbyChat(const std::string &id, const std::wstring&, const ChatLobbyId&) ;
void handleRecvLobbyInvite(RsChatLobbyInviteItem*) ; void handleRecvLobbyInvite(RsChatLobbyInviteItem*) ;
void checkAndRedirectMsgToLobby(RsChatMsgItem*) ; void checkAndRedirectMsgToLobby(RsChatMsgItem*) ;
void handleConnectionChallenge(RsChatLobbyConnectChallengeItem *item) ; void handleConnectionChallenge(RsChatLobbyConnectChallengeItem *item) ;