|
@@ -88,7 +88,7 @@ export class TaskService implements OnModuleInit {
|
|
|
|
|
|
|
|
async createTask(task: Task): Promise<Task> {
|
|
async createTask(task: Task): Promise<Task> {
|
|
|
let dynamicMessageList = null
|
|
let dynamicMessageList = null
|
|
|
- if (task.dynamicMessage !== '' || task.dynamicMessage !== null) {
|
|
|
|
|
|
|
+ if (task.dynamicMessage && task.dynamicMessage !== '') {
|
|
|
dynamicMessageList = task.dynamicMessage.split(',')
|
|
dynamicMessageList = task.dynamicMessage.split(',')
|
|
|
}
|
|
}
|
|
|
task = await this.taskRepository.save(task)
|
|
task = await this.taskRepository.save(task)
|
|
@@ -98,10 +98,10 @@ export class TaskService implements OnModuleInit {
|
|
|
const taskItem = new TaskItem()
|
|
const taskItem = new TaskItem()
|
|
|
taskItem.taskId = task.id
|
|
taskItem.taskId = task.id
|
|
|
taskItem.number = phone.number
|
|
taskItem.number = phone.number
|
|
|
- if (dynamicMessageList === null) {
|
|
|
|
|
- taskItem.message = task.message
|
|
|
|
|
- } else {
|
|
|
|
|
|
|
+ if (dynamicMessageList !== null && task.message.includes('[#random#]')) {
|
|
|
taskItem.message = task.message.replace('[#random#]', dynamicMessageList[Math.floor(Math.random() * dynamicMessageList.length)])
|
|
taskItem.message = task.message.replace('[#random#]', dynamicMessageList[Math.floor(Math.random() * dynamicMessageList.length)])
|
|
|
|
|
+ } else {
|
|
|
|
|
+ taskItem.message = task.message
|
|
|
}
|
|
}
|
|
|
taskItem.status = TaskStatus.IDLE
|
|
taskItem.status = TaskStatus.IDLE
|
|
|
return taskItem
|
|
return taskItem
|