Trim body text to prevent duplicated notes (#161)

Sort merged notes dict by date

Author: findus

sigexport/merge.py

@@ -45,6 +45,11 @@ def merge_chat(new: list[models.Message], path_old: Path) -> list[models.Message
     # get rid of duplicates
     msg_dict = {m.comp(): m for m in old_msgs + new}
     merged = list(msg_dict.values())
+    
+    def get_date(val: any):
+        return val.date
+    
+    merged.sort(key=get_date)
 
     return merged
 

sigexport/models.py

@@ -126,7 +126,7 @@ def to_md(self: Message) -> str:
 
     def comp(self: Message) -> tuple[datetime, str, str]:
         date = self.date.replace(second=0, microsecond=0)
-        return (date, self.sender, self.body.replace("\n", "").replace(">", ""))
+        return (date, self.sender, self.body.replace("\n", "").replace(">", "").strip())
 
     def dict(self: Message) -> dict:
         msg_dict = asdict(self)