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

Merge remote-tracking branch 'origin/master' into flub/send-backup

Browse Source
This commit is contained in:
dignifiedquire
2023-03-17 15:53:40 +01:00
parent 0a5542a698 6c5654f584
commit 575b43d9a0
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,7 +3,6 @@
## Unreleased ## Unreleased
### Changes ### Changes
- Drop unused SQL columns #4141
- "full message view" not needed because of footers that go to contact status #4151 - "full message view" not needed because of footers that go to contact status #4151
- Pick up system's light/dark mode in generated message HTML #4150 - Pick up system's light/dark mode in generated message HTML #4150
- Support non-persistent configuration with DELTACHAT_* env - Support non-persistent configuration with DELTACHAT_* env

2
src/contact.rs
View File

@@ -1552,7 +1552,7 @@ impl RecentlySeenLoop {
pub(crate) fn new(context: Context) -> Self { pub(crate) fn new(context: Context) -> Self {
let (interrupt_send, interrupt_recv) = channel::bounded(1); let (interrupt_send, interrupt_recv) = channel::bounded(1);
let handle = task::spawn(async move { Self::run(context, interrupt_recv).await }); let handle = task::spawn(Self::run(context, interrupt_recv));
Self { Self {
handle, handle,
interrupt_send, interrupt_send,

8
src/scheduler.rs
View File

@@ -501,7 +501,7 @@ impl Scheduler {
let (inbox_start_send, inbox_start_recv) = channel::bounded(1); let (inbox_start_send, inbox_start_recv) = channel::bounded(1);
let handle = { let handle = {
let ctx = ctx.clone(); let ctx = ctx.clone();
task::spawn(async move { inbox_loop(ctx, inbox_start_send, inbox_handlers).await }) task::spawn(inbox_loop(ctx, inbox_start_send, inbox_handlers))
}; };
let inbox = SchedBox { let inbox = SchedBox {
meaning: FolderMeaning::Inbox, meaning: FolderMeaning::Inbox,
@@ -521,9 +521,7 @@ impl Scheduler {
let (conn_state, handlers) = ImapConnectionState::new(&ctx).await?; let (conn_state, handlers) = ImapConnectionState::new(&ctx).await?;
let (start_send, start_recv) = channel::bounded(1); let (start_send, start_recv) = channel::bounded(1);
let ctx = ctx.clone(); let ctx = ctx.clone();
let handle = task::spawn(async move { let handle = task::spawn(simple_imap_loop(ctx, start_send, handlers, meaning));
simple_imap_loop(ctx, start_send, handlers, meaning).await
});
oboxes.push(SchedBox { oboxes.push(SchedBox {
meaning, meaning,
conn_state, conn_state,
@@ -535,7 +533,7 @@ impl Scheduler {
let smtp_handle = { let smtp_handle = {
let ctx = ctx.clone(); let ctx = ctx.clone();
task::spawn(async move { smtp_loop(ctx, smtp_start_send, smtp_handlers).await }) task::spawn(smtp_loop(ctx, smtp_start_send, smtp_handlers))
}; };
start_recvs.push(smtp_start_recv); start_recvs.push(smtp_start_recv);

21
src/sql/migrations.rs
View File

@@ -691,15 +691,18 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
sql.set_db_version(98).await?; sql.set_db_version(98).await?;
} }
if dbversion < 99 { if dbversion < 99 {
sql.execute_migration( // sql.execute_migration(
"ALTER TABLE msgs DROP COLUMN server_folder; // "ALTER TABLE msgs DROP COLUMN server_folder;
ALTER TABLE msgs DROP COLUMN server_uid; // ALTER TABLE msgs DROP COLUMN server_uid;
ALTER TABLE msgs DROP COLUMN move_state; // ALTER TABLE msgs DROP COLUMN move_state;
ALTER TABLE chats DROP COLUMN draft_timestamp; // ALTER TABLE chats DROP COLUMN draft_timestamp;
ALTER TABLE chats DROP COLUMN draft_txt", // ALTER TABLE chats DROP COLUMN draft_txt",
99, // 99,
) // )
.await?; // .await?;
// Reverted above, as it requires to load the whole DB in memory.
sql.set_db_version(99).await?;
} }
let new_version = sql let new_version = sql