Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-09 01:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

add decision- and blocking-functions to repl, cleanup (#2258)

Browse Source 
* deprecate mostly unused dc_get_blocked_cnt() api

instead, the size returned by get_blocked_contacts() should be checked,
this is safer and allows easier adaption of blocking rules.

ui or python seems not to use dc_get_blocked_cnt(),
however, there is one test in node,
therefore, the function will continue working for now
(by just returning Contact::get_all_blocked().len() then)

* add decision api to repl tool

* add block/unblock api to repl tool

* unify usage of @deprecated doxygen command
This commit is contained in:
bjoern
2021-02-22 14:58:49 +01:00
committed by GitHub
parent 6792523fcd
commit 6d93d7af63
5 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
deltachat-ffi/deltachat.h
View File

@@ -672,8 +672,6 @@ dc_chatlist_t* dc_get_chatlist (dc_context_t* context, int flags,
// handle chats
/**
* DEPRECATED Use dc_decide_on_contact_request().
*
* Create a normal chat or a group chat by a messages ID that comes typically
* from the deaddrop, DC_CHAT_ID_DEADDROP (1).
*
@@ -693,7 +691,7 @@ dc_chatlist_t* dc_get_chatlist (dc_context_t* context, int flags,
* same group may be shown or not - so, all in all, it is fine to show the
* contact name only.
*
* @deprecated Use dc_decide_on_contact_request() instead
* @deprecated Deprecated 2021-02-07, use dc_decide_on_contact_request() instead
* @memberof dc_context_t
* @param context The context object as returned from dc_context_new().
* @param msg_id The message ID to create the chat for.
@@ -1547,8 +1545,6 @@ void dc_forward_msgs (dc_context_t* context, const uint3
/**
* DEPRECATED
*
* Mark all messages sent by the given contact as _noticed_.
* This function is typically used to ignore a user in the deaddrop temporarily ("Not now" button).
*
@@ -1557,7 +1553,7 @@ void dc_forward_msgs (dc_context_t* context, const uint3
*
* See also dc_marknoticed_chat() and dc_markseen_msgs()
*
* @deprecated Use dc_decide_on_contact_request() if the user just hit "Not now" on a button in the deaddrop,
* @deprecated Deprecated 2021-02-07, use dc_decide_on_contact_request() if the user just hit "Not now" on a button in the deaddrop,
* dc_marknoticed_chat() if the user has entered a chat
* and dc_markseen_msgs() if the user actually _saw_ a message.
* @memberof dc_context_t
@@ -1757,6 +1753,7 @@ dc_array_t* dc_get_contacts (dc_context_t* context, uint32_t fl
/**
* Get the number of blocked contacts.
*
* @deprecated Deprecated 2021-02-22, use dc_array_get_cnt() on dc_get_blocked_contacts() instead.
* @memberof dc_context_t
* @param context The context object.
* @return The number of blocked contacts.
@@ -5285,7 +5282,7 @@ void dc_event_unref(dc_event_t* event);
/// Used to build the string returned by dc_get_contact_encrinfo().
#define DC_STR_E2E_AVAILABLE 25
/// DEPRECATED 2021-02-07
/// @deprecated Deprecated 2021-02-07, this string is no longer needed.
#define DC_STR_ENCR_TRANSP 27
/// "No encryption."
@@ -5475,9 +5472,7 @@ void dc_event_unref(dc_event_t* event);
/// Used in status messages.
#define DC_STR_EPHEMERAL_WEEK 80
/// DEPRECATED
///
/// DC_STR_EPHEMERAL_WEEKS is used instead.
/// @deprecated Deprecated 2021-01-30, DC_STR_EPHEMERAL_WEEKS is used instead.
#define DC_STR_EPHEMERAL_FOUR_WEEKS 81
/// "Video chat invitation"

2
deltachat-ffi/src/lib.rs
View File

@@ -1640,7 +1640,7 @@ pub unsafe extern "C" fn dc_get_blocked_cnt(context: *mut dc_context_t) -> libc:
}
let ctx = &*context;
block_on(Contact::get_blocked_cnt(&ctx)) as libc::c_int
block_on(async move { Contact::get_all_blocked(&ctx).await.len() as libc::c_int })
}
#[no_mangle]