rexy712/matrix_thing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

... Fixed it

Browse Source
This commit is contained in:
rexy712 2019-07-29 15:15:09 -07:00
parent 8233c56c6e
commit 6feadbcdf8
4 changed files with 35 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/raii/rjp_string.hpp
View File

@ -68,6 +68,7 @@ namespace raii{
return *this;
}
};
rjp_string rjp_string_from_key(RJP_value* val);
}

4
src/matrix/room_url_list.cpp
View File

@ -28,7 +28,7 @@ namespace matrix{
m_ban(s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/ban?access_token=" + access_token),
m_unban(s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/unban?access_token=" + access_token),
m_invite(s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/invite?access_token=" + access_token),
m_members(s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/members?access_token=" + access_token),
m_members(s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/joined_members?access_token=" + access_token),
m_upgrade(s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/upgrade?access_token=" + access_token){}
const raii::string& room_url_list::join_room(void)const{
return m_join;
@ -77,7 +77,7 @@ namespace matrix{
m_ban = s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/ban?access_token=" + access_token;
m_unban = s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/unban?access_token=" + access_token;
m_invite = s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/invite?access_token=" + access_token;
m_members = s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/members?access_token=" + access_token;
m_members = s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/joined_members?access_token=" + access_token;
m_upgrade = s_proto + homeserver + "/_matrix/client/r0/rooms/" + roomid + "/upgrade?access_token=" + access_token;
}

60
src/matrix/roomcxn.cpp
View File

@ -47,71 +47,19 @@ namespace matrix{
return leave_room();
}
enum class membership_event_type{
leave,
join,
invite,
inval
};
static membership_event_type str_to_membership_event(const char* str){
if(!strcmp(str, "leave"))
return membership_event_type::leave;
else if(!strcmp(str, "join"))
return membership_event_type::join;
else if(!strcmp(str, "invite"))
return membership_event_type::invite;
else
return membership_event_type::inval;
}
std::vector<raii::rjp_string> roomcxn::members(void)const{
struct user_info{
RJP_int age;
membership_event_type op;
};
struct string_comp{
bool operator()(const raii::rjp_string& a, const raii::rjp_string& b)const{
return strcmp(a, b);
}
};
std::vector<raii::rjp_string> retval;
std::map<raii::rjp_string,user_info,string_comp> users;
raii::string resp = _get_curl(m_urls.room_members());
if(!resp) return {};
raii::rjp_ptr root(rjp_parse(resp.get()));
if(!root) return {};
RJP_search_res res = rjp_search_member(root.get(), "chunk", 0);
RJP_search_res res = rjp_search_member(root.get(), "joined", 0);
if(!res.value) return{};
for(RJP_value* elem = rjp_get_element(res.value);elem;elem = rjp_next_element(elem)){
raii::rjp_string userid;
RJP_int age = 0;
membership_event_type op = membership_event_type::inval;
for(RJP_value* mem = rjp_get_member(elem);mem;mem = rjp_next_member(mem)){
if(!strcmp(rjp_member_name(mem), "state_key")){
userid = mem;
}else if(!strcmp(rjp_member_name(mem), "age")){
age = rjp_value_integer(mem);
}else if(!strcmp(rjp_member_name(mem), "content")){
res = rjp_search_member(mem, "membership", 0);
if(!res.value) continue;
op = str_to_membership_event(rjp_value_string(res.value));
}
if(age && userid && op != membership_event_type::inval){
auto entry = users.find(userid);
if(entry != users.end() && entry->second.age > age){
entry->second.age = age;
entry->second.op = op;
}else if(entry == users.end()){
users.emplace(std::make_pair(raii::string(userid), user_info{age, op}));
}
break;
}
}
}
for(auto it = users.begin();it != users.end();++it){
if(it->second.op == membership_event_type::join)
retval.push_back(std::move(it->first));
for(RJP_value* mem = rjp_get_member(res.value);mem;mem = rjp_next_member(mem)){
raii::rjp_string tmp = raii::rjp_string_from_key(mem);
retval.emplace_back(std::move(tmp));
}
return retval;
}

28
src/raii/rjp_string.cpp Normal file
View File

@ -0,0 +1,28 @@
/**
This file is a part of r0nk, atlas_moon, and rexy's matrix client
Copyright (C) 2019 rexy712
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "raii/rjp_string.hpp"
namespace raii{
rjp_string rjp_string_from_key(RJP_value* val){
char* key = rjp_member_name(val);
size_t len = rjp_member_name_length(val);
rjp_set_key(val, nullptr, 0);
return rjp_string(key, len);
}
}