commands: rename confusing constants

There is an overlap between ACCOUNT and MESSAGE. Rename ACCOUNT to
MESSAGE_LIST and use MESSAGE_LIST|MESSAGE_VIEWER instead of MESSAGE.

Signed-off-by: Robin Jarry <robin@jarry.cc>
Reviewed-by: Tim Culverhouse <tim@timculverhouse.com>

18 files changed, 18 insertions, 18 deletions

diff --git a/commands/msg/archive.go b/commands/msg/archive.go
index 25f68c8a..0714a805 100644
--- a/commands/msg/archive.go
+++ b/commands/msg/archive.go
@@ -40,7 +40,7 @@ func init() {
 }
 
 func (Archive) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Archive) Aliases() []string {
diff --git a/commands/msg/bounce.go b/commands/msg/bounce.go
index d999007d..a268a15f 100644
--- a/commands/msg/bounce.go
+++ b/commands/msg/bounce.go
@@ -40,7 +40,7 @@ func (*Bounce) CompleteTo(arg string) []string {
 }
 
 func (Bounce) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (b Bounce) Execute(args []string) error {
diff --git a/commands/msg/copy.go b/commands/msg/copy.go
index cd13421f..af44216f 100644
--- a/commands/msg/copy.go
+++ b/commands/msg/copy.go
@@ -24,7 +24,7 @@ func init() {
 }
 
 func (Copy) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Copy) Aliases() []string {
diff --git a/commands/msg/delete.go b/commands/msg/delete.go
index 19f44b43..0abde31c 100644
--- a/commands/msg/delete.go
+++ b/commands/msg/delete.go
@@ -20,7 +20,7 @@ func init() {
 }
 
 func (Delete) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Delete) Aliases() []string {
diff --git a/commands/msg/envelope.go b/commands/msg/envelope.go
index f95af959..9b168fae 100644
--- a/commands/msg/envelope.go
+++ b/commands/msg/envelope.go
@@ -23,7 +23,7 @@ func init() {
 }
 
 func (Envelope) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Envelope) Aliases() []string {
diff --git a/commands/msg/fold.go b/commands/msg/fold.go
index 057d454e..7942e965 100644
--- a/commands/msg/fold.go
+++ b/commands/msg/fold.go
@@ -17,7 +17,7 @@ func init() {
 }
 
 func (Fold) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Fold) Aliases() []string {
diff --git a/commands/msg/forward.go b/commands/msg/forward.go
index c40f7aa5..ff5dbde7 100644
--- a/commands/msg/forward.go
+++ b/commands/msg/forward.go
@@ -38,7 +38,7 @@ func init() {
 }
 
 func (forward) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (forward) Aliases() []string {
diff --git a/commands/msg/invite.go b/commands/msg/invite.go
index 0d45c43f..c62397c5 100644
--- a/commands/msg/invite.go
+++ b/commands/msg/invite.go
@@ -26,7 +26,7 @@ func init() {
 }
 
 func (invite) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (invite) Aliases() []string {
diff --git a/commands/msg/mark.go b/commands/msg/mark.go
index f86c3413..5717e33d 100644
--- a/commands/msg/mark.go
+++ b/commands/msg/mark.go
@@ -19,7 +19,7 @@ func init() {
 }
 
 func (Mark) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Mark) Aliases() []string {
diff --git a/commands/msg/modify-labels.go b/commands/msg/modify-labels.go
index e2637805..90536b91 100644
--- a/commands/msg/modify-labels.go
+++ b/commands/msg/modify-labels.go
@@ -17,7 +17,7 @@ func init() {
 }
 
 func (ModifyLabels) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (ModifyLabels) Aliases() []string {
diff --git a/commands/msg/move.go b/commands/msg/move.go
index 66738c68..d2623268 100644
--- a/commands/msg/move.go
+++ b/commands/msg/move.go
@@ -27,7 +27,7 @@ func init() {
 }
 
 func (Move) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Move) Aliases() []string {
diff --git a/commands/msg/pipe.go b/commands/msg/pipe.go
index 7048e6b8..7135df01 100644
--- a/commands/msg/pipe.go
+++ b/commands/msg/pipe.go
@@ -29,7 +29,7 @@ func init() {
 }
 
 func (Pipe) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Pipe) Aliases() []string {
diff --git a/commands/msg/read.go b/commands/msg/read.go
index 5b4bd073..cf85fd66 100644
--- a/commands/msg/read.go
+++ b/commands/msg/read.go
@@ -23,7 +23,7 @@ func init() {
 }
 
 func (FlagMsg) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (FlagMsg) Aliases() []string {
diff --git a/commands/msg/recall.go b/commands/msg/recall.go
index 0c7f6b53..280c41b8 100644
--- a/commands/msg/recall.go
+++ b/commands/msg/recall.go
@@ -30,7 +30,7 @@ func init() {
 }
 
 func (Recall) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (Recall) Aliases() []string {
diff --git a/commands/msg/reply.go b/commands/msg/reply.go
index 8eb2ff0d..02cf42ce 100644
--- a/commands/msg/reply.go
+++ b/commands/msg/reply.go
@@ -37,7 +37,7 @@ func init() {
 }
 
 func (reply) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (reply) Aliases() []string {
diff --git a/commands/msg/toggle-thread-context.go b/commands/msg/toggle-thread-context.go
index dfae3a22..83dc87bd 100644
--- a/commands/msg/toggle-thread-context.go
+++ b/commands/msg/toggle-thread-context.go
@@ -12,7 +12,7 @@ func init() {
 }
 
 func (ToggleThreadContext) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (ToggleThreadContext) Aliases() []string {
diff --git a/commands/msg/toggle-threads.go b/commands/msg/toggle-threads.go
index 21accc2c..66fa594d 100644
--- a/commands/msg/toggle-threads.go
+++ b/commands/msg/toggle-threads.go
@@ -13,7 +13,7 @@ func init() {
 }
 
 func (ToggleThreads) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 func (ToggleThreads) Aliases() []string {
diff --git a/commands/msg/unsubscribe.go b/commands/msg/unsubscribe.go
index 3a9e2f51..62f33f4d 100644
--- a/commands/msg/unsubscribe.go
+++ b/commands/msg/unsubscribe.go
@@ -28,7 +28,7 @@ func init() {
 }
 
 func (Unsubscribe) Context() commands.CommandContext {
-	return commands.MESSAGE
+	return commands.MESSAGE_LIST | commands.MESSAGE_VIEWER
 }
 
 // Aliases returns a list of aliases for the :unsubscribe command