address greptile comments

Author: icecrasher321

apps/sim/blocks/blocks/lemlist.ts

@@ -52,7 +52,7 @@ export const LemlistBlock: BlockConfig<LemlistResponse> = {
       condition: { field: 'operation', value: 'get_activities' },
     },
     {
-      id: 'leadId',
+      id: 'filterLeadId',
       title: 'Lead ID',
       type: 'short-input',
       placeholder: 'Filter by lead ID (optional)',
@@ -175,6 +175,10 @@ export const LemlistBlock: BlockConfig<LemlistResponse> = {
         if (params.offset) {
           params.offset = Number(params.offset)
         }
+        // Map filterLeadId to leadId for get_activities tool
+        if (params.filterLeadId) {
+          params.leadId = params.filterLeadId
+        }
 
         switch (params.operation) {
           case 'get_activities':
@@ -194,7 +198,8 @@ export const LemlistBlock: BlockConfig<LemlistResponse> = {
     apiKey: { type: 'string', description: 'Lemlist API key' },
     type: { type: 'string', description: 'Activity type filter' },
     campaignId: { type: 'string', description: 'Campaign ID filter' },
-    leadId: { type: 'string', description: 'Lead ID' },
+    filterLeadId: { type: 'string', description: 'Lead ID filter for activities' },
+    leadId: { type: 'string', description: 'Lead ID for send email' },
     limit: { type: 'number', description: 'Result limit' },
     offset: { type: 'number', description: 'Result offset' },
     leadIdentifier: { type: 'string', description: 'Lead email address or ID' },

apps/sim/triggers/lemlist/utils.ts

@@ -266,81 +266,3 @@ export function buildAllOutputs(): Record<string, TriggerOutput> {
     },
   }
 }
-
-/**
- * Check if a webhook event matches the expected trigger type
- */
-export function isLemlistEventMatch(triggerId: string, eventType: string): boolean {
-  const eventMappings: Record<string, string[]> = {
-    lemlist_email_replied: ['emailsReplied', 'emailReplied'],
-    lemlist_linkedin_replied: ['linkedinReplied'],
-    lemlist_interested: [
-      'interested',
-      'emailsInterested',
-      'linkedinInterested',
-      'manualInterested',
-      'aircallInterested',
-      'apiInterested',
-    ],
-    lemlist_not_interested: [
-      'notInterested',
-      'emailsNotInterested',
-      'linkedinNotInterested',
-      'manualNotInterested',
-      'aircallNotInterested',
-      'apiNotInterested',
-    ],
-    lemlist_email_opened: ['emailsOpened', 'emailOpened'],
-    lemlist_email_clicked: ['emailsClicked', 'emailClicked'],
-    lemlist_email_bounced: ['emailsBounced', 'emailBounced'],
-    lemlist_email_sent: ['emailsSent', 'emailSent'],
-    // Generic webhook accepts all events
-    lemlist_webhook: ['*'],
-  }
-
-  const expectedEvents = eventMappings[triggerId]
-  if (!expectedEvents) {
-    return false
-  }
-
-  // Generic webhook accepts all events
-  if (expectedEvents.includes('*')) {
-    return true
-  }
-
-  return expectedEvents.includes(eventType)
-}
-
-/**
- * Extract and normalize data from Lemlist webhook payload
- */
-export function extractLemlistData(body: Record<string, unknown>) {
-  return {
-    type: body.type ?? body.eventType ?? '',
-    _id: body._id ?? body.activityId ?? '',
-    leadId: body.leadId ?? '',
-    campaignId: body.campaignId ?? '',
-    campaignName: body.campaignName ?? '',
-    sequenceId: body.sequenceId ?? '',
-    stepId: body.stepId ?? '',
-    createdAt: body.createdAt ?? body.timestamp ?? '',
-    lead: body.lead ?? {
-      _id: body.leadId ?? '',
-      email: body.email ?? body.leadEmail ?? '',
-      firstName: body.firstName ?? body.leadFirstName ?? '',
-      lastName: body.lastName ?? body.leadLastName ?? '',
-      companyName: body.companyName ?? '',
-      phone: body.phone ?? '',
-      linkedinUrl: body.linkedinUrl ?? '',
-      picture: body.picture ?? '',
-      icebreaker: body.icebreaker ?? '',
-      timezone: body.timezone ?? '',
-      isUnsubscribed: body.isUnsubscribed ?? false,
-    },
-    messageId: body.messageId ?? '',
-    subject: body.subject ?? '',
-    text: body.text ?? body.message ?? '',
-    html: body.html ?? '',
-    sentAt: body.sentAt ?? '',
-  }
-}

apps/sim/triggers/lemlist/webhook.ts

@@ -2,6 +2,7 @@ import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
   buildAllOutputs,
+  buildLemlistExtraFields,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
 } from '@/triggers/lemlist/utils'
@@ -22,49 +23,8 @@ export const lemlistWebhookTrigger: TriggerConfig = {
   subBlocks: buildTriggerSubBlocks({
     triggerId: 'lemlist_webhook',
     triggerOptions: lemlistTriggerOptions,
-    setupInstructions: lemlistSetupInstructions('All Events (omit type field)'),
-    extraFields: [
-      {
-        id: 'eventTypes',
-        title: 'Event Types to Listen For',
-        type: 'dropdown',
-        multiSelect: true,
-        options: [
-          // Email Events
-          { label: 'Email Sent', id: 'emailsSent' },
-          { label: 'Email Opened', id: 'emailsOpened' },
-          { label: 'Email Clicked', id: 'emailsClicked' },
-          { label: 'Email Replied', id: 'emailsReplied' },
-          { label: 'Email Bounced', id: 'emailsBounced' },
-          { label: 'Email Unsubscribed', id: 'emailsUnsubscribed' },
-          // LinkedIn Events
-          { label: 'LinkedIn Replied', id: 'linkedinReplied' },
-          { label: 'LinkedIn Invite Accepted', id: 'linkedinInviteAccepted' },
-          { label: 'LinkedIn Sent', id: 'linkedinSent' },
-          // Lead Status Events
-          { label: 'Interested', id: 'interested' },
-          { label: 'Not Interested', id: 'notInterested' },
-          { label: 'Contacted', id: 'contacted' },
-          { label: 'Paused', id: 'paused' },
-          // System Events
-          { label: 'Campaign Complete', id: 'campaignComplete' },
-        ],
-        placeholder: 'Leave empty to receive all events',
-        description:
-          'Select specific events to filter. Leave empty to receive all events from Lemlist.',
-        mode: 'trigger',
-        condition: { field: 'selectedTriggerId', value: 'lemlist_webhook' },
-      },
-      {
-        id: 'campaignId',
-        title: 'Campaign ID (Optional)',
-        type: 'short-input',
-        placeholder: 'cam_xxxxx (leave empty for all campaigns)',
-        description: 'Optionally scope the webhook to a specific campaign',
-        mode: 'trigger',
-        condition: { field: 'selectedTriggerId', value: 'lemlist_webhook' },
-      },
-    ],
+    setupInstructions: lemlistSetupInstructions('All Events (no type filter)'),
+    extraFields: buildLemlistExtraFields('lemlist_webhook'),
   }),
 
   outputs: buildAllOutputs(),