From d6792bb2a241a440bfc516e45442fcde0bf8dc29 Mon Sep 17 00:00:00 2001 From: shoopea Date: Thu, 16 May 2019 11:06:38 +0800 Subject: [PATCH] test --- job.go | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/job.go b/job.go index f8c9a13..f11057f 100644 --- a/job.go +++ b/job.go @@ -20,9 +20,10 @@ func jobRescan(j Job) { if len(ids) > 1 { for _, id := range ids { p := JobPayloadRescanMsg{ - Query: fmt.Sprintf("SELECT o.id FROM obj o WHERE o.id = %d AND o.obj_type_id = %d AND o.obj_sub_type_id = %d;", id, objTypeMessage, objSubTypeMessageUnknown), + Query: fmt.Sprintf("SELECT %id id FROM DUAL;", id), + MsgID64: 0, + ChatID64: 0, } - b, _ := json.Marshal(p) err := createJob(objSubTypeJobRescanMsg, objJobPriorityRescanChildMsg, j.UserID64, time.Now(), b) logOnError(err, "jobRescan : createJob(objSubTypeJobRescanMsg)") @@ -40,23 +41,27 @@ func jobRescan(j Job) { SQLMsgIdentifyQueue <- ids[0] err = setJobDone(j.ID64) logOnError(err, "jobRescan : setJobDone(1)") - m := TGCommand{ - Type: commandReplyMsg, - Text: "One message processed.", - FromMsgID64: r.MsgID64, - FromChatID64: r.ChatID64, + if r.MsgID64 != 0 || r.ChatID64 != 0 { + m := TGCommand{ + Type: commandReplyMsg, + Text: "One message processed.", + FromMsgID64: r.MsgID64, + FromChatID64: r.ChatID64, + } + TGCmdQueue <- m } - TGCmdQueue <- m } else { err = setJobDone(j.ID64) logOnError(err, "jobRescan : setJobDone(0)") - m := TGCommand{ - Type: commandReplyMsg, - Text: "No message processed.", - FromMsgID64: r.MsgID64, - FromChatID64: r.ChatID64, + if r.MsgID64 != 0 || r.ChatID64 != 0 { + m := TGCommand{ + Type: commandReplyMsg, + Text: "One message processed.", + FromMsgID64: r.MsgID64, + FromChatID64: r.ChatID64, + } + TGCmdQueue <- m } - TGCmdQueue <- m } return }