1 parent
dacdf9c27d
commit
a116890e20
34 files changed
+186
-83
No files matched your search
@@ -57,9 +57,9 @@ pub fn update_preferences(
|
||||
.map_err(|error| format!("Failed to initialize mail preferences: {error}"))?;
|
||||
|
||||
if let Some(value) = data.messages_per_page
|
||||
&& !(20..=200).contains(&value)
|
||||
&& !(20..=300).contains(&value)
|
||||
{
|
||||
return Err("messages_per_page must be between 20 and 200".to_string());
|
||||
return Err("messages_per_page must be between 20 and 300".to_string());
|
||||
}
|
||||
if let Some(value) = data.mark_read_delay_ms
|
||||
&& value > 30_000
|
||||
@@ -151,7 +151,7 @@ mod tests {
|
||||
fn defaults_and_update_work() {
|
||||
let conn = open_test_db();
|
||||
let defaults = get_preferences(&conn).unwrap();
|
||||
assert_eq!(defaults.messages_per_page, 50);
|
||||
assert_eq!(defaults.messages_per_page, 300);
|
||||
assert_eq!(defaults.remote_images, "ask");
|
||||
|
||||
let updated = update_preferences(
|
||||
|
||||
+3
-3
@@ -1923,19 +1923,19 @@ fn tenant_seed_sql(backend: DatabaseBackend, prefix: &str) -> String {
|
||||
DatabaseBackend::Sqlite => format!(
|
||||
"INSERT OR IGNORE INTO {prefix}user_meta (key, value) VALUES ('schema_version', '1');\n\
|
||||
INSERT OR IGNORE INTO {prefix}notification_preferences (id) VALUES (1);\n\
|
||||
INSERT OR IGNORE INTO {prefix}mail_preferences (id) VALUES (1);\n\
|
||||
INSERT OR IGNORE INTO {prefix}mail_preferences (id, messages_per_page) VALUES (1, 300);\n\
|
||||
INSERT OR IGNORE INTO {prefix}pgp_preferences (id) VALUES (1);"
|
||||
),
|
||||
DatabaseBackend::Mysql => format!(
|
||||
"INSERT IGNORE INTO {prefix}user_meta (`key`, value) VALUES ('schema_version', '1');\n\
|
||||
INSERT IGNORE INTO {prefix}notification_preferences (id) VALUES (1);\n\
|
||||
INSERT IGNORE INTO {prefix}mail_preferences (id) VALUES (1);\n\
|
||||
INSERT IGNORE INTO {prefix}mail_preferences (id, messages_per_page) VALUES (1, 300);\n\
|
||||
INSERT IGNORE INTO {prefix}pgp_preferences (id) VALUES (1);"
|
||||
),
|
||||
DatabaseBackend::Pgsql => format!(
|
||||
"INSERT INTO {prefix}user_meta (key, value) VALUES ('schema_version', '1') ON CONFLICT (key) DO NOTHING;\n\
|
||||
INSERT INTO {prefix}notification_preferences (id) VALUES (1) ON CONFLICT (id) DO NOTHING;\n\
|
||||
INSERT INTO {prefix}mail_preferences (id) VALUES (1) ON CONFLICT (id) DO NOTHING;\n\
|
||||
INSERT INTO {prefix}mail_preferences (id, messages_per_page) VALUES (1, 300) ON CONFLICT (id) DO NOTHING;\n\
|
||||
INSERT INTO {prefix}pgp_preferences (id) VALUES (1) ON CONFLICT (id) DO NOTHING;"
|
||||
),
|
||||
}
|
||||
|
||||
+2
-2
@@ -14,7 +14,7 @@ pub fn reset_all(conn: &mut Connection) -> Result<(), String> {
|
||||
"DELETE FROM calendar_settings",
|
||||
"DELETE FROM pgp_preferences",
|
||||
"INSERT INTO display_preferences (id) VALUES (1)",
|
||||
"INSERT INTO mail_preferences (id) VALUES (1)",
|
||||
"INSERT INTO mail_preferences (id, messages_per_page) VALUES (1, 300)",
|
||||
"INSERT INTO notification_preferences (id) VALUES (1)",
|
||||
"INSERT INTO calendar_settings (id) VALUES (1)",
|
||||
"INSERT INTO pgp_preferences (id) VALUES (1)",
|
||||
@@ -85,7 +85,7 @@ mod tests {
|
||||
mail_preferences::get_preferences(&conn)
|
||||
.unwrap()
|
||||
.messages_per_page,
|
||||
50
|
||||
300
|
||||
);
|
||||
assert_eq!(
|
||||
folder_preferences::get_preferences(&conn, "INBOX")
|
||||
|
||||
Reference in new issue
Block a user