diff --git a/def.go b/def.go index b98b44e..32123f6 100644 --- a/def.go +++ b/def.go @@ -193,7 +193,8 @@ const ( objSubTypeJobWithdrawal = 604 objSubTypeJobGStock = 605 objSubTypeJobRescanMsg = 606 - objSubTypeJobSetJobDone = 607 + objSubTypeJobRescanMsgChild = 607 + objSubTypeJobSetJobDone = 608 objSubTypeItemResource = 701 objSubTypeItemAlch = 702 objSubTypeItemMisc = 703 diff --git a/job.go b/job.go index 0acdca7..eef2fe5 100644 --- a/job.go +++ b/job.go @@ -34,15 +34,17 @@ func jobRescan(j Job) { logOnError(err, "jobRescan : createJob(objSubTypeJobRescanMsg)") } - p := JobPayloadSetDone{ - JobID64: j.ID64, - MsgID64: r.MsgID64, - ChatID64: r.ChatID64, - Text: fmt.Sprintf("%d messages processed.", len(ids)), + if j.JobTypeID == objSubTypeJobRescanMsg { + p := JobPayloadSetDone{ + JobID64: j.ID64, + MsgID64: r.MsgID64, + ChatID64: r.ChatID64, + Text: fmt.Sprintf("%d messages processed.", len(ids)), + } + b, _ := json.Marshal(p) + err := createJob(objSubTypeJobSetJobDone, objJobPriorityRescanAllMsg, j.UserID64, time.Now(), b) + logOnError(err, "jobRescan : createJob(objSubTypeJobSetJobDone)") } - b, _ := json.Marshal(p) - err := createJob(objSubTypeJobSetJobDone, objJobPriority, j.UserID64, time.Now(), b) - logOnError(err, "jobRescan : createJob(objSubTypeJobSetJobDone)") } else if len(ids) == 1 { SQLMsgIdentifyQueue <- ids[0] err = setJobDone(j.ID64) diff --git a/workers.go b/workers.go index 842f93f..7bfb6e4 100644 --- a/workers.go +++ b/workers.go @@ -207,6 +207,8 @@ func SQLJobWorker(id int) { switch j.JobTypeID { case objSubTypeJobRescanMsg: jobRescan(j) + case objSubTypeJobRescanMsgChild: + jobRescan(j) case objSubTypeJobSetJobDone: jobSetDone(j) case objSubTypeJobPillage: