change interactive flag to follow

5 files changed, 28 insertions, 15 deletions

diff --git a/documentation/mumctl.1 b/documentation/mumctl.1
index 16360bb..e875fd7 100644
--- a/documentation/mumctl.1
+++ b/documentation/mumctl.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: mumd
 .\"    Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 2.0.12
-.\"      Date: 2021-04-03
+.\" Generator: Asciidoctor 2.0.15
+.\"      Date: 2021-06-06
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MUMCTL" "1" "2021-04-03" "\ \&" "\ \&"
+.TH "MUMCTL" "1" "2021-06-06" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -157,6 +157,19 @@ mumctl volume <user> set <volume>
 Set the volume of another user\(cqs incoming audio.
 1.0 is the default.
 .RE
+.sp
+mumctl messages [\-f|\-\-follow]
+Prints all received messages since mumd was started, or since this command last was issued,
+whichever happens first.
+If the follow flag is set, mumctl will instead wait for new messages to come in and print
+them as they come in. To exit this loop, issue a Ctrl\-C.
+.sp
+mumctl message user <message> <users>
+Sends a message to all users specified in the list of users.
+.sp
+mumctl message channel [\-r|\-\-recursive] <message> <channels>
+Sends a message to all channels specified in the list of channels.
+If the recursive flag is set, the message is also sent to all subchannels in a recursive manner.
 .SH "AUTHORS"
 .sp
 Gustav Sörnäs and Eskil Queseth.
diff --git a/documentation/mumctl.txt b/documentation/mumctl.txt
index 782dc0b..e513255 100644
--- a/documentation/mumctl.txt
+++ b/documentation/mumctl.txt
@@ -98,10 +98,10 @@ mumctl volume <user> set <volume> ::
     Set the volume of another user's incoming audio.
     1.0 is the default.
 
-mumctl messages [-i|--interactive]
+mumctl messages [-f|--follow]
     Prints all received messages since mumd was started, or since this command last was issued,
     whichever happens first.
-    If the interactive flag is set, mumctl will instead wait for new messages to come in and print
+    If the follow flag is set, mumctl will instead wait for new messages to come in and print
     them as they come in. To exit this loop, issue a Ctrl-C.
 
 mumctl message user <message> <users>
diff --git a/documentation/mumd.1 b/documentation/mumd.1
index bedd1cb..8d5dcc4 100644
--- a/documentation/mumd.1
+++ b/documentation/mumd.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: mumd
 .\"    Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 2.0.12
-.\"      Date: 2021-04-03
+.\" Generator: Asciidoctor 2.0.15
+.\"      Date: 2021-04-10
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MUMD" "1" "2021-04-03" "\ \&" "\ \&"
+.TH "MUMD" "1" "2021-04-10" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/documentation/mumdrc.5 b/documentation/mumdrc.5
index 1e78e5a..ac0a2f5 100644
--- a/documentation/mumdrc.5
+++ b/documentation/mumdrc.5
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: mumdrc
 .\"    Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 2.0.12
-.\"      Date: 2021-04-03
+.\" Generator: Asciidoctor 2.0.15
+.\"      Date: 2021-04-10
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MUMDRC" "5" "2021-04-03" "\ \&" "\ \&"
+.TH "MUMDRC" "5" "2021-04-10" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index 6fca6a4..745fafa 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -92,8 +92,8 @@ enum Command {
     Undeafen,
     /// Get messages sent to the server you're currently connected to
     Messages {
-        #[structopt(short = "i", long = "interactive")]
-        interactive: bool,
+        #[structopt(short = "f", long = "follow")]
+        follow: bool,
     },
     /// Send a message to a channel or a user
     Message(Target),
@@ -378,9 +378,9 @@ fn match_opt() -> Result<(), Error> {
             send_command(MumCommand::DeafenSelf(Some(false)))??;
         }
         Command::Messages {
-            interactive
+            follow
         } => {
-            for response in send_command_multi(MumCommand::PastMessages { block: interactive })? {
+            for response in send_command_multi(MumCommand::PastMessages { block: follow })? {
                 match response {
                     Ok(Some(CommandResponse::PastMessage { message })) => println!("{}: {}", message.1, message.0),
                     Ok(_) => unreachable!("Response should only be a Some(PastMessages)"),