fix: timeout fake event

botpress · Apr 30, 2019 · dc16c5b · dc16c5b
1 parent e86ca6d
commit dc16c5b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/bp/core/services/dialog/janitor.ts b/src/bp/core/services/dialog/janitor.ts
@@ -53,14 +53,17 @@ export class DialogJanitor extends Janitor {
 
       await Promise.mapSeries(sessionsIds, async id => {
         try {
+          const channel = SessionIdFactory.createChannelFromId(id)
           const target = SessionIdFactory.createTargetFromId(id)
+          const threadId = SessionIdFactory.createThreadIdFromId(id)
           const session = await this.sessionRepo.get(id)
 
           // This event only exists so that processTimeout can call processEvent
           const fakeEvent = Event({
             type: 'timeout',
-            channel: id.substring(0, id.indexOf('::')),
+            channel: channel,
             target: target,
+            threadId: threadId,
             direction: 'incoming',
             payload: '',
             botId: botId

diff --git a/src/bp/core/services/dialog/session/id-factory.ts b/src/bp/core/services/dialog/session/id-factory.ts
@@ -6,7 +6,15 @@ export class SessionIdFactory {
     return `${channel}::${target}${threadId ? `::${threadId}` : ''}`
   }
 
+  static createChannelFromId(sessionId: string) {
+    return sessionId.split('::')[0]
+  }
+
   static createTargetFromId(sessionId: string) {
     return sessionId.split('::')[1]
   }
+
+  static createThreadIdFromId(sessionId: string) {
+    return sessionId.split('::')[2]
+  }
 }