From 2bddad9701422b9fcf01c547a10054eb17ccdceb Mon Sep 17 00:00:00 2001 From: dec05eba Date: Fri, 11 Nov 2022 19:40:30 +0100 Subject: Dont format matrix reaction locally, bypass pantalaimon for custom emoji --- plugins/Matrix.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/Matrix.hpp') diff --git a/plugins/Matrix.hpp b/plugins/Matrix.hpp index d5fe251..1744ce0 100644 --- a/plugins/Matrix.hpp +++ b/plugins/Matrix.hpp @@ -28,6 +28,7 @@ namespace QuickMedia { std::string formatted_text_to_qm_text(Matrix *matrix, const char *str, size_t size, bool allow_formatted_text, mgl::vec2i image_max_size = mgl::vec2i(0, 0)); // |image_max_size| 0, 0 means no max size std::string message_to_qm_text(Matrix *matrix, const Message *message, bool allow_formatted_text = true, mgl::vec2i image_max_size = mgl::vec2i(0, 0)); + std::string pantalaimon_url_to_homeserver_url(Matrix *matrix, const std::string &url); struct TimestampedDisplayData { std::string data; @@ -736,7 +737,7 @@ namespace QuickMedia { void remove_rooms(const rapidjson::Value &leave_json); PluginResult get_pinned_events(RoomData *room, std::vector &pinned_events); std::shared_ptr parse_message_event(const rapidjson::Value &event_item_json, RoomData *room_data); - PluginResult upload_file(const std::string &filepath, std::string filename, UploadInfo &file_info, UploadInfo &thumbnail_info, std::string &err_msg, bool upload_thumbnail = true); + PluginResult upload_file(const std::string &filepath, std::string filename, UploadInfo &file_info, UploadInfo &thumbnail_info, std::string &err_msg, bool upload_thumbnail = true, bool bypass_proxy = false); void add_room(std::unique_ptr room); void remove_room(const std::string &room_id); // Returns false if an invite to the room already exists -- cgit v1.2.3