From 0192f295f22212a4e7184786a39cc9f5311b742c Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 31 May 2021 13:40:17 +1000
Subject: [PATCH] move the user fetch for mentions to redux

---
 ts/components/conversation/AddMentions.tsx    |  2 +-
 .../conversation/ModeratorsAddDialog.tsx      |  2 --
 .../conversation/ModeratorsRemoveDialog.tsx   |  6 ++---
 .../conversation/SessionCompositionBox.tsx    | 24 ++++++++++++++++-
 .../conversation/SessionConversation.tsx      |  6 +++--
 ts/opengroup/opengroupV2/OpenGroupAPIV2.ts    | 12 ++++-----
 .../opengroupV2/OpenGroupManagerV2.ts         |  1 -
 ts/session/sending/MessageSentHandler.ts      |  4 +--
 ts/state/ducks/mentionsInput.ts               | 27 +++++++++++++++++++
 ts/state/reducer.ts                           |  6 +++++
 ts/state/selectors/mentionsInput.ts           |  5 ++++
 ts/test/test-utils/utils/message.ts           |  1 +
 ts/util/findMember.ts                         |  4 ++-
 ts/util/index.ts                              |  2 --
 14 files changed, 80 insertions(+), 22 deletions(-)
 create mode 100644 ts/state/ducks/mentionsInput.ts
 create mode 100644 ts/state/selectors/mentionsInput.ts

diff --git a/ts/components/conversation/AddMentions.tsx b/ts/components/conversation/AddMentions.tsx
index da9b0f6e8..ca5888227 100644
--- a/ts/components/conversation/AddMentions.tsx
+++ b/ts/components/conversation/AddMentions.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { RenderTextCallbackType } from '../../types/Util';
 import classNames from 'classnames';
-import { FindMember } from '../../util';
+import { FindMember } from '../../util/findMember';
 import { useInterval } from '../../hooks/useInterval';
 import { PubKey } from '../../session/types';
 import { ConversationModel } from '../../models/conversation';
diff --git a/ts/components/conversation/ModeratorsAddDialog.tsx b/ts/components/conversation/ModeratorsAddDialog.tsx
index 0bd57696f..49c08cfa7 100644
--- a/ts/components/conversation/ModeratorsAddDialog.tsx
+++ b/ts/components/conversation/ModeratorsAddDialog.tsx
@@ -21,8 +21,6 @@ interface State {
 }
 
 export class AddModeratorsDialog extends React.Component<Props, State> {
-  private channelAPI: any;
-
   constructor(props: Props) {
     super(props);
 
diff --git a/ts/components/conversation/ModeratorsRemoveDialog.tsx b/ts/components/conversation/ModeratorsRemoveDialog.tsx
index 85369fe47..2d3388670 100644
--- a/ts/components/conversation/ModeratorsRemoveDialog.tsx
+++ b/ts/components/conversation/ModeratorsRemoveDialog.tsx
@@ -24,8 +24,6 @@ interface State {
 }
 
 export class RemoveModeratorsDialog extends React.Component<Props, State> {
-  private channelAPI: any;
-
   constructor(props: any) {
     super(props);
 
@@ -41,7 +39,7 @@ export class RemoveModeratorsDialog extends React.Component<Props, State> {
   }
 
   public componentDidMount() {
-    void this.refreshModList();
+    this.refreshModList();
   }
 
   public render() {
@@ -210,7 +208,7 @@ export class RemoveModeratorsDialog extends React.Component<Props, State> {
     } catch (e) {
       window?.log?.error('Got error while adding moderator:', e);
     } finally {
-      await this.refreshModList();
+      this.refreshModList();
     }
   }
 }
diff --git a/ts/components/session/conversation/SessionCompositionBox.tsx b/ts/components/session/conversation/SessionCompositionBox.tsx
index 967b3599d..3161c1e70 100644
--- a/ts/components/session/conversation/SessionCompositionBox.tsx
+++ b/ts/components/session/conversation/SessionCompositionBox.tsx
@@ -33,6 +33,11 @@ import { SessionMemberListItem } from '../SessionMemberListItem';
 import autoBind from 'auto-bind';
 import { SectionType } from '../ActionsPanel';
 import { SessionSettingCategory } from '../settings/SessionSettings';
+import {
+  defaultMentionsInputReducer,
+  updateMentionsMembers,
+} from '../../../state/ducks/mentionsInput';
+import { getMentionsInput } from '../../../state/selectors/mentionsInput';
 
 export interface ReplyingToMessageProps {
   convoId: string;
@@ -393,13 +398,30 @@ export class SessionCompositionBox extends React.Component<Props, State> {
     );
   }
 
+  private fetchUsersForOpenGroup(query: any, callback: any) {
+    const mentionsInput = getMentionsInput(window?.inboxStore?.getState() || []);
+    const filtered =
+      mentionsInput
+        .filter(d => !!d)
+        .filter(d => d.authorProfileName !== 'Anonymous')
+        .filter(d => d.authorProfileName?.toLowerCase()?.includes(query.toLowerCase()))
+        // Transform the users to what react-mentions expects
+        .map(user => {
+          return {
+            display: user.authorProfileName,
+            id: user.authorPhoneNumber,
+          };
+        }) || [];
+    callback(filtered);
+  }
+
   private fetchUsersForGroup(query: any, callback: any) {
     let overridenQuery = query;
     if (!query) {
       overridenQuery = '';
     }
     if (this.props.isPublic) {
-      window.log.warn('mentions users for opengroup v2 todo');
+      this.fetchUsersForOpenGroup(overridenQuery, callback);
       return;
     }
     if (!this.props.isPrivate) {
diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
index cb98a7bce..bc00863fb 100644
--- a/ts/components/session/conversation/SessionConversation.tsx
+++ b/ts/components/session/conversation/SessionConversation.tsx
@@ -31,6 +31,7 @@ import autoBind from 'auto-bind';
 import { getDecryptedMediaUrl } from '../../../session/crypto/DecryptedAttachmentsManager';
 import { deleteOpenGroupMessages } from '../../../interactions/conversation';
 import { ConversationTypeEnum } from '../../../models/conversation';
+import { updateMentionsMembers } from '../../../state/ducks/mentionsInput';
 
 interface State {
   // Message sending progress
@@ -132,7 +133,8 @@ export class SessionConversation extends React.Component<Props, State> {
         global.clearInterval(this.publicMembersRefreshTimeout);
         this.publicMembersRefreshTimeout = undefined;
       }
-
+      // shown convo changed. reset the list of members quotable
+      window?.inboxStore?.dispatch(updateMentionsMembers([]));
       // if the newConversation changed, and is public, start our refresh members list
       if (newConversation.isPublic) {
         // TODO use abort controller to stop those requests too
@@ -1117,6 +1119,6 @@ export class SessionConversation extends React.Component<Props, State> {
       };
     });
 
-    window.lokiPublicChatAPI.setListOfMembers(allMembers);
+    window.inboxStore?.dispatch(updateMentionsMembers(allMembers));
   }
 }
diff --git a/ts/opengroup/opengroupV2/OpenGroupAPIV2.ts b/ts/opengroup/opengroupV2/OpenGroupAPIV2.ts
index d62b54179..3f2118be9 100644
--- a/ts/opengroup/opengroupV2/OpenGroupAPIV2.ts
+++ b/ts/opengroup/opengroupV2/OpenGroupAPIV2.ts
@@ -174,7 +174,7 @@ export async function openGroupV2GetRoomInfo({
     isAuthRequired: false,
     endpoint: `rooms/${roomId}`,
   };
-  const result = (await exports.sendApiV2Request(request)) as any;
+  const result = await exports.sendApiV2Request(request);
   if (result?.result?.room) {
     const { id, name, image_id: imageId } = result?.result?.room;
 
@@ -222,7 +222,7 @@ export const postMessageRetryable = async (
   if (statusCode !== 200) {
     throw new Error(`Could not postMessage, status code: ${statusCode}`);
   }
-  const rawMessage = (result as any)?.result?.message;
+  const rawMessage = result?.result?.message;
   if (!rawMessage) {
     throw new Error('postMessage parsing failed');
   }
@@ -377,7 +377,7 @@ export const downloadFileOpenGroupV2 = async (
   }
 
   // we should probably change the logic of sendOnionRequest to not have all those levels
-  const base64Data = (result as any)?.result?.result as string | undefined;
+  const base64Data = result?.result?.result as string | undefined;
 
   if (!base64Data) {
     return null;
@@ -404,7 +404,7 @@ export const downloadFileOpenGroupV2ByUrl = async (
   }
 
   // we should probably change the logic of sendOnionRequest to not have all those levels
-  const base64Data = (result as any)?.result?.result as string | undefined;
+  const base64Data = result?.result?.result as string | undefined;
 
   if (!base64Data) {
     return null;
@@ -436,7 +436,7 @@ export const downloadPreviewOpenGroupV2 = async (
   }
 
   // we should probably change the logic of sendOnionRequest to not have all those levels
-  const base64Data = (result as any)?.result?.result as string | undefined;
+  const base64Data = result?.result?.result as string | undefined;
 
   if (!base64Data) {
     return null;
@@ -475,7 +475,7 @@ export const uploadFileOpenGroupV2 = async (
   }
 
   // we should probably change the logic of sendOnionRequest to not have all those levels
-  const fileId = (result as any)?.result?.result as number | undefined;
+  const fileId = result?.result?.result as number | undefined;
   if (!fileId) {
     return null;
   }
diff --git a/ts/opengroup/opengroupV2/OpenGroupManagerV2.ts b/ts/opengroup/opengroupV2/OpenGroupManagerV2.ts
index 02b528339..1af820153 100644
--- a/ts/opengroup/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/opengroup/opengroupV2/OpenGroupManagerV2.ts
@@ -43,7 +43,6 @@ export class OpenGroupManagerV2 {
   /**
    * When we get our configuration from the network, we might get a few times the same open group on two different messages.
    * If we don't do anything, we will join them multiple times.
-   * Even if the convo exists only once, the lokiPublicChat API will have several instances polling for the same open group.
    * Which will cause a lot of duplicate messages as they will be merged on a single conversation.
    *
    * To avoid this issue, we allow only a single join of a specific opengroup at a time.
diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts
index ebe40fee2..d0d424365 100644
--- a/ts/session/sending/MessageSentHandler.ts
+++ b/ts/session/sending/MessageSentHandler.ts
@@ -93,8 +93,8 @@ export class MessageSentHandler {
       if (!wrappedEnvelope) {
         window?.log?.warn('Should send PN notify but no wrapped envelope set.');
       } else {
-        const result = await PnServer.notify(wrappedEnvelope, sentMessage.device);
-        debugger;
+        // we do not really care about the retsult.
+        await PnServer.notify(wrappedEnvelope, sentMessage.device);
       }
     }
 
diff --git a/ts/state/ducks/mentionsInput.ts b/ts/state/ducks/mentionsInput.ts
new file mode 100644
index 000000000..d317221fb
--- /dev/null
+++ b/ts/state/ducks/mentionsInput.ts
@@ -0,0 +1,27 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+export type MentionsInputState = Array<{
+  id: string;
+  authorPhoneNumber: string;
+  authorProfileName: string;
+}>;
+
+const initialState: MentionsInputState = [];
+
+/**
+ * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server.
+ */
+const mentionsInputSlice = createSlice({
+  name: 'mentionsInput',
+  initialState,
+  reducers: {
+    updateMentionsMembers(state, action) {
+      window?.log?.warn('updating mentions input members', action.payload);
+      return action.payload as MentionsInputState;
+    },
+  },
+});
+
+const { actions, reducer } = mentionsInputSlice;
+export const { updateMentionsMembers } = actions;
+export const defaultMentionsInputReducer = reducer;
diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts
index cb99c331d..7098433f2 100644
--- a/ts/state/reducer.ts
+++ b/ts/state/reducer.ts
@@ -6,6 +6,10 @@ import { reducer as user, UserStateType } from './ducks/user';
 import { reducer as theme, ThemeStateType } from './ducks/theme';
 import { reducer as section, SectionStateType } from './ducks/section';
 import { defaultRoomReducer as defaultRooms, DefaultRoomsState } from './ducks/defaultRooms';
+import {
+  defaultMentionsInputReducer as mentionsInput,
+  MentionsInputState,
+} from './ducks/mentionsInput';
 
 export type StateType = {
   search: SearchStateType;
@@ -15,6 +19,7 @@ export type StateType = {
   theme: ThemeStateType;
   section: SectionStateType;
   defaultRooms: DefaultRoomsState;
+  mentionsInput: MentionsInputState;
 };
 
 export const reducers = {
@@ -27,6 +32,7 @@ export const reducers = {
   theme,
   section,
   defaultRooms,
+  mentionsInput,
 };
 
 // Making this work would require that our reducer signature supported AnyAction, not
diff --git a/ts/state/selectors/mentionsInput.ts b/ts/state/selectors/mentionsInput.ts
new file mode 100644
index 000000000..ffeb23e55
--- /dev/null
+++ b/ts/state/selectors/mentionsInput.ts
@@ -0,0 +1,5 @@
+import { StateType } from '../reducer';
+
+import { MentionsInputState } from '../ducks/mentionsInput';
+
+export const getMentionsInput = (state: StateType): MentionsInputState => state.mentionsInput;
diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts
index 4478f8195..26905f778 100644
--- a/ts/test/test-utils/utils/message.ts
+++ b/ts/test/test-utils/utils/message.ts
@@ -37,6 +37,7 @@ export function generateOpenGroupVisibleMessage(): OpenGroupVisibleMessage {
 }
 
 export function generateOpenGroupV2RoomInfos(): OpenGroupRequestCommonType {
+  // tslint:disable-next-line: no-http-string
   return { roomId: 'main', serverUrl: 'http://116.203.70.33' };
 }
 
diff --git a/ts/util/findMember.ts b/ts/util/findMember.ts
index 9e0077187..e6da136fb 100644
--- a/ts/util/findMember.ts
+++ b/ts/util/findMember.ts
@@ -1,5 +1,6 @@
 import { ConversationModel } from '../models/conversation';
 import { ConversationController } from '../session/conversations';
+import { MentionsInputState } from '../state/ducks/mentionsInput';
 
 // tslint:disable: no-unnecessary-class
 export class FindMember {
@@ -29,7 +30,8 @@ export class FindMember {
     }
 
     if (thisConvo.isPublic()) {
-      const publicMembers = await window.lokiPublicChatAPI.getListOfMembers();
+      const publicMembers = (await window.inboxStore?.getState()
+        .mentionsInput) as MentionsInputState;
       const memberConversations = publicMembers
         .map(publicMember =>
           ConversationController.getInstance().get(publicMember.authorPhoneNumber)
diff --git a/ts/util/index.ts b/ts/util/index.ts
index 214a13908..c793b193a 100644
--- a/ts/util/index.ts
+++ b/ts/util/index.ts
@@ -4,7 +4,6 @@ import { isFileDangerous } from './isFileDangerous';
 import { missingCaseError } from './missingCaseError';
 import { migrateColor } from './migrateColor';
 import { makeLookup } from './makeLookup';
-import { FindMember } from './findMember';
 import * as PasswordUtil from './passwordUtils';
 import * as AttachmentUtil from './attachmentsUtil';
 import * as LinkPreviewUtil from './linkPreviewFetch';
@@ -19,7 +18,6 @@ export {
   migrateColor,
   missingCaseError,
   PasswordUtil,
-  FindMember,
   AttachmentUtil,
   LinkPreviewUtil,
 };