Skip to content

Commit c1d0eb1

Browse files
authored
Merge pull request #1028 from adenchen123/master
Refactor Triggered method to return conversation IDs
2 parents 93d752e + ac7d3ce commit c1d0eb1

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/Infrastructure/BotSharp.Core.Rules/Engines/IRuleEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ namespace BotSharp.Core.Rules.Engines;
44

55
public interface IRuleEngine
66
{
7-
Task Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null);
7+
Task<IEnumerable<string>> Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null);
88
}

src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public RuleEngine(IServiceProvider services, ILogger<RuleEngine> logger)
1818
_logger = logger;
1919
}
2020

21-
public async Task Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null)
21+
public async Task<IEnumerable<string>> Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null)
2222
{
2323
// Pull all user defined rules
2424
var agentService = _services.GetRequiredService<IAgentService>();
@@ -36,7 +36,7 @@ public async Task Triggered(IRuleTrigger trigger, string data, List<MessageState
3636

3737
// Trigger the agents
3838
var instructService = _services.GetRequiredService<IInstructService>();
39-
39+
var newConversationIds = new List<string>();
4040

4141
foreach (var agent in preFilteredAgents)
4242
{
@@ -68,6 +68,7 @@ await convService.SendMessage(agent.Id,
6868
msg => Task.CompletedTask);
6969

7070
convService.SaveStates();
71+
newConversationIds.Add(conv.Id);
7172

7273
/*foreach (var rule in agent.Rules)
7374
{
@@ -88,5 +89,7 @@ await convService.SendMessage(agent.Id,
8889
}
8990
}*/
9091
}
92+
93+
return newConversationIds;
9194
}
9295
}

0 commit comments

Comments
 (0)