From 7c1a31c0950ccfc2fa65c1efd5a76d4e6d7b72f9 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Fri, 14 Apr 2023 11:43:36 +0600
Subject: [PATCH] Filter old email activity (#2983)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 .../activity/ActivityChannelMessage.svelte    |  9 +++++----
 plugins/contact/src/index.ts                  | 11 +++++++++++
 plugins/gmail/src/index.ts                    |  8 ++------
 plugins/telegram/src/index.ts                 | 19 ++++++-------------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/plugins/contact-resources/src/components/activity/ActivityChannelMessage.svelte b/plugins/contact-resources/src/components/activity/ActivityChannelMessage.svelte
index 77d698c2a0..d7df481f08 100644
--- a/plugins/contact-resources/src/components/activity/ActivityChannelMessage.svelte
+++ b/plugins/contact-resources/src/components/activity/ActivityChannelMessage.svelte
@@ -14,10 +14,10 @@
 -->
 <script lang="ts">
   import { DisplayTx } from '@hcengineering/activity'
-  import core, { AttachedDoc, Doc, TxCUD, TxCollectionCUD, TxProcessor } from '@hcengineering/core'
+  import core, { AttachedDoc, Doc, TxCUD, TxCollectionCUD, TxCreateDoc, TxProcessor } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import contact from '../../plugin'
-  import { Channel, Contact } from '@hcengineering/contact'
+  import { Channel, ChannelItem, Contact } from '@hcengineering/contact'
   import { newDisplayTx } from '@hcengineering/activity-resources'
   import { createEventDispatcher } from 'svelte'
 
@@ -46,7 +46,7 @@
   let newTxes: DisplayTx[] = []
 
   const txQuery = createQuery()
-  $: txQuery.query(
+  $: txQuery.query<TxCollectionCUD<Channel, ChannelItem>>(
     core.class.TxCollectionCUD,
     {
       objectId: { $in: channels.map((p) => p._id) },
@@ -54,7 +54,8 @@
       'tx.attributes.incoming': false
     },
     (res) => {
-      newTxes = createDisplayTxes(res)
+      const filtered = res.filter((p) => (p.tx as TxCreateDoc<ChannelItem>).attributes.sendOn >= object.createOn)
+      newTxes = createDisplayTxes(filtered)
     }
   )
 
diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts
index dd8c73b81d..268018fef1 100644
--- a/plugins/contact/src/index.ts
+++ b/plugins/contact/src/index.ts
@@ -58,6 +58,17 @@ export interface Channel extends AttachedDoc {
   lastMessage?: Timestamp
 }
 
+/**
+ * @public
+ */
+export interface ChannelItem extends AttachedDoc {
+  attachedTo: Ref<Channel>
+  attachedToClass: Ref<Class<Channel>>
+  incoming: boolean
+  sendOn: Timestamp
+  attachments?: number
+}
+
 /**
  * @public
  */
diff --git a/plugins/gmail/src/index.ts b/plugins/gmail/src/index.ts
index 01c7166139..9528d069e7 100644
--- a/plugins/gmail/src/index.ts
+++ b/plugins/gmail/src/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import { Channel } from '@hcengineering/contact'
+import { ChannelItem } from '@hcengineering/contact'
 import type { Account, AttachedDoc, Class, Doc, Ref, Space, Timestamp } from '@hcengineering/core'
 import type { Plugin } from '@hcengineering/platform'
 import { Metadata, plugin } from '@hcengineering/platform'
@@ -23,14 +23,10 @@ import type { AnyComponent } from '@hcengineering/ui'
 /**
  * @public
  */
-export interface Message extends BaseMessage, AttachedDoc {
-  attachedTo: Ref<Channel>
-  attachedToClass: Ref<Class<Channel>>
+export interface Message extends BaseMessage, ChannelItem {
   messageId: string
   from: string
   textContent: string
-  incoming: boolean
-  sendOn: Timestamp
 }
 
 /**
diff --git a/plugins/telegram/src/index.ts b/plugins/telegram/src/index.ts
index fd8ee20dda..458027f483 100644
--- a/plugins/telegram/src/index.ts
+++ b/plugins/telegram/src/index.ts
@@ -13,13 +13,13 @@
 // limitations under the License.
 //
 
-import { Metadata, plugin } from '@hcengineering/platform'
+import { ChannelItem } from '@hcengineering/contact'
+import type { AttachedDoc, Class, Doc, Ref, Space, Timestamp } from '@hcengineering/core'
 import type { Plugin } from '@hcengineering/platform'
-import type { Doc, Ref, Class, Space, AttachedDoc, Timestamp } from '@hcengineering/core'
-import type { AnyComponent } from '@hcengineering/ui'
-import type { IntegrationType, Handler } from '@hcengineering/setting'
-import { Channel } from '@hcengineering/contact'
+import { Metadata, plugin } from '@hcengineering/platform'
+import type { Handler, IntegrationType } from '@hcengineering/setting'
 import { TemplateField } from '@hcengineering/templates'
+import type { AnyComponent } from '@hcengineering/ui'
 
 /**
  * @public
@@ -32,14 +32,7 @@ export interface BaseTelegramMessage extends Doc {
 /**
  * @public
  */
-export interface TelegramMessage extends BaseTelegramMessage, AttachedDoc {
-  attachedTo: Ref<Channel>
-  attachedToClass: Ref<Class<Channel>>
-
-  incoming: boolean
-
-  sendOn: Timestamp
-}
+export interface TelegramMessage extends BaseTelegramMessage, ChannelItem {}
 
 /**
  * @public