add some types to Data.ts calls

ts/components/session/SessionInboxView.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { getMessageById } from '../../data/data';
+import { ConversationModel } from '../../models/conversation';
 import { MessageModel } from '../../models/message';
 import { getMessageQueue } from '../../session';
 import { ConversationController } from '../../session/conversations';
@@ -116,7 +117,7 @@ export class SessionInboxView extends React.Component<Props, State> {
     // Here we set up a full redux store with initial state for our LeftPane Root
     const convoCollection = ConversationController.getInstance().getConversations();
     const conversations = convoCollection.map(
-      (conversation: any) => conversation.cachedProps
+      (conversation: ConversationModel) => conversation.getProps()
     );
 
     const filledConversations = conversations.map((conv: any) => {

ts/data/data.ts

@@ -9,6 +9,7 @@ import {
   ConversationModel,
 } from '../models/conversation';
 import { MessageCollection, MessageModel } from '../models/message';
+import { MessageAttributes } from '../models/messageType';
 import { HexKeyPair } from '../receiver/keypairs';
 import { PubKey } from '../session/types';
 import {
@@ -671,23 +672,32 @@ export async function cleanLastHashes(): Promise<void> {
 }
 
 // TODO: Strictly type the following
-export async function saveSeenMessageHashes(data: any): Promise<void> {
+export async function saveSeenMessageHashes(
+  data: Array<{
+    expiresAt: number;
+    hash: string;
+  }>
+): Promise<void> {
   await channels.saveSeenMessageHashes(_cleanData(data));
 }
 
-export async function updateLastHash(data: any): Promise<void> {
+export async function updateLastHash(data: {
+  convoId: string;
+  snode: string;
+  hash: string;
+  expiresAt: number;
+}): Promise<void> {
   await channels.updateLastHash(_cleanData(data));
 }
 
-export async function saveMessage(data: MessageModel): Promise<string> {
+export async function saveMessage(data: MessageAttributes): Promise<string> {
   const id = await channels.saveMessage(_cleanData(data));
   window.Whisper.ExpiringMessagesListener.update();
   return id;
 }
 
 export async function saveMessages(
-  arrayOfMessages: any,
+  arrayOfMessages: Array<MessageAttributes>
-  options?: { forceSave: boolean }
 ): Promise<void> {
   await channels.saveMessages(_cleanData(arrayOfMessages));
 }
@@ -860,7 +870,18 @@ export async function getUnprocessedById(id: string): Promise<any> {
   return channels.getUnprocessedById(id);
 }
 
-export async function saveUnprocessed(data: any): Promise<string> {
+export type UnprocessedParameter = {
+  id: string;
+  version: number;
+  envelope: string;
+  timestamp: number;
+  attempts: number;
+  senderIdentity?: string;
+};
+
+export async function saveUnprocessed(
+  data: UnprocessedParameter
+): Promise<string> {
   const id = await channels.saveUnprocessed(_cleanData(data));
   return id;
 }

ts/models/conversation.ts

@@ -28,6 +28,7 @@ import {
   getUnreadCountByConversation,
   removeAllMessagesInConversation,
   removeMessage as dataRemoveMessage,
+  saveMessages,
   updateConversation,
 } from '../../ts/data/data';
 import {
@@ -481,7 +482,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     await this.commit();
   }
 
-  public async onReadMessage(message: any, readAt: any) {
+  public async onReadMessage(message: MessageModel, readAt: number) {
     // We mark as read everything older than this message - to clean up old stuff
     //   still marked unread in the database. If the user generally doesn't read in
     //   the desktop app, so the desktop app only gets read syncs, we can very
@@ -1021,7 +1022,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
   }
 
-  public async markRead(newestUnreadDate: any, providedOptions: any = {}) {
+  public async markReadBouncy(
+    newestUnreadDate: number,
+    providedOptions: any = {}
+  ) {
     const options = providedOptions || {};
     _.defaults(options, { sendReadReceipts: true });
 

ts/receiver/cache.ts

@@ -8,6 +8,7 @@ import {
   removeAllUnprocessed,
   removeUnprocessed,
   saveUnprocessed,
+  UnprocessedParameter,
   updateUnprocessedAttempts,
   updateUnprocessedWithData,
 } from '../data/data';
@@ -27,7 +28,7 @@ export async function addToCache(
   window.log.info(`adding to cache envelope: ${id}`);
 
   const encodedEnvelope = StringUtils.decode(plaintext, 'base64');
-  const data: any = {
+  const data: UnprocessedParameter = {
     id,
     version: 2,
     envelope: encodedEnvelope,

ts/receiver/queuedJob.ts

@@ -529,6 +529,9 @@ export async function handleMessageJob(
     const id = await message.commit();
 
     message.set({ id });
+    // this updates the redux store.
+    // if the convo on which this message should become visible,
+    // it will be shown to the user, and might as well be read right away
     window.Whisper.events.trigger('messageAdded', {
       conversationKey: conversation.id,
       messageModel: message,