Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 02:36:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #119 from PhenomRetroShare/AddWebUI_BroadcastInLobbiesList

Browse source 
Add Broadcast in list of lobbies.
This commit is contained in:
Cyril Soler 2015-10-03 10:29:08 -04:00
commit 7fa687a037
2 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libresapi/src/api/ChatHandler.cpp
View file

@ -71,13 +71,17 @@ StreamBase& operator <<(StreamBase& left, KeyValueReference<ChatLobbyId> kv)
StreamBase& operator << (StreamBase& left, ChatHandler::Lobby& l) StreamBase& operator << (StreamBase& left, ChatHandler::Lobby& l)
{ {
ChatId chatId(l.id);
if (l.is_broadcast)
chatId = ChatId::makeBroadcastId();
left << makeKeyValueReference("id", l.id) left << makeKeyValueReference("id", l.id)
<< makeKeyValue("chat_id", ChatId(l.id).toStdString()) << makeKeyValue("chat_id", chatId.toStdString())
<< makeKeyValueReference("name",l.name) << makeKeyValueReference("name",l.name)
<< makeKeyValueReference("topic", l.topic) << makeKeyValueReference("topic", l.topic)
<< makeKeyValueReference("subscribed", l.subscribed) << makeKeyValueReference("subscribed", l.subscribed)
<< makeKeyValueReference("auto_subscribe", l.auto_subscribe) << makeKeyValueReference("auto_subscribe", l.auto_subscribe)
<< makeKeyValueReference("is_private", l.is_private) << makeKeyValueReference("is_private", l.is_private)
<< makeKeyValueReference("is_broadcast", l.is_broadcast)
<< makeKeyValueReference("gxs_id", l.gxs_id); << makeKeyValueReference("gxs_id", l.gxs_id);
return left; return left;
} }
@ -163,11 +167,26 @@ void ChatHandler::tick()
l.subscribed = true; l.subscribed = true;
l.auto_subscribe = info.lobby_flags & RS_CHAT_LOBBY_FLAGS_AUTO_SUBSCRIBE; l.auto_subscribe = info.lobby_flags & RS_CHAT_LOBBY_FLAGS_AUTO_SUBSCRIBE;
l.is_private = !(info.lobby_flags & RS_CHAT_LOBBY_FLAGS_PUBLIC); l.is_private = !(info.lobby_flags & RS_CHAT_LOBBY_FLAGS_PUBLIC);
l.is_broadcast = false;
l.gxs_id = info.gxs_id; l.gxs_id = info.gxs_id;
lobbies.push_back(l); lobbies.push_back(l);
} }
} }
ChatId id = ChatId::makeBroadcastId();
{
Lobby l;
l.id = id.toLobbyId();
l.name = "BroadCast";
l.topic = "Retroshare broadcast chat: messages are sent to all connected friends.";
l.subscribed = true;
l.auto_subscribe = false;
l.is_private = false;
l.is_broadcast = true;
l.gxs_id = id.toGxsId();
lobbies.push_back(l);
}
std::vector<VisibleChatLobbyRecord> unsubscribed_lobbies; std::vector<VisibleChatLobbyRecord> unsubscribed_lobbies;
mRsMsgs->getListOfNearbyChatLobbies(unsubscribed_lobbies); mRsMsgs->getListOfNearbyChatLobbies(unsubscribed_lobbies);
for(std::vector<VisibleChatLobbyRecord>::iterator vit = unsubscribed_lobbies.begin(); vit != unsubscribed_lobbies.end(); ++vit) for(std::vector<VisibleChatLobbyRecord>::iterator vit = unsubscribed_lobbies.begin(); vit != unsubscribed_lobbies.end(); ++vit)
@ -182,6 +201,7 @@ void ChatHandler::tick()
l.subscribed = false; l.subscribed = false;
l.auto_subscribe = info.lobby_flags & RS_CHAT_LOBBY_FLAGS_AUTO_SUBSCRIBE; l.auto_subscribe = info.lobby_flags & RS_CHAT_LOBBY_FLAGS_AUTO_SUBSCRIBE;
l.is_private = !(info.lobby_flags & RS_CHAT_LOBBY_FLAGS_PUBLIC); l.is_private = !(info.lobby_flags & RS_CHAT_LOBBY_FLAGS_PUBLIC);
l.is_broadcast = false;
l.gxs_id = RsGxsId(); l.gxs_id = RsGxsId();
lobbies.push_back(l); lobbies.push_back(l);
} }
@ -411,7 +431,7 @@ void ChatHandler::getPlainText(const std::string& in, std::string &out, std::vec
} }
} }
void ChatHandler::handleWildcard(Request &req, Response &resp) void ChatHandler::handleWildcard(Request &/*req*/, Response &resp)
{ {
RS_STACK_MUTEX(mMtx); /********** LOCKED **********/ RS_STACK_MUTEX(mMtx); /********** LOCKED **********/
resp.mDataStream.getStreamToMember(); resp.mDataStream.getStreamToMember();
@ -468,7 +488,7 @@ void ChatHandler::handleSubscribeLobby(Request &req, Response &resp)
resp.setFail("lobby join failed. (See console for more info)"); resp.setFail("lobby join failed. (See console for more info)");
} }
void ChatHandler::handleUnsubscribeLobby(Request &req, Response &resp) void ChatHandler::handleUnsubscribeLobby(Request &req, Response &/*resp*/)
{ {
ChatLobbyId id = 0; ChatLobbyId id = 0;
req.mStream << makeKeyValueReference("id", id); req.mStream << makeKeyValueReference("id", id);
@ -647,17 +667,17 @@ void ChatHandler::handleInfo(Request &req, Response &resp)
resp.setOk(); resp.setOk();
} }
void ChatHandler::handleTypingLabel(Request &req, Response &resp) void ChatHandler::handleTypingLabel(Request &/*req*/, Response &/*resp*/)
{ {
} }
void ChatHandler::handleSendStatus(Request &req, Response &resp) void ChatHandler::handleSendStatus(Request &/*req*/, Response &/*resp*/)
{ {
} }
void ChatHandler::handleUnreadMsgs(Request &req, Response &resp) void ChatHandler::handleUnreadMsgs(Request &/*req*/, Response &resp)
{ {
RS_STACK_MUTEX(mMtx); /********** LOCKED **********/ RS_STACK_MUTEX(mMtx); /********** LOCKED **********/

4
libresapi/src/api/ChatHandler.h
View file

@ -57,13 +57,14 @@ public:
class Lobby{ class Lobby{
public: public:
Lobby(): id(0), subscribed(false), auto_subscribe(false), is_private(false){} Lobby(): id(0), subscribed(false), auto_subscribe(false), is_private(false), is_broadcast(false){}
ChatLobbyId id; ChatLobbyId id;
std::string name; std::string name;
std::string topic; std::string topic;
bool subscribed; bool subscribed;
bool auto_subscribe; bool auto_subscribe;
bool is_private; bool is_private;
bool is_broadcast;
RsGxsId gxs_id;// for subscribed lobbies: the id we use to write messages RsGxsId gxs_id;// for subscribed lobbies: the id we use to write messages
@ -75,6 +76,7 @@ public:
&& subscribed == l.subscribed && subscribed == l.subscribed
&& auto_subscribe == l.auto_subscribe && auto_subscribe == l.auto_subscribe
&& is_private == l.is_private && is_private == l.is_private
&& is_broadcast == l.is_broadcast
&& gxs_id == l.gxs_id; && gxs_id == l.gxs_id;
} }
}; };