dashboard: list sample commands at the bottom of bug reports

This should make commands more visible to the users and help those who
don't remember the exact syntax and don't want to always visit the
documentation page.

Ignore sample commands during incoming message parsing.

5 files changed, 197 insertions, 17 deletions

diff --git a/dashboard/app/asset_storage_test.go b/dashboard/app/asset_storage_test.go
index cf06eb410..8cc9f1524 100644
--- a/dashboard/app/asset_storage_test.go
+++ b/dashboard/app/asset_storage_test.go
@@ -99,7 +99,23 @@ See https://goo.gl/tpsmEJ for more information about syzbot.
 syzbot engineers can be reached at syzkaller@googlegroups.com.
 
 syzbot will keep track of this issue. See:
-https://goo.gl/tpsmEJ#status for how to communicate with syzbot.`,
+https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 		extBugID, crashLogLink, kernelConfigLink))
 	c.checkURLContents(crashLogLink, crash.Log)
 	c.checkURLContents(kernelConfigLink, build.KernelConfig)
@@ -378,7 +394,23 @@ See https://goo.gl/tpsmEJ for more information about syzbot.
 syzbot engineers can be reached at syzkaller@googlegroups.com.
 
 syzbot will keep track of this issue. See:
-https://goo.gl/tpsmEJ#status for how to communicate with syzbot.`,
+https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 		extBugID, crashLogLink, kernelConfigLink))
 	c.checkURLContents(crashLogLink, crash.Log)
 	c.checkURLContents(kernelConfigLink, build.KernelConfig)
diff --git a/dashboard/app/bisect_test.go b/dashboard/app/bisect_test.go
index 2e2bb4b2d..8553814b0 100644
--- a/dashboard/app/bisect_test.go
+++ b/dashboard/app/bisect_test.go
@@ -234,8 +234,26 @@ syzbot engineers can be reached at syzkaller@googlegroups.com.
 syzbot will keep track of this issue. See:
 https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
 For information about bisection process see: https://goo.gl/tpsmEJ#bisection
-syzbot can test patches for this issue, for details see:
-https://goo.gl/tpsmEJ#testing-patches`,
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want syzbot to run reproducer on another tree, reply with:
+#syz test: git://repo/address.git branch-or-commit-hash
+If you attach or paste a git patch, syzbot will apply it before testing.
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 			extBugID2, crashLogLink, kernelConfigLink, reproSyzLink, reproCLink,
 			bisectLogLink, bisectCrashReportLink, bisectCrashLogLink))
 	}
@@ -538,8 +556,26 @@ syzbot engineers can be reached at syzkaller@googlegroups.com.
 syzbot will keep track of this issue. See:
 https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
 For information about bisection process see: https://goo.gl/tpsmEJ#bisection
-syzbot can test patches for this issue, for details see:
-https://goo.gl/tpsmEJ#testing-patches`,
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want syzbot to run reproducer on another tree, reply with:
+#syz test: git://repo/address.git branch-or-commit-hash
+If you attach or paste a git patch, syzbot will apply it before testing.
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 			extBugID2, crashLogLink, kernelConfigLink, reproSyzLink, reproCLink, bisectLogLink))
 	}
 }
@@ -804,8 +840,26 @@ syzbot engineers can be reached at syzkaller@googlegroups.com.
 syzbot will keep track of this issue. See:
 https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
 For information about bisection process see: https://goo.gl/tpsmEJ#bisection
-syzbot can test patches for this issue, for details see:
-https://goo.gl/tpsmEJ#testing-patches`,
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want syzbot to run reproducer on another tree, reply with:
+#syz test: git://repo/address.git branch-or-commit-hash
+If you attach or paste a git patch, syzbot will apply it before testing.
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 			extBugID2, crashLogLink, kernelConfigLink, reproSyzLink, reproCLink,
 			bisectLogLink, bisectCrashReportLink, bisectCrashLogLink))
 	}
diff --git a/dashboard/app/email_test.go b/dashboard/app/email_test.go
index edd86d787..fbdbf551f 100644
--- a/dashboard/app/email_test.go
+++ b/dashboard/app/email_test.go
@@ -71,7 +71,23 @@ See https://goo.gl/tpsmEJ for more information about syzbot.
 syzbot engineers can be reached at syzkaller@googlegroups.com.
 
 syzbot will keep track of this issue. See:
-https://goo.gl/tpsmEJ#status for how to communicate with syzbot.`,
+https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 			extBugID0, crashLogLink, kernelConfigLink))
 		c.checkURLContents(crashLogLink, crash.Log)
 		c.checkURLContents(kernelConfigLink, build.KernelConfig)
@@ -233,8 +249,26 @@ syzbot engineers can be reached at syzkaller@googlegroups.com.
 
 syzbot will keep track of this issue. See:
 https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
-syzbot can test patches for this issue, for details see:
-https://goo.gl/tpsmEJ#testing-patches`,
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want syzbot to run reproducer on another tree, reply with:
+#syz test: git://repo/address.git branch-or-commit-hash
+If you attach or paste a git patch, syzbot will apply it before testing.
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 			extBugID1, reproSyzLink, crashLogLink, kernelConfigLink))
 		c.checkURLContents(reproSyzLink, syzRepro)
 		c.checkURLContents(crashLogLink, crash.Log)
@@ -660,7 +694,23 @@ See https://goo.gl/tpsmEJ for more information about syzbot.
 syzbot engineers can be reached at syzkaller@googlegroups.com.
 
 syzbot will keep track of this issue. See:
-https://goo.gl/tpsmEJ#status for how to communicate with syzbot.`,
+https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 		extBugID, crashLogLink, kernelConfigLink))
 }
 
@@ -817,7 +867,23 @@ See https://goo.gl/tpsmEJ for more information about syzbot.
 syzbot engineers can be reached at syzkaller@googlegroups.com.
 
 syzbot will keep track of this issue. See:
-https://goo.gl/tpsmEJ#status for how to communicate with syzbot.`,
+https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup`,
 		extBugID, crashLogLink, kernelConfigLink))
 	c.checkURLContents(crashLogLink, crash.Log)
 }
diff --git a/dashboard/app/mail_bug.txt b/dashboard/app/mail_bug.txt
index 8c4e46b7e..df36d0ae2 100644
--- a/dashboard/app/mail_bug.txt
+++ b/dashboard/app/mail_bug.txt
@@ -49,8 +49,28 @@ syzbot engineers can be reached at syzkaller@googlegroups.com.
 
 syzbot will keep track of this issue. See:
 https://goo.gl/tpsmEJ#status for how to communicate with syzbot.{{if .BisectCause}}
-For information about bisection process see: https://goo.gl/tpsmEJ#bisection{{end}}{{if or .ReproCLink .ReproSyzLink}}
-syzbot can test patches for this issue, for details see:
-https://goo.gl/tpsmEJ#testing-patches
-{{- end -}}
+For information about bisection process see: https://goo.gl/tpsmEJ#bisection{{end}}
+
+If the bug is already fixed, let syzbot know by replying with:
+#syz fix: exact-commit-title
+
+{{- if or .ReproCLink .ReproSyzLink}}
+
+If you want syzbot to run reproducer on another tree, reply with:
+#syz test: git://repo/address.git branch-or-commit-hash
+If you attach or paste a git patch, syzbot will apply it before testing.
+{{- end}}
+
+If you want to change bug's subsystems, reply with:
+#syz set subsystems: new-subsystem
+(See the list of subsystem names on the web dashboard)
+
+If you want to unassign a label, reply with:
+#syz unset some-label
+
+If the bug is a duplicate of another bug, reply with:
+#syz dup: exact-subject-of-another-report
+
+If you want to undo deduplication, reply with:
+#syz undup
 {{- end -}}
diff --git a/dashboard/app/reporting_email.go b/dashboard/app/reporting_email.go
index 6038a8539..257b41a0d 100644
--- a/dashboard/app/reporting_email.go
+++ b/dashboard/app/reporting_email.go
@@ -538,6 +538,14 @@ func excludeSampleCommands(msg *email.Email) {
 		switch cmd.Command {
 		case email.CmdFix:
 			ok = cmd.Args != "exact-commit-title"
+		case email.CmdTest:
+			ok = cmd.Args != "git://repo/address.git branch-or-commit-hash"
+		case email.CmdSet:
+			ok = cmd.Args != "subsystems: new-subsystem"
+		case email.CmdUnset:
+			ok = cmd.Args != "some-label"
+		case email.CmdDup:
+			ok = cmd.Args != "exact-subject-of-another-report"
 		}
 		if ok {
 			newCommands = append(newCommands, cmd)