77 Commits

Author SHA1 Message Date
csoler
b002e08c06 changed storage delay of lobby cache, update time to last rejected (instead of accepted) message in cache and increased delay between connexion challenges
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-25 20:53:59 +00:00
csoler
fe156882ae added keep-alive packet to lobbies to maintain up-to-date list of listenners. Will need to play a bit with delays...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-23 22:49:47 +00:00
csoler
a7af95c0fd removed debug info from chat lobbies in p3chatservice, and set the time limit for nicknames records to 30mins.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-19 22:05:38 +00:00
thunder2
3a271abf11 Added history for chat lobbies and disabled it until the lobbies are saved.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-18 20:47:32 +00:00
thunder2
35c7605704 Extracted a new widget ChatWidget for the basic chat handling from the PopupChatDialog and use it in ChatLobbyDialog too.
Added an own ui for the ChatLobbyDialog.
Saved settings of the ChatLobbyDialog.
Changed parameters of RsStatus interface from "std::string" to "const std::string&"
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-17 20:36:36 +00:00
csoler
7d7101a62d improved counting method for public lobbies
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-15 13:00:57 +00:00
csoler
036bd64811 - Added chat lobby privacy type to lobby invite => lobby type is propagated correctly to friends
that are invited.
- added auto-clean of nicknames
- added auto-clean of public lobby records.

Warning: this commit breaks one small bit of compatibility:
 * direct invitations from new versions will pass accross versions (private lobbies will need the new version)
 * but people can still join public lobbies accross versions.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-14 21:09:04 +00:00
csoler
b3050b6b29 removed debug output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4791 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 21:51:57 +00:00
csoler
17ea85e820 setup min lobby list request time to 20 sec.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 21:26:14 +00:00
csoler
ba109726ed fixed proper count of nicknames (not fixed yet in gui. A update is missing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4788 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 21:23:16 +00:00
csoler
9597571841 corrected bug preventing 1st time message to go to lobby for new subscribers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 20:56:03 +00:00
csoler
2aea0e5f30 corrected undefined variable causing public lobby list not to update properly
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 20:05:24 +00:00
thunder2
6c626e180f Chat lobby:
- added new notifier to p3ChatService
GUI:
- list all public and private chat lobbies
- added subscribe/unsubscribe
- added new basic widget ChatTabWidget and use it in PopupChatWindow and ChatLobbyDialog
- added a tabbed dialog for every subscribed chat lobby

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 00:13:25 +00:00
csoler
1a191c7f91 commited currentgui state. Not working
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-07 21:37:31 +00:00
csoler
485c394e2b added interface methods for public lobby exchange and subscription to public lobbies. Need a GUI now
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-07 19:52:58 +00:00
csoler
434ba06c82 added exchange and auto-update of public chat lobby lists.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-07 13:33:30 +00:00
csoler
e9d6940b09 Improvements to chat lobbies:
- added generic methods and items for bouncing generic objects through lobbies
	- added handling of peer typing status
	- proper handling of peer join/leave lobby
	- added sub item ids to lobby messages to allow proper message splitting
	- made 2 different message splitting methods for normal chat vs. lobbies. In v0.6, we'll have to handle all messages the same way.
	- added parent id to RsChatLobbyMsgItem, to allow threaded chat.
	- added possibility to make a lobby public/private (not yet fully working)
	- added items for requesting/exchanging list of public lobbies at friends' (not yet fully working)
	- major cleaning of p3chatservice.cc

Next move:
	- gui for listing friend public lobbies, joining them, etc.
	- load/save of persistent lobbies.
	- autoremove of inactive lobbies

Warning: lobby message items of this version are incompatible with previous versions. It won't crash, but
messages will not pass through.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-06 22:17:08 +00:00
csoler
94608c8467 added list of participants in lobby, handled large messages using splitted display (cannot ensure rebuilt message yet.)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-29 14:19:53 +00:00
csoler
fb263f2fcc fixed duplication of messages in ChatLobbyDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-29 08:40:23 +00:00
csoler
b6f8e2a306 added leaving notification to chat lobby
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-28 22:33:37 +00:00
csoler
bcd2973b32 put debug info between ifdefs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4739 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-27 15:35:43 +00:00
csoler
3addb36e4c added unsubscribe protocol, updated GUI
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-27 13:47:37 +00:00
csoler
cc57ab2462 added load/save of default nickname, plus some debugging
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-26 22:43:54 +00:00
csoler
9b79d70fa8 debugging of connectivity challenge
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4736 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-26 17:39:38 +00:00
csoler
d4abb42788 added challenge protocol to securely improve lobby connectivity
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4735 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-26 14:45:45 +00:00
csoler
816a477806 bug corrections
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4712 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-07 00:12:17 +00:00
csoler
0086e182ec bug fixes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-04 22:22:15 +00:00
csoler
71a079b55f added chat lobby creation window
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-04 22:03:54 +00:00
csoler
a0e3522273 debugged basic chat lobby communication
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-04 14:31:48 +00:00
csoler
46f1e2b562 added invitation system
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-28 22:36:13 +00:00
csoler
b01470c639 small corrections.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-27 21:46:49 +00:00
csoler
6c93253050 - derived new class of PopupChatDialog to handle chat lobbies
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-27 21:04:10 +00:00
csoler
f4e41b3247 added algorithms to handle lobby invites
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-26 21:23:31 +00:00
csoler
cd30487898 Added send and forward methods. Improved data structures.
Next: serialization of ChatLobbyItems



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-25 21:31:52 +00:00
csoler
5cdc36d730 Basic methods and a bit of interface for chat lobby.
Next:
- chat lobby algorithmics (cache+broadcast system)
- invitation handling
- specification of chat lobby window with list of known/unknown participants


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4685 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-23 22:10:37 +00:00
thunder2
086f33c1a6 Add the private chat message to the history after removing the private chat queue (when the user has read the message).
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4628 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-10-01 20:50:39 +00:00
thunder2
29c090fb44 Moved the chat history into the libretroshare.
Now the history is saved encrypted. Please delete all files with "chat*.xml" in your profile folder.
Added new config p3HistoryMgr and interface p3History.
Added new option to limit the count of the saved history items.
Added new simple html optimizer "RsHtml::optimizeHtml" to reduce the size of the html strings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4623 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-09-29 09:20:09 +00:00
drbob
f6f721a492 Removed p3ConnectMgr. Replaced it with p3LinkMgr, p3NetMgr and p3PeerMgr.
Updated references in other classes.
 * Most classes need p3LinkMgr, and only use two functions: OwnId() and getOnlineList()




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4416 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-09 18:39:34 +00:00
thunder2
de87a89437 Added a name to the RsMutex class.
You can enable the debugging of the waiting time for a lock of RsMutex in rsthreads.h with
#define RSMUTEX_DEBUG 300
That means all locks waiting longer than 300ms are logged into the stderr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-04 22:59:39 +00:00
chrisparker126
28e5f1b8f3 refactored p3chatservice move avatar declaration to p3chat header
and encapsulating config methods

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4365 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-06-30 20:50:08 +00:00
csoler
31b950a8fe Corrected bugs in chat:
- sending large messages now works, thanks to RsChatMsgItem splitting (not 100% backward compatible, but avoids crashing)
	- removed crash due to dynamic_cast onto a deleted pointer.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-05-04 20:52:45 +00:00
chrisparker126
2f559dae96 removed channel delete feature
added optimisation suggestion with load/savelist

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3920 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-12-18 19:35:07 +00:00
thunder2
76f51d05b3 Corrected some erases of std::iterators.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3665 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-11 15:52:12 +00:00
thunder2
cfa10c6f80 Added receive time to ChatInfo - recompile of gui needed.
Use receive time for chat information to have the right order in the history (problem of time zones and wrong clocks).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3593 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-03 10:08:58 +00:00
thunder2
c12ec062a2 Fixed deadlock in saving chat messages with an own avatar.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-21 17:32:31 +00:00
thunder2
37fe5ff3a3 Save incoming not read private chat messages in config and delete it after reading.
Added queue for outgoing private offline chat messages. The queue is also saved until the private chat message could be delivered.
It does not work in the short time between the shutdown of the peer and the switch of the state to offline for that peer. For this we need a response of the peer.
Need recompile.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3517 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-21 00:08:06 +00:00
thunder2
16b1dd7eb1 Remove memory leak in p3ChatService::receiveAvatarJpegData, when a peer changed the avatar.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-13 20:28:21 +00:00
thunder2
8213a2aa77 Chat service:
- Added send time to ChatInfo.

Chat:
- Reworked IMHistoryKeeper to save only needed data as raw data (not formatted from PeersDialog).
- Renamed the public chat history file from "his1.xml" to "chatPublic.xml" and moved it from data dir to config dir. The current history is lost. Please delete the file "his1.xml" manually.
- Optimized save of the history. Save only when changed, also during the runtime.
- Clear the history in PeersDialog clears the IMHistoryKeeper too.
- New setting to send chat message with Ctrl+Return. Changed the check for Enter in PeersDialog and PopupChatDialog from textChanged to eventFilter.
- Smileys are inserted at the current cursor position, not added at the end.
- Don't send emty messages.

New class ChatStyle:
- Created a new class for the work with chat styles and smileys.
- Currently only two internal styles are available - private and public. Later more external styles planned.
- Moved functions for loading and showing the emoticons from PeersDialog and PopupChatDialog to the new class.

Private chat:
- Split private chat style into incoming.htm and outgoing.htm.
- Removed style change.

Public chat:
- New chat style incoming.htm, outgoing.htm, hincoming.htm and houtgoing.htm.

Chat feed:
- Show links and emoticons if they are enabled for public chat.

PeersDialog:
- Show the own name and location only once at start and not with QTimer every 1.5 second.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-04 14:23:30 +00:00
thunder2
48acd856af Added the peers custom state string to NotifyBase::notifyCustomState and to the signal NotifyQt::notifyCustomState.
Changed the display of the peers custom state string in PopupChatDialog from QTimer to signal.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-02 10:15:13 +00:00
thunder2
7f837e9778 Splitted queue of chat messages in chat service into public and private queue.
Reworked the interface of the chat service. So full recomile is needed.
With disabled flags for private chat (RS_CHAT_OPEN_NEW and RS_CHAT_REOPEN), the incoming private chat messages are queued (only for the runtime) until the user shows the private chat dialog.
When a new chat message is available, the icon of the gpg and ssl contact changed in MessengerWindow and PeersDialog and a new tray icon is shown.
Fixed compiler warning.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 17:56:15 +00:00