Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Final tweaks to dummy msgs:

Browse Source 
* Added MISSING_MSG flag for GUI support.
 * tweaked message.
 * disabled debugging messages.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4032 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-02-11 14:08:04 +00:00
parent 9d2809e4ce
commit 074f382eab
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libretroshare/src/retroshare/rsdistrib.h
View File

@ -27,23 +27,30 @@
*/
#define RS_DISTRIB_PRIVACY_MASK 0x000f /* who can publish & view */
#define RS_DISTRIB_AUTHEN_MASK 0x00f0 /* how to publish */
#define RS_DISTRIB_LISTEN_MASK 0x0f00 /* distribution flags */
#define RS_DISTRIB_UPDATE_MASK 0xf000 /* if sending a group info update */
#define RS_DISTRIB_PRIVACY_MASK 0x0000000f /* who can publish & view */
#define RS_DISTRIB_AUTHEN_MASK 0x000000f0 /* how to publish */
#define RS_DISTRIB_LISTEN_MASK 0x00000f00 /* distribution flags */
#define RS_DISTRIB_UPDATE_MASK 0x0000f000 /* if sending a group info update */
#define RS_DISTRIB_MISC_MASK 0x00ff0000 /* if sending a group info update */
#define RS_DISTRIB_PUBLIC 0x0001 /* anyone can publish */
#define RS_DISTRIB_PRIVATE 0x0002 /* anyone with key can publish */
#define RS_DISTRIB_ENCRYPTED 0x0004 /* need publish key to view */
#define RS_DISTRIB_PUBLIC 0x00000001 /* anyone can publish */
#define RS_DISTRIB_PRIVATE 0x00000002 /* anyone with key can publish */
#define RS_DISTRIB_ENCRYPTED 0x00000004 /* need publish key to view */
#define RS_DISTRIB_AUTHEN_REQ 0x0010 /* you must sign messages */
#define RS_DISTRIB_AUTHEN_ANON 0x0020 /* you can send anonymous messages */
#define RS_DISTRIB_AUTHEN_REQ 0x00000010 /* you must sign messages */
#define RS_DISTRIB_AUTHEN_ANON 0x00000020 /* you can send anonymous messages */
#define RS_DISTRIB_ADMIN 0x0100
#define RS_DISTRIB_PUBLISH 0x0200
#define RS_DISTRIB_SUBSCRIBED 0x0400
#define RS_DISTRIB_ADMIN 0x00000100
#define RS_DISTRIB_PUBLISH 0x00000200
#define RS_DISTRIB_SUBSCRIBED 0x00000400
#define RS_DISTRIB_UPDATE 0x1000
#define RS_DISTRIB_UPDATE 0x00001000
/* don't know if this should go with the above flags, as it message specific, and not a group settings.
* As it is currently not stored any configuration, it can be changed.
*/
#define RS_DISTRIB_MISSING_MSG 0x00010000
#endif

2
libretroshare/src/services/p3distrib.cc
View File

@ -53,7 +53,7 @@
//#define DISTRIB_DEBUG 1
//#define DISTRIB_THREAD_DEBUG 1
#define DISTRIB_DUMMYMSG_DEBUG 1
//#define DISTRIB_DUMMYMSG_DEBUG 1
RSA *extractPublicKey(RsTlvSecurityKey &key);
RSA *extractPrivateKey(RsTlvSecurityKey &key);

10
libretroshare/src/services/p3forums.cc
View File

@ -216,8 +216,9 @@ bool p3Forums::getForumThreadList(const std::string &fId, std::list<ThreadInfoSu
tis.childTS = msg->childTS;
/* dummy msg */
tis.title = L"Missing Message";
tis.title = L"[ ... Missing Message ... ]";
tis.msg = L"Placeholder for missing Message";
tis.msgflags |= RS_DISTRIB_MISSING_MSG;
msgs.push_back(tis);
}
@ -282,9 +283,9 @@ bool p3Forums::getForumThreadMsgList(const std::string &fId, const std::string &
tis.childTS = msg->childTS;
/* dummy msg */
tis.title = L"Missing Message";
tis.title = L"[ ... Missing Message ... ]";
tis.msg = L"Placeholder for missing Message";
/* the rest must be gotten from the derived Msg */
tis.msgflags |= RS_DISTRIB_MISSING_MSG;
msgs.push_back(tis);
}
@ -313,8 +314,9 @@ bool p3Forums::getForumMessage(const std::string &fId, const std::string &mId, F
info.ts = dmsg->timestamp;
info.childTS = dmsg->childTS;
info.title = L"Missing Message";
info.title = L"[ ... Missing Message ... ]";
info.msg = L"Placeholder for missing Message";
info.msgflags |= RS_DISTRIB_MISSING_MSG;
info.srcId = "";