twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-09-14 15:22:06 +00:00
Code Issues Projects Releases Wiki Activity

implement leavegroup

Browse Source
This commit is contained in:
Miguel Freitas 2015-04-24 12:01:55 -03:00
parent 7dc7065d07
commit 1341bfcfe9
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/twister.cpp
View File

@ -1127,7 +1127,7 @@ void storeGroupDM(const string &groupAlias, const StoredDirectMsg &stoDM)
GroupChat &group = m_groups[groupAlias]; GroupChat &group = m_groups[groupAlias];
BOOST_FOREACH(string const &member, group.m_members) { BOOST_FOREACH(string const &member, group.m_members) {
if( m_users.count(member) ) { if( m_users.count(member) && !m_users.at(member).m_ignoreGroups.count(groupAlias) ) {
storeNewDM(member,groupAlias,stoDM); storeNewDM(member,groupAlias,stoDM);
} }
} }
@ -3579,10 +3579,10 @@ Value newgroupdescription(const Array& params, bool fHelp)
Value leavegroup(const Array& params, bool fHelp) Value leavegroup(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 4 ) if (fHelp || params.size() != 2 )
throw runtime_error( throw runtime_error(
"leavegroup <username> <groupalias>\n" "leavegroup <username> <groupalias>\n"
"Stop receive chats from group"); "Stop receiving chats from group");
string strUser = params[0].get_str(); string strUser = params[0].get_str();
string strGroupAlias = params[1].get_str(); string strGroupAlias = params[1].get_str();
@ -3594,12 +3594,8 @@ Value leavegroup(const Array& params, bool fHelp)
if (!m_users.count(strUser)) if (!m_users.count(strUser))
throw JSONRPCError(RPC_INTERNAL_ERROR, "unknown user"); throw JSONRPCError(RPC_INTERNAL_ERROR, "unknown user");
throw JSONRPCError(RPC_INTERNAL_ERROR, "not implemented"); m_users[strUser].m_directmsg.erase(strGroupAlias);
/* m_users[strUser].m_ignoreGroups.insert(strGroupAlias);
* The idea is to remove strGroupAlias from m_users[strUser].m_directmsg and
* also add strGroupAlias to a m_users[strUser].m_ignoreGroups list to prevent
* being invited again. however how would one revert a leavegroup?
*/
return Value(); return Value();
} }

18
src/twister_utils.cpp
View File

@ -174,6 +174,14 @@ int saveUserData(std::string const& filename, std::map<std::string,UserData> con
} }
} }
} }
if( udata.m_ignoreGroups.size() ) {
entry &userData = userDict[i->first];
entry &ignoreGroupsList = userData["ignore_groups"];
BOOST_FOREACH( std::string const &n, udata.m_ignoreGroups) {
ignoreGroupsList.list().push_back(n);
}
}
} }
std::vector<char> buf; std::vector<char> buf;
@ -252,6 +260,16 @@ int loadUserData(std::string const& filename, std::map<std::string,UserData> &us
} }
} }
} }
const lazy_entry *ignoreGroupsList = userData->dict_find("ignore_groups");
if( ignoreGroupsList ) {
if( ignoreGroupsList->type() != lazy_entry::list_t ) goto data_error;
for( int j = 0; j < ignoreGroupsList->list_size(); j++ ) {
udata.m_ignoreGroups.insert( ignoreGroupsList->list_string_value_at(j) );
}
}
users[userDict.dict_at(i).first] = udata; users[userDict.dict_at(i).first] = udata;
} }
return 0; return 0;

2
src/twister_utils.h
View File

@ -33,6 +33,8 @@ struct UserData {
std::set<std::string> m_mentionsKeys; std::set<std::string> m_mentionsKeys;
// known posts mentioning this user (by users in m_following) // known posts mentioning this user (by users in m_following)
std::vector<libtorrent::entry> m_mentionsPosts; std::vector<libtorrent::entry> m_mentionsPosts;
// group chats to ignore
std::set<std::string> m_ignoreGroups;
}; };