Remove tor option. Use torsocks instead (which is what quickmedia did anyways)

1 files changed, 24 insertions, 24 deletions

diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index 21459d0..20bc31e 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -1115,7 +1115,7 @@ namespace QuickMedia {
 
                 rapidjson::Document json_root;
                 std::string err_msg;
-                DownloadResult download_result = download_json(json_root, url, additional_args, use_tor, true, &err_msg);
+                DownloadResult download_result = download_json(json_root, url, additional_args, true, &err_msg);
                 if(download_result != DownloadResult::OK) {
                     fprintf(stderr, "/sync failed\n");
                     goto sync_end;
@@ -1171,7 +1171,7 @@ namespace QuickMedia {
                         snprintf(url, sizeof(url), "%s/_matrix/client/r0/notifications?limit=100&only=highlight", homeserver.c_str());
 
                         rapidjson::Document json_root;
-                        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), use_tor, true);
+                        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), true);
                         if(download_result != DownloadResult::OK || !json_root.IsObject()) {
                             fprintf(stderr, "Fetching notifications failed!\n");
                             return;
@@ -1192,7 +1192,7 @@ namespace QuickMedia {
 
                             rapidjson::Document json_root;
                             std::string err_msg;
-                            DownloadResult download_result = download_json(json_root, url, additional_args, use_tor, true, &err_msg);
+                            DownloadResult download_result = download_json(json_root, url, additional_args, true, &err_msg);
                             if(download_result != DownloadResult::OK) {
                                 fprintf(stderr, "/sync for additional messages failed\n");
                                 return;
@@ -2526,7 +2526,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/client/r0/rooms/%s/messages?from=%s&limit=20&dir=b&filter=%s", homeserver.c_str(), room_data->id.c_str(), from.c_str(), filter.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         if(!json_root.IsObject())
@@ -2740,7 +2740,7 @@ namespace QuickMedia {
         snprintf(request_url, sizeof(request_url), "%s/_matrix/client/r0/rooms/%s/send/m.room.message/%s", homeserver.c_str(), room->id.c_str(), transaction_id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, request_url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, request_url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         if(!json_root.IsObject())
@@ -2887,7 +2887,7 @@ namespace QuickMedia {
         snprintf(request_url, sizeof(request_url), "%s/_matrix/client/r0/rooms/%s/send/m.room.message/%s", homeserver.c_str(), room->id.c_str(), transaction_id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, request_url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, request_url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         if(!json_root.IsObject())
@@ -2953,7 +2953,7 @@ namespace QuickMedia {
         snprintf(request_url, sizeof(request_url), "%s/_matrix/client/r0/rooms/%s/send/m.room.message/%s", homeserver.c_str(), room->id.c_str(), transaction_id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, request_url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, request_url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         if(!json_root.IsObject())
@@ -2999,7 +2999,7 @@ namespace QuickMedia {
         snprintf(request_url, sizeof(request_url), "%s/_matrix/client/r0/rooms/%s/send/m.reaction/%s", homeserver.c_str(), room->id.c_str(), transaction_id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, request_url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, request_url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         if(!json_root.IsObject())
@@ -3047,7 +3047,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/client/r0/rooms/%s/event/%s", homeserver.c_str(), room->id.c_str(), event_id.c_str());
 #endif
         std::string response;
-        DownloadResult download_result = download_to_string_cache(url, response, std::move(additional_args), use_tor, true, [](std::string &response) {
+        DownloadResult download_result = download_to_string_cache(url, response, std::move(additional_args), true, [](std::string &response) {
             rapidjson::Document json_root;
             rapidjson::ParseResult parse_result = json_root.Parse(response.c_str(), response.size());
             if(parse_result.IsError() || !json_root.IsObject())
@@ -3223,7 +3223,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/media/r0/upload?filename=%s", homeserver.c_str(), filename_escaped.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), use_tor, true, &err_msg);
+        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), true, &err_msg);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         if(!json_root.IsObject()) {
@@ -3271,7 +3271,7 @@ namespace QuickMedia {
         };
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, homeserver + "/_matrix/client/r0/login", std::move(additional_args), use_tor, true, &err_msg);
+        DownloadResult download_result = download_json(json_root, homeserver + "/_matrix/client/r0/login", std::move(additional_args), true, &err_msg);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         Path matrix_sync_data_path = get_cache_dir().join("matrix").join("sync_data.json");
@@ -3340,7 +3340,7 @@ namespace QuickMedia {
         };
 
         std::string server_response;
-        download_to_string(homeserver + "/_matrix/client/r0/logout", server_response, std::move(additional_args), use_tor, true);
+        download_to_string(homeserver + "/_matrix/client/r0/logout", server_response, std::move(additional_args), true);
 
         // Make sure all fields are reset here!
         rooms.clear();
@@ -3382,7 +3382,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/client/r0/rooms/%s/redact/%s/%s", homeserver.c_str(), room->id.c_str(), message_typed->event_id.c_str(), transaction_id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), use_tor, true, &err_msg);
+        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), true, &err_msg);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         if(!json_root.IsObject()) {
@@ -3467,7 +3467,7 @@ namespace QuickMedia {
         };
 
         std::string server_response;
-        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/rooms/" + room->id + "/typing/" + url_param_encode(my_user_id) , server_response, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/rooms/" + room->id + "/typing/" + url_param_encode(my_user_id) , server_response, std::move(additional_args), true);
         return download_result_to_plugin_result(download_result);
     }
 
@@ -3487,7 +3487,7 @@ namespace QuickMedia {
         };
 
         std::string server_response;
-        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/rooms/" + room->id + "/typing/" + url_param_encode(my_user_id), server_response, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/rooms/" + room->id + "/typing/" + url_param_encode(my_user_id), server_response, std::move(additional_args), true);
         return download_result_to_plugin_result(download_result);
     }
 
@@ -3509,7 +3509,7 @@ namespace QuickMedia {
         };
 
         std::string server_response;
-        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/rooms/" + room->id + "/read_markers", server_response, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/rooms/" + room->id + "/read_markers", server_response, std::move(additional_args), true);
 
         auto me = get_me(room);
         if(me)
@@ -3537,7 +3537,7 @@ namespace QuickMedia {
         room->read_marker_event_timestamp = timestamp;
 
         std::string server_response;
-        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/user/" + my_user_id + "/rooms/" + room->id + "/account_data/qm.last_read_message_timestamp", server_response, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/user/" + my_user_id + "/rooms/" + room->id + "/account_data/qm.last_read_message_timestamp", server_response, std::move(additional_args), true);
         return download_result_to_plugin_result(download_result);
     }
 
@@ -3551,7 +3551,7 @@ namespace QuickMedia {
         };
 
         std::string server_response;
-        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/join/" + room_id, server_response, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/join/" + room_id, server_response, std::move(additional_args), true);
         if(download_result == DownloadResult::OK) {
             std::lock_guard<std::mutex> invite_lock(invite_mutex);
             auto invite_it = invites.find(room_id);
@@ -3589,7 +3589,7 @@ namespace QuickMedia {
         };
 
         std::string server_response;
-        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/rooms/" + room_id + "/leave", server_response, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_to_string(homeserver + "/_matrix/client/r0/rooms/" + room_id + "/leave", server_response, std::move(additional_args), true);
         if(download_result == DownloadResult::OK) {
             RoomData *room = get_room_by_id(room_id);
             if(room) {
@@ -3626,7 +3626,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/media/r0/config", homeserver.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result);
 
         if(!json_root.IsObject())
@@ -3726,7 +3726,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/client/r0/profile/%s", homeserver.c_str(), user_id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, url, {}, use_tor, true);
+        DownloadResult download_result = download_json(json_root, url, {}, true);
         if(download_result != DownloadResult::OK || !json_root.IsObject()) {
             fprintf(stderr, "Fetching profile for user %s failed!\n", user_id.c_str());
             auto user = get_user_by_id(room, user_id);
@@ -3748,7 +3748,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/client/r0/rooms/%s/joined_members", homeserver.c_str(), room->id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK || !json_root.IsObject()) {
             fprintf(stderr, "Fetching users for room %s failed!\n", room->id.c_str());
             return;
@@ -3795,7 +3795,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/client/r0/rooms/%s/members?membership=join", homeserver.c_str(), room->id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK || !json_root.IsObject()) {
             fprintf(stderr, "Fetching users for room %s failed!\n", room->id.c_str());
             return;
@@ -3835,7 +3835,7 @@ namespace QuickMedia {
         snprintf(url, sizeof(url), "%s/_matrix/client/r0/user/%s/filter", homeserver.c_str(), user_id.c_str());
 
         rapidjson::Document json_root;
-        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), use_tor, true);
+        DownloadResult download_result = download_json(json_root, url, std::move(additional_args), true);
         if(download_result != DownloadResult::OK || !json_root.IsObject()) return FILTER;
 
         const rapidjson::Value &filter_id_json = GetMember(json_root, "filter_id");