Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-29 11:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename DC_GCM_SYSTEM_ONLY to DC_GCM_INFO_ONLY

Browse Source 
apply suggestions of r10s
This commit is contained in:
Simon Laux
2021-01-14 16:19:59 +01:00
committed by B. Petersen
parent 93845c2a18
commit 9957bad83d
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/chat.rs
View File

@@ -1765,7 +1765,7 @@ pub async fn get_chat_msgs(
}
}
let process_row = if (flags & DC_GCM_SYSTEM_ONLY) != 0 {
let process_row = if (flags & DC_GCM_INFO_ONLY) != 0 {
|row: &rusqlite::Row| {
// is_info logic taken from Message.is_info()
let params = row.get::<_, String>("param")?;
@@ -1846,21 +1846,22 @@ pub async fn get_chat_msgs(
process_rows,
)
.await
} else if (flags & DC_GCM_SYSTEM_ONLY) != 0 {
} else if (flags & DC_GCM_INFO_ONLY) != 0 {
context
.sql
.query_map(
// GLOB is used here instead of LIKE becase it is case-sensitive
"SELECT m.id AS id, m.timestamp AS timestamp, m.param AS param, m.from_id AS from_id, m.to_id AS to_id
FROM msgs m
WHERE m.chat_id=?
AND m.hidden=0
AND (
m.param GLOB \"*S=*\"
OR m.from_id == 2
OR m.to_id == 2
OR m.from_id == ?
OR m.to_id == ?
)
ORDER BY m.timestamp, m.id;",
paramsv![chat_id],
paramsv![chat_id, DC_CONTACT_ID_INFO, DC_CONTACT_ID_INFO],
process_row,
process_rows,
)

2
src/constants.rs
View File

@@ -99,7 +99,7 @@ pub const DC_GCL_ADD_ALLDONE_HINT: usize = 0x04;
pub const DC_GCL_FOR_FORWARDING: usize = 0x08;
pub const DC_GCM_ADDDAYMARKER: u32 = 0x01;
pub const DC_GCM_SYSTEM_ONLY: u32 = 0x02;
pub const DC_GCM_INFO_ONLY: u32 = 0x02;
pub const DC_GCL_VERIFIED_ONLY: usize = 0x01;
pub const DC_GCL_ADD_SELF: usize = 0x02;