From 23cf100df75da9d2f19740c912dcd27b95e5718f Mon Sep 17 00:00:00 2001 From: Ruben van de Ven Date: Fri, 26 Apr 2019 13:34:17 +0200 Subject: [PATCH] Next chapter for diversion only on Timeout diversion --- hugvey/story.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hugvey/story.py b/hugvey/story.py index c4fa31a..156ee85 100644 --- a/hugvey/story.py +++ b/hugvey/story.py @@ -535,10 +535,7 @@ class Diversion(object): story.logger.info(f"Diverge: No response {self.id} {story.stats}") - # fall back to the next message to return on. - # TODO: maybe, if not chapter is found, the diversion should be - # blocked alltogether? - self.returnMessage = story.getNextChapterForMsg(msgTo) or msgTo + self.returnMessage = msgTo await story.setCurrentMessage(msg) story.currentDiversion = self @@ -586,10 +583,7 @@ class Diversion(object): story.logger.critical(f"Not a valid message id for diversion: {self.params['msgId']}") return - # fall back to the next message to return on. - # TODO: maybe, if not chapter is found, the diversion should be - # blocked alltogether? - self.returnMessage = story.getNextChapterForMsg(msgTo) or msgTo + self.returnMessage = msgTo await story.setCurrentMessage(msg) story.currentDiversion = self return True