From 0b7869720e3d820dbe92cc26219eccbe897dc3a4 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 6 Oct 2020 15:09:06 +0200 Subject: Youtube: disable cookies, even without tor --- src/QuickMedia.cpp | 3 +-- src/plugins/Youtube.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 4b51960..946438c 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -3440,8 +3440,7 @@ namespace QuickMedia { was_mentioned = true; message->mentions_me = false; // TODO: What if the message or username begins with "-"? also make the notification image be the avatar of the user - std::string desc = "QuickMedia Matrix\n\n" + message->body; - show_notification(matrix->message_get_author_displayname(message.get()) + " (" + room->name + ")", desc); + show_notification("QuickMedia matrix - " + matrix->message_get_author_displayname(message.get()) + " (" + room->name + ")", message->body); } } diff --git a/src/plugins/Youtube.cpp b/src/plugins/Youtube.cpp index 4126532..364f394 100644 --- a/src/plugins/Youtube.cpp +++ b/src/plugins/Youtube.cpp @@ -103,8 +103,8 @@ namespace QuickMedia { { "-H", "referer: " + url } }; - std::vector cookies = get_cookies(); - additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); + //std::vector cookies = get_cookies(); + //additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); std::string website_data; if(download_to_string(url + "?pbj=1", website_data, additional_args, use_tor, true) != DownloadResult::OK) @@ -297,8 +297,8 @@ namespace QuickMedia { { "-H", "referer: " + url } }; - std::vector cookies = get_cookies(); - additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); + //std::vector cookies = get_cookies(); + //additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); std::string website_data; if(download_to_string(url + "&pbj=1", website_data, additional_args, use_tor, true) != DownloadResult::OK) @@ -377,8 +377,8 @@ namespace QuickMedia { { "-H", "referer: " + url } }; - std::vector cookies = get_cookies(); - additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); + //std::vector cookies = get_cookies(); + //additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); std::string website_data; if(download_to_string(next_url, website_data, additional_args, use_tor, true) != DownloadResult::OK) @@ -518,8 +518,8 @@ namespace QuickMedia { { "-H", "referer: " + url } }; - std::vector cookies = get_cookies(); - additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); + //std::vector cookies = get_cookies(); + //additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); std::string website_data; if(download_to_string(modified_url + "&pbj=1", website_data, additional_args, use_tor, true) != DownloadResult::OK) -- cgit v1.2.3