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

Separated room level functionality into its own class

Browse Source
This commit is contained in:
rexy712
2019-07-18 17:21:26 -07:00
parent 3bf609af18
commit 06dfcec82c
12 changed files with 319 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/matrix/client.hpp
View File

@@ -19,13 +19,13 @@
#ifndef MATRIX_CLIENT_HPP
#define MATRIX_CLIENT_HPP
#include "raii/curler.hpp"
#include "raii/string.hpp"
#include "raii/rjp_string.hpp"
#include "raii/filerd.hpp"
#include "matrix/session_info.hpp"
#include "matrix/upload_info.hpp"
#include "matrix/connection.hpp"
#include "matrix/roomcxn.hpp"
#include <vector> //vector
#include <memory> //shared_ptr
#include <cstdlib> //size_t
@@ -52,7 +52,6 @@ namespace matrix{
void set_display_name(const raii::string_base&);
void set_profile_picture(const raii::string_base&);
//networked getter
raii::rjp_string get_display_name(void)const;
raii::rjp_string get_profile_picture(void)const;
@@ -61,13 +60,9 @@ namespace matrix{
//room membership
raii::string create_room(const raii::string_base& name, const raii::string_base& alias)const;
bool join_room(const raii::string_base& roomid)const;
bool leave_room(const raii::string_base& roomid)const;
[[deprecated("Use client::join_room instead")]]
bool accept_invite(const raii::string_base& roomid)const;
[[deprecated("Use client::leave_room instead")]]
bool reject_invite(const raii::string_base& roomid)const;
roomcxn spawn_room(const raii::string_base& roomid)const;
roomcxn spawn_room(raii::string&& roomid)const;
//other network
void logout(void);
@@ -82,23 +77,8 @@ namespace matrix{
audio_info upload_audio(const raii::string_base& filename)const;
audio_info upload_audio(const raii::string_base& filename, const raii::string_base& alias)const;
//send messages
raii::rjp_string send_custom_event(const raii::string_base& room, const raii::string_base& event)const;
raii::rjp_string send_message(const raii::string_base& room, const raii::string_base& text)const;
raii::rjp_string send_file(const raii::string_base& room, const file_info& file)const;
raii::rjp_string send_image(const raii::string_base& room, const image_info& image)const;
raii::rjp_string send_video(const raii::string_base& room, const video_info& video)const;
raii::rjp_string send_audio(const raii::string_base& room, const audio_info& audio)const;
void send_typing(const raii::string_base& room, bool active, int timeout = 5000)const;
void send_read_receipt(const raii::string_base& roomid, const raii::string_base& eventid)const;
raii::rjp_string redact_event(const raii::string_base& roomid, const raii::string_base& eventid, const raii::string_base& reason)const;
raii::rjp_string redact_event(const raii::string_base& roomid, const raii::string_base& eventid)const;
private:
raii::rjp_string _upload_file(raii::filerd& fp, const raii::curl_llist& header)const;
raii::rjp_string _send_message(const raii::string_base& room, const raii::string_base& msg)const;
};
}

1
include/matrix/matrix.hpp
View File

@@ -22,5 +22,6 @@
#include "matrix/client.hpp"
#include "matrix/syncer.hpp"
#include "matrix/session.hpp"
#include "matrix/roomcxn.hpp"
#endif

59
include/matrix/room_url_list.hpp Normal file
View File

@@ -0,0 +1,59 @@
/**
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/>.
*/
#ifndef MATRIX_ROOM_URL_LIST_HPP
#define MATRIX_ROOM_URL_LIST_HPP
#include "raii/string.hpp"
namespace matrix{
class room_url_list
{
private:
raii::string m_join;
raii::string m_leave;
raii::string m_typing;
raii::string m_kick;
raii::string m_ban;
raii::string m_unban;
raii::string m_invite;
raii::string m_members;
public:
room_url_list(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid, const raii::string_base& userid);
const raii::string& join_room(void)const;
const raii::string& leave_room(void)const;
raii::string read_receipt(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid, const raii::string_base& eventid)const;
raii::string send(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid, const raii::string_base& eventtype)const;
raii::string redact(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid, const raii::string_base& eventid)const;
const raii::string& typing(void)const;
const raii::string& kick(void)const;
const raii::string& ban(void)const;
const raii::string& unban(void)const;
const raii::string& invite(void)const;
const raii::string& room_members(void)const;
void repopulate(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& userid, const raii::string_base& roomid);
void invalidate_accesstoken(void);
private:
static constexpr const char* s_proto = "https://";
};
}
#endif

74
include/matrix/roomcxn.hpp Normal file
View File

@@ -0,0 +1,74 @@
/**
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/>.
*/
#ifndef MATRIX_ROOMCXN_HPP
#define MATRIX_ROOMCXN_HPP
#include "matrix/connection.hpp"
#include "matrix/upload_info.hpp"
#include "raii/string.hpp"
#include "raii/rjp_string.hpp"
#include "matrix/room_url_list.hpp"
namespace matrix{
class roomcxn : public connection
{
private:
raii::string m_roomid;
room_url_list m_urls;
public:
roomcxn(const std::shared_ptr<internal::session_info>&, const raii::string_base& roomid);
roomcxn(const std::shared_ptr<internal::session_info>& ses, raii::string&& roomid);
roomcxn(const roomcxn&) = default;
roomcxn(roomcxn&&) = default;
~roomcxn(void) = default;
roomcxn& operator=(const roomcxn&) = default;
roomcxn& operator=(roomcxn&&) = default;
bool join_room(void)const;
bool leave_room(void)const;
[[deprecated("Use client::join_room instead")]]
bool accept_invite(void)const;
[[deprecated("Use client::leave_room instead")]]
bool reject_invite(void)const;
raii::rjp_string send_custom_event(const raii::string_base& event, const raii::string_base& eventtype)const;
raii::rjp_string send_message(const raii::string_base& text)const;
raii::rjp_string send_file(const file_info& file)const;
raii::rjp_string send_image(const image_info& image)const;
raii::rjp_string send_video(const video_info& video)const;
raii::rjp_string send_audio(const audio_info& audio)const;
bool send_typing(bool active, int timeout = 5000)const;
bool send_read_receipt(const raii::string_base& eventid)const;
raii::rjp_string redact_event(const raii::string_base& eventid, const raii::string_base& reason)const;
raii::rjp_string redact_event(const raii::string_base& eventid)const;
private:
raii::rjp_string _send_message(const raii::string_base& msg)const;
};
}
#endif

4
include/matrix/session.hpp
View File

@@ -39,8 +39,8 @@ namespace matrix{
bool valid(void)const;
client create_client(void)const;
syncer create_syncer(void)const;
client spawn_client(void)const;
syncer spawn_syncer(void)const;
void invalidate(void);
private:

11
include/matrix/url_list.hpp
View File

@@ -53,20 +53,9 @@ namespace matrix{
const raii::string& displayname(void)const;
const raii::string& profile_picture(void)const;
raii::string logout(const raii::string_base& homeserver, const raii::string_base& access_token)const;
raii::string join_room(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string leave_room(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string sync(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& next_batch, const raii::string_base& timeout)const;
raii::string read_receipt(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid, const raii::string_base& eventid)const;
raii::string send(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string redact(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid, const raii::string_base& eventid)const;
raii::string power_level(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string presence(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& userid)const;
raii::string typing(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid, const raii::string_base& userid)const;
raii::string kick(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string ban(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string unban(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string invite(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string room_members(const raii::string_base& homeserver, const raii::string_base& access_token, const raii::string_base& roomid)const;
raii::string password(const raii::string_base& homeserver, const raii::string_base& access_token)const;