diff --git a/external/solanaceae_contact b/external/solanaceae_contact index 738d2ab..5ff7d1c 160000 --- a/external/solanaceae_contact +++ b/external/solanaceae_contact @@ -1 +1 @@ -Subproject commit 738d2abe7b4d6088412e56b89f4e26aab1a8bdba +Subproject commit 5ff7d1cee0c3ed22f9fe7d66021d95ad1c5a3f04 diff --git a/external/solanaceae_message3 b/external/solanaceae_message3 index c577a1f..48fb5f0 160000 --- a/external/solanaceae_message3 +++ b/external/solanaceae_message3 @@ -1 +1 @@ -Subproject commit c577a1fa3d19272d481a0ed4a5b8715524204928 +Subproject commit 48fb5f0889404370006ae12b3637a77d7d4ba485 diff --git a/external/solanaceae_tox b/external/solanaceae_tox index 0e6556c..0404ed8 160000 --- a/external/solanaceae_tox +++ b/external/solanaceae_tox @@ -1 +1 @@ -Subproject commit 0e6556cd86c558c86dfde60d82891a46bf32b64f +Subproject commit 0404ed84fcc31716918b90b3603c722a73e908cb diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index bb7d759..576441d 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -45,4 +45,5 @@ target_link_libraries(plugin_transfer_auto_accept PUBLIC solanaceae_plugin solanaceae_util solanaceae_message3 + solanaceae_tox_messages # sad, for filekind ) diff --git a/plugins/transfer_auto_accept.cpp b/plugins/transfer_auto_accept.cpp index 9329812..b7c4148 100644 --- a/plugins/transfer_auto_accept.cpp +++ b/plugins/transfer_auto_accept.cpp @@ -1,6 +1,8 @@ #include "./transfer_auto_accept.hpp" #include +// for comp transfer tox filekind (TODO: generalize -> content system?) +#include #include @@ -34,7 +36,7 @@ void TransferAutoAccept::iterate(void) { // TODO: contact to entry _conf.get_string("TransferAutoAccept", "save_path").value_or("tmp_save_dir") ); - std::cout << "TAA: auto accpeted transfer\n"; + std::cout << "TAA: auto accepted transfer\n"; _rmm.throwEventUpdate(it); } _accept_queue.clear(); @@ -49,6 +51,11 @@ void TransferAutoAccept::checkMsg(Message3Handle h) { return; } + // dont touch avatars for now + if (h.all_of() && h.get().kind == 1) { + return; + } + const auto& file_info = h.get(); // TODO: contact to entry if (file_info.total_size > uint64_t(_conf.get_int("TransferAutoAccept", "autoaccept_limit").value_or(1024*1024))) {