add XGMTHRID

Author: nojb

imap/imapCommands.ml

@@ -965,9 +965,12 @@ end
 module XGmExt1 = struct
   type msg_att_extension +=
        MSG_ATT_XGMMSGID of Uint64.t
+     | MSG_ATT_XGMTHRID of Uint64.t
      | MSG_ATT_XGMLABELS of string list
 
   let fetch_att_xgmmsgid = FETCH_ATT_EXTENSION "X-GM-MSGID"
+
+  let fetch_att_xgmthrid = FETCH_ATT_EXTENSION "X-GM-THRID"
 
   let fetch_att_xgmlabels = FETCH_ATT_EXTENSION "X-GM-LABELS"
 
@@ -979,6 +982,8 @@ module XGmExt1 = struct
           function
             MSG_ATT_XGMMSGID id ->
               Some (fun ppf -> fprintf ppf "(x-gm-msgid %s)" (Uint64.to_string id))
+          | MSG_ATT_XGMTHRID id ->
+              Some (fun ppf -> fprintf ppf "(x-gm-thrid %s)" (Uint64.to_string id))
           | MSG_ATT_XGMLABELS labels ->
               let p ppf = List.iter (fun x -> fprintf ppf "@ %S" x) in
               Some (fun ppf -> fprintf ppf "@[<2>(x-gm-labels%a)@]" p labels)
@@ -994,14 +999,18 @@ module XGmExt1 = struct
       str "X-GM-MSGID" >> char ' ' >> uint64 >>= fun n ->
       ret (MSG_ATT_XGMMSGID n)
     in
+    let thrid =
+      str "X-GM-THRID" >> char ' ' >> uint64 >>= fun n ->
+      ret (MSG_ATT_XGMTHRID n)
+    in
     let labels =
       str "X-GM-LABELS" >> char ' ' >>
       char '(' >> sep (char ' ') astring >>= fun labels -> char ')' >>
       ret (MSG_ATT_XGMLABELS labels)
     in
     match kind with
       FETCH_DATA ->
-        alt msgid labels
+        altn [ msgid; thrid; labels ]
     | _ ->
         fail
 

imap/imapCommands.mli

@@ -157,10 +157,13 @@ end
 module XGmExt1 : sig
   type msg_att_extension +=
        MSG_ATT_XGMMSGID of Uint64.t
-     |  MSG_ATT_XGMLABELS of string list
+     | MSG_ATT_XGMTHRID of Uint64.t
+     | MSG_ATT_XGMLABELS of string list
 
   val fetch_att_xgmmsgid : fetch_att
 
+  val fetch_att_xgmthrid : fetch_att
+
   val fetch_att_xgmlabels : fetch_att
 
   val uid_store_xgmlabels : ImapSet.t -> store_att_flags_sign -> bool -> string list -> unit command

lwt/imapLwt.ml

@@ -1301,7 +1301,7 @@ let fetch_messages s ~folder ~request ~req_type ?(modseq = Modseq.zero) ?mapping
     | GmailLabels :: rest ->
         loop (ImapCommands.XGmExt1.fetch_att_xgmlabels :: acc) headers rest
     | GmailThreadID :: rest ->
-        failwith "fetch gmail thread id not implemented"
+        loop (ImapCommands.XGmExt1.fetch_att_xgmthrid :: acc) headers rest
     | GmailMessageID :: rest ->
         loop (ImapCommands.XGmExt1.fetch_att_xgmmsgid :: acc) headers rest
     | FullHeaders :: rest ->
@@ -1371,6 +1371,9 @@ let fetch_messages s ~folder ~request ~req_type ?(modseq = Modseq.zero) ?mapping
       | MSG_ATT_ITEM_EXTENSION (ImapCommands.XGmExt1.MSG_ATT_XGMMSGID gmail_message_id') ->
           gmail_message_id := gmail_message_id';
           needs_gmail_message_id := false
+      | MSG_ATT_ITEM_EXTENSION (ImapCommands.XGmExt1.MSG_ATT_XGMTHRID gmail_thread_id') ->
+          gmail_thread_id := gmail_thread_id';
+          needs_gmail_thread_id := false
       | _ -> (* FIXME *) ()
     in