fix: Ensure that message being sent is added to the bottom (#8027)

Currently this fails, so if the user fixes their clock incorrectly set to the future, they need to
delete previously sent messages or wait until this future comes again.

Cargo.lock

@@ -2654,7 +2654,7 @@ dependencies = [
  "hyper",
  "libc",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2 0.5.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -2860,9 +2860,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.10"
+version = "0.25.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -3483,9 +3483,9 @@ dependencies = [
 
 [[package]]
 name = "moxcms"
-version = "0.8.1"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+checksum = "ddd32fa8935aeadb8a8a6b6b351e40225570a37c43de67690383d87ef170cd08"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -4615,9 +4615,9 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.11.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
+checksum = "37566cb3fdacef14c0737f9546df7cfeadbfbc9fef10991038bf5015d0c80532"
 dependencies = [
  "bitflags 2.11.0",
  "num-traits",

src/blob.rs

@@ -10,8 +10,8 @@ use anyhow::{Context as _, Result, ensure, format_err};
 use base64::Engine as _;
 use futures::StreamExt;
 use image::ImageReader;
+use image::codecs::jpeg::JpegEncoder;
 use image::{DynamicImage, GenericImage, GenericImageView, ImageFormat, Pixel, Rgba};
-use image::{codecs::jpeg::JpegEncoder, metadata::Orientation};
 use num_traits::FromPrimitive;
 use tokio::{fs, task};
 use tokio_stream::wrappers::ReadDirStream;
@@ -362,10 +362,7 @@ impl<'a> BlobObject<'a> {
                 return Ok(name);
             }
             let mut img = imgreader.decode().context("image decode failure")?;
-            let orientation = exif
-                .as_ref()
-                .map(|exif| exif_orientation(exif, context))
-                .unwrap_or(Orientation::NoTransforms);
+            let orientation = exif.as_ref().map(|exif| exif_orientation(exif, context));
             let mut encoded = Vec::new();
 
             if *vt == Viewtype::Sticker {
@@ -384,7 +381,13 @@ impl<'a> BlobObject<'a> {
                     return Ok(name);
                 }
             }
-            img.apply_orientation(orientation);
+
+            img = match orientation {
+                Some(90) => img.rotate90(),
+                Some(180) => img.rotate180(),
+                Some(270) => img.rotate270(),
+                _ => img,
+            };
 
             // max_wh is the maximum image width and height, i.e. the resolution-limit.
             // target_wh target-resolution for resizing the image.
@@ -548,17 +551,18 @@ fn image_metadata(file: &std::fs::File) -> Result<(u64, Option<exif::Exif>)> {
     Ok((len, exif))
 }
 
-fn exif_orientation(exif: &exif::Exif, context: &Context) -> Orientation {
-    if let Some(orientation) = exif.get_field(exif::Tag::Orientation, exif::In::PRIMARY)
-        && let Some(val) = orientation.value.get_uint(0)
-        && let Ok(val) = TryInto::<u8>::try_into(val)
-    {
-        return Orientation::from_exif(val).unwrap_or({
-            warn!(context, "Exif orientation value ignored: {val:?}.");
-            Orientation::NoTransforms
-        });
+fn exif_orientation(exif: &exif::Exif, context: &Context) -> i32 {
+    if let Some(orientation) = exif.get_field(exif::Tag::Orientation, exif::In::PRIMARY) {
+        // possible orientation values are described at http://sylvana.net/jpegcrop/exif_orientation.html
+        // we only use rotation, in practise, flipping is not used.
+        match orientation.value.get_uint(0) {
+            Some(3) => return 180,
+            Some(6) => return 90,
+            Some(8) => return 270,
+            other => warn!(context, "Exif orientation value ignored: {other:?}."),
+        }
     }
-    Orientation::NoTransforms
+    0
 }
 
 /// All files in the blobdir.

src/blob/blob_tests.rs

@@ -305,7 +305,7 @@ async fn test_recode_image_2() {
         has_exif: true,
         original_width: 2000,
         original_height: 1800,
-        orientation: Some(Orientation::Rotate270),
+        orientation: 270,
         compressed_width: 1800,
         compressed_height: 2000,
         ..Default::default()
@@ -336,28 +336,6 @@ async fn test_recode_image_2() {
     assert_correct_rotation(&img_rotated);
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_recode_image_vflipped() {
-    let bytes = include_bytes!("../../test-data/image/rectangle200x180-vflipped.jpg");
-    let img_rotated = SendImageCheckMediaquality {
-        viewtype: Viewtype::Image,
-        media_quality_config: "0",
-        bytes,
-        extension: "jpg",
-        has_exif: true,
-        original_width: 200,
-        original_height: 180,
-        orientation: Some(Orientation::FlipVertical),
-        compressed_width: 200,
-        compressed_height: 180,
-        ..Default::default()
-    }
-    .test()
-    .await
-    .unwrap();
-    assert_correct_rotation(&img_rotated);
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_recode_image_bad_exif() {
     // `exiftool` reports for this file "Bad offset for IFD0 XResolution", still Exif must be
@@ -552,7 +530,7 @@ struct SendImageCheckMediaquality<'a> {
     pub(crate) has_exif: bool,
     pub(crate) original_width: u32,
     pub(crate) original_height: u32,
-    pub(crate) orientation: Option<Orientation>,
+    pub(crate) orientation: i32,
     pub(crate) res_viewtype: Option<Viewtype>,
     pub(crate) compressed_width: u32,
     pub(crate) compressed_height: u32,
@@ -568,7 +546,7 @@ impl SendImageCheckMediaquality<'_> {
         let has_exif = self.has_exif;
         let original_width = self.original_width;
         let original_height = self.original_height;
-        let orientation = self.orientation.unwrap_or(Orientation::NoTransforms);
+        let orientation = self.orientation;
         let res_viewtype = self.res_viewtype.unwrap_or(Viewtype::Image);
         let compressed_width = self.compressed_width;
         let compressed_height = self.compressed_height;

src/chat.rs

@@ -2910,11 +2910,23 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
         msg.param.remove(Param::GuaranteeE2ee);
     }
     msg.subject.clone_from(&rendered_msg.subject);
+    // Sort the message to the bottom. Employ `msgs_index7` to compute `timestamp`.
     context
         .sql
         .execute(
-            "UPDATE msgs SET pre_rfc724_mid=?, subject=?, param=? WHERE id=?",
+            "
+UPDATE msgs SET
+    timestamp=(
+        SELECT MAX(timestamp) FROM msgs WHERE
+            state IN(10,13,16,18,20,24,26,28) AND
+            hidden IN(0,1) AND
+            chat_id=?
+    ),
+    pre_rfc724_mid=?, subject=?, param=?
+WHERE id=?
+            ",
             (
+                msg.chat_id,
                 &msg.pre_rfc724_mid,
                 &msg.subject,
                 msg.param.to_string(),

src/chat/chat_tests.rs

@@ -5034,6 +5034,33 @@ async fn test_do_not_overwrite_draft() -> Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_outgoing_msg_after_another_from_future() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let t = &tcm.alice().await;
+    let chat_id = t.get_self_chat().await.id;
+    // Simulate sending a message with clock set to the future.
+    let msg_id = send_text_msg(t, chat_id, "test".to_string()).await?;
+    t.sql
+        .execute(
+            "UPDATE msgs SET timestamp=timestamp+3600 WHERE id=?",
+            (msg_id,),
+        )
+        .await?;
+    let timestamp_sent: i64 = t
+        .sql
+        .query_get_value("SELECT timestamp_sent FROM msgs WHERE id=?", (msg_id,))
+        .await?
+        .unwrap();
+    // Let's have a check here that locally sent messages have zero `timestamp_sent`, it can be a
+    // useful invariant.
+    assert_eq!(timestamp_sent, 0);
+
+    let msg_id = send_text_msg(t, chat_id, "Fixed my clock".to_string()).await?;
+    assert_eq!(t.get_last_msg_in(chat_id).await.id, msg_id);
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_info_contact_id() -> Result<()> {
     let mut tcm = TestContextManager::new();

src/receive_imf/receive_imf_tests.rs

@@ -5363,46 +5363,6 @@ async fn test_outgoing_unencrypted_chat_assignment() {
     assert_eq!(received.chat_id, chat.id);
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_incoming_reply_with_date_in_past() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-
-    let msg0 = receive_imf(
-        alice,
-        b"From: bob@example.net\n\
-          To: alice@example.org\n\
-          Message-ID: <message@example.net>\n\
-          Date: Sun, 22 Mar 2020 22:22:22 +0000\n\
-          \n\
-          This device has an atomic clock\n",
-        false,
-    )
-    .await?
-    .unwrap();
-
-    let msg1 = receive_imf(
-        alice,
-        b"From: bob@example.net\n\
-          To: alice@example.org\n\
-          Message-ID: <message1@example.net>\n\
-          In-Reply-To: <message@example.net>\n\
-          Date: Sun, 22 Mar 2020 11:11:11 +0000\n\
-          \n\
-          And this one has a wind-up clock\n",
-        false,
-    )
-    .await?
-    .unwrap();
-    assert_eq!(msg1.chat_id, msg0.chat_id);
-    assert!(msg1.sort_timestamp >= msg0.sort_timestamp);
-    assert_eq!(
-        alice.get_last_msg_in(msg0.chat_id).await.id,
-        *msg1.msg_ids.last().unwrap()
-    );
-    Ok(())
-}
-
 /// Tests Bob receiving a message from Alice
 /// in a new group she just created
 /// with only Alice and Bob.