Merge pull request oxen-io#2555 from Bilb/fix-invalid-date

fix: INVALID_DATE (-Infinity) when merging two conversations inactive
winter0019 · Oct 17, 2022 · d1a33ad · d1a33ad
2 parents acd2178 + 12161a1
commit d1a33ad
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx b/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 // tslint:disable: use-simple-attributes no-submodule-imports
 
 import { useDispatch } from 'react-redux';
@@ -7,6 +7,7 @@ import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 import { SessionIcon, SessionIconType } from '../../../icon';
 import { ContactsListWithBreaks } from './ContactsListWithBreaks';
+import { isEmpty, isString } from 'lodash';
 
 const StyledActionRow = styled.button`
   border: none;
@@ -45,7 +46,6 @@ const IconOnActionRow = (props: { iconType: SessionIconType }) => {
 
 export const OverlayChooseAction = () => {
   const dispatch = useDispatch();
-
   function closeOverlay() {
     dispatch(resetOverlayMode());
   }
@@ -64,6 +64,28 @@ export const OverlayChooseAction = () => {
 
   useKey('Escape', closeOverlay);
 
+  function handlePaste(event: ClipboardEvent) {
+    event.preventDefault();
+
+    const pasted = event.clipboardData?.getData('text');
+
+    if (pasted && isString(pasted) && !isEmpty(pasted)) {
+      if (pasted.startsWith('http') || pasted.startsWith('https')) {
+        openJoinCommunity();
+      } else if (pasted.startsWith('05')) {
+        openNewMessage();
+      }
+    }
+  }
+
+  useEffect(() => {
+    document?.addEventListener('paste', handlePaste);
+
+    return () => {
+      document?.removeEventListener('paste', handlePaste);
+    };
+  }, []);
+
   return (
     <div className="module-left-pane-overlay">
       <StyledActionRow

diff --git a/ts/data/data.ts b/ts/data/data.ts
@@ -279,7 +279,13 @@ async function removeAllClosedGroupEncryptionKeyPairs(groupPublicKey: string): P
 // Conversation
 async function saveConversation(data: ConversationAttributes): Promise<void> {
   const cleaned = _cleanData(data);
-
+  /**
+   * Merging two conversations in `handleMessageRequestResponse` introduced a bug where we would mark conversation active_at to be -Infinity.
+   * The root issue has been fixed, but just to make sure those INVALID DATE does not show up, update those -Infinity active_at conversations to be now(), once.,
+   */
+  if (cleaned.active_at === -Infinity) {
+    cleaned.active_at = Date.now();
+  }
   await channels.saveConversation(cleaned);
 }
 

diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
@@ -626,9 +626,14 @@ async function handleMessageRequestResponse(
     unblindedConvoId,
     ConversationTypeEnum.PRIVATE
   );
-  const mostRecentActiveAt =
+  let mostRecentActiveAt =
     Math.max(...compact(convosToMerge.map(m => m.get('active_at')))) || Date.now();
 
+  if (!isFinite(mostRecentActiveAt)) {
+    mostRecentActiveAt = Date.now();
+  }
+
+
   conversationToApprove.set({
     active_at: mostRecentActiveAt,
     isApproved: true,