UI WIP.

client/@types/global.d.ts

@@ -49,11 +49,19 @@ declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_REASON_LABEL: s
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_REASON_DESC: string
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_REGEXP_LABEL: string
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_REGEXP_DESC: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_APPLYTOMODERATORS_LABEL: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_APPLYTOMODERATORS_DESC: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_LABEL: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_DESC: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_CMD_LABEL: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_CMD_DESC: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_MESSAGE_LABEL: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_MESSAGE_DESC: string
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_LABEL: string
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DESC: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DESC2: string
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DELAY_LABEL: string
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DELAY_DESC: string
-declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_COMMAND_LABEL: string
-declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_COMMAND_DESC: string
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_BANNED_JIDS_LABEL: string
 declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_BOT_NICKNAME: string
+declare const LOC_LIVECHAT_CONFIGURATION_CHANNEL_FOR_MORE_INFO: string

client/common/configuration/templates/channel.ts

@@ -49,6 +49,9 @@ async function renderConfigurationChannel (
         target=_blank
         class="orange-button peertube-button-link"
       >${helpIcon}</a>`
+    const helpButtonForbiddenWords = helpButton
+    const helpButtonQuotes = helpButton
+    const helpButtonCommands = helpButton
 
     const view = {
       title: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_TITLE),
@@ -70,16 +73,28 @@ async function renderConfigurationChannel (
       forbiddenWordsRegexpDesc: await peertubeHelpers.translate(
         LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_REGEXP_DESC
       ),
+      forbiddenWordsApplyToModerators: await peertubeHelpers.translate(
+        LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_APPLYTOMODERATORS_LABEL
+      ),
+      forbiddenWordsApplyToModeratorsDesc: await peertubeHelpers.translate(
+        LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_APPLYTOMODERATORS_DESC
+      ),
       quoteLabel: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_LABEL),
       quoteDesc: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DESC),
+      quoteDesc2: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DESC2),
       quoteDelayLabel: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DELAY_LABEL),
       quoteDelayDesc: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DELAY_DESC),
-      quoteCommandLabel: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_COMMAND_LABEL),
+      commandLabel: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_LABEL),
-      quoteCommandDesc: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_COMMAND_DESC),
+      commandDesc: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_DESC),
+      commandCmdLabel: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_CMD_LABEL),
+      commandCmdDesc: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_CMD_DESC),
+      commandMessageLabel: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_MESSAGE_LABEL),
+      commandMessageDesc: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_MESSAGE_DESC),
       // bannedJIDs: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_BANNED_JIDS_LABEL),
       save: await peertubeHelpers.translate(LOC_SAVE),
       cancel: await peertubeHelpers.translate(LOC_CANCEL),
       botNickname: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_BOT_NICKNAME),
+      moreInfo: await peertubeHelpers.translate(LOC_LIVECHAT_CONFIGURATION_CHANNEL_FOR_MORE_INFO),
       forbiddenWordsArray: [0, 1, 2].map(count => {
         return {
           displayNumber: count + 1,
@@ -87,7 +102,14 @@ async function renderConfigurationChannel (
           displayHelp: count === 0
         }
       }),
-      quotesArray: [0, 1, 2].map(count => {
+      quotesArray: [0].map(count => {
+        return {
+          displayNumber: count + 1,
+          fieldNumber: count,
+          displayHelp: count === 0
+        }
+      }),
+      cmdsArray: [0, 1, 2].map(count => {
         return {
           displayNumber: count + 1,
           fieldNumber: count,
@@ -95,6 +117,9 @@ async function renderConfigurationChannel (
         }
       }),
       helpButton,
+      helpButtonForbiddenWords,
+      helpButtonCommands,
+      helpButtonQuotes,
       channelConfiguration
     }
 
@@ -106,6 +131,7 @@ async function renderConfigurationChannel (
             <span>{{channelConfiguration.channel.displayName}}</span>
             <span>{{channelConfiguration.channel.name}}</span>
           </span>
+          {{{helpButton}}}
         </h1>
         <p>{{description}}</p>
         <form livechat-configuration-channel-options role="form">
@@ -146,8 +172,8 @@ async function renderConfigurationChannel (
               <div class="col-12 col-lg-4 col-xl-3">
                 <h2>{{forbiddenWords}} #{{displayNumber}}</h2>
                 {{#displayHelp}}
-                  <p>{{forbiddenWordsDesc}}</p>
+                  <p>{{forbiddenWordsDesc}} {{moreInfo}}</p>
-                  {{{helpButton}}}
+                  {{{HelpButtonForbiddenWords}}}
                 {{/displayHelp}}
               </div>
               <div class="col-12 col-lg-8 col-xl-9">
@@ -176,6 +202,17 @@ async function renderConfigurationChannel (
                   </label>
                   <p class="form-group-description">{{forbiddenWordsRegexpDesc}}</p>
                 </div>
+                <div class="form-group">
+                  <label>
+                    <input
+                      type="checkbox"
+                      name="forbidden_words_applytomoderators_{{fieldNumber}}"
+                      value="1"
+                    />
+                    {{forbiddenWordsApplyToModerators}}
+                  </label>
+                  <p class="form-group-description">{{forbiddenWordsApplyToModeratorsDesc}}</p>
+                </div>
                 <div class="form-group">
                   <label for="peertube-livechat-forbidden-words-reason-{{fieldNumber}}">{{forbiddenWordsReason}}</label>
                   <input
@@ -196,49 +233,78 @@ async function renderConfigurationChannel (
               <div class="col-12 col-lg-4 col-xl-3">
                 <h2>{{quoteLabel}} #{{displayNumber}}</h2>
                 {{#displayHelp}}
-                  <p>{{quoteDesc}}</p>
+                  <p>{{quoteDesc}} {{moreInfo}}</p>
-                  {{{helpButton}}}
+                  {{{helpButtonQuotes}}}
                 {{/displayHelp}}
               </div>
               <div class="col-12 col-lg-8 col-xl-9">
                 <div class="form-group">
                   <label for="peertube-livechat-quote-{{fieldNumber}}">{{quoteLabel}}</label>
-                  <input
+                  {{! warning: don't add extra line break in textarea! }}
-                    type="text"
+                  <textarea
                     name="quote_{{fieldNumber}}"
-                    class="form-control"
                     id="peertube-livechat-quote-{{fieldNumber}}"
-                    value=""
+                    class="form-control"
-                  />
+                  >{{
+                    #channelConfiguration.configuration.TODO
+                  }}{{.}}\n{{
+                    /channelConfiguration.configuration.TODO
+                  }}</textarea>
+                  <p class="form-group-description">{{quoteDesc2}}</p>
                 </div>
                 <div class="form-group">
                   <label for="peertube-livechat-quote-delay-{{fieldNumber}}">{{quoteDelayLabel}}</label>
                   <input
                     type="number"
-                    min="0"
+                    min="1"
                     max="6000"
                     step="1"
                     name="quote_delay_{{fieldNumber}}"
                     class="form-control"
                     id="peertube-livechat-quote-delay-{{fieldNumber}}"
-                    value="0"
+                    value="5"
                   />
                   <p class="form-group-description">{{quoteDelayDesc}}</p>
                 </div>
-                <div class="form-group">
-                  <label for="peertube-livechat-quote-command-{{fieldNumber}}">{{quoteCommandLabel}}</label>
-                  <input
-                    type="text"
-                    name="quote_command_{{fieldNumber}}"
-                    class="form-control"
-                    id="peertube-livechat-quote-command-{{fieldNumber}}"
-                    value=""
-                  />
-                  <p class="form-group-description">{{quoteCommandDesc}}</p>
-                </div>
               </div>
             </div>
           {{/quotesArray}}
+
+          {{#cmdsArray}}{{! iterating on cmdsArray to display N fields }}
+            <div class="row mt-5" livechat-configuration-channel-options-bot-enabled>
+              <div class="col-12 col-lg-4 col-xl-3">
+                <h2>{{commandLabel}} #{{displayNumber}}</h2>
+                {{#displayHelp}}
+                  <p>{{commandDesc}} {{moreInfo}}</p>
+                  {{{helpButtonCommands}}}
+                {{/displayHelp}}
+              </div>
+              <div class="col-12 col-lg-8 col-xl-9">
+                <div class="form-group">
+                  <label for="peertube-livechat-command-{{fieldNumber}}">{{commandCmdLabel}}</label>
+                  <input
+                    type="text"
+                    name="command_{{fieldNumber}}"
+                    class="form-control"
+                    id="peertube-livechat-command-{{fieldNumber}}"
+                    value=""
+                  />
+                  <p class="form-group-description">{{commandCmdDesc}}</p>
+                </div>
+                <div class="form-group">
+                  <label for="peertube-livechat-command-message-{{fieldNumber}}">{{commandMessageLabel}}</label>
+                  <input
+                    type="text"
+                    name="command_message_{{fieldNumber}}"
+                    class="form-control"
+                    id="peertube-livechat-command-message-{{fieldNumber}}"
+                    value=""
+                  />
+                  <p class="form-group-description">{{commandMessageDesc}}</p>
+                </div>
+              </div>
+            </div>
+          {{/cmdsArray}}
           <div class="form-group">
             <input type="submit" value="{{save}}" />
             <input type="reset" value="{{cancel}}" />

languages/en.yml

@@ -319,7 +319,6 @@ livechat_configuration_channel_forbidden_words_label: "Forbidden words or expres
 livechat_configuration_channel_forbidden_words_desc: |
   You can configure some words that will be automatically moderated by the bot (messages containing such words will be instantly deleted).
   You can also add an optional reason that will be displayed at the place of deleted messages.
-  For more information about how to configure this feature, please refer to the documentation by clicking on the help button.
   Several examples are provided on the documentation page.
 livechat_configuration_channel_forbidden_words_desc2: |
   One word or expression per line. If you put multiple words on one line, it will only match messages containing the whole sequence.
@@ -327,20 +326,32 @@ livechat_configuration_channel_forbidden_words_reason_label: "Reason"
 livechat_configuration_channel_forbidden_words_reason_desc: "Reason to display besides deleted messages"
 livechat_configuration_channel_forbidden_words_regexp_label: "Consider as regular expressions"
 livechat_configuration_channel_forbidden_words_regexp_desc: "By checking this option, you can use regular expressions."
-livechat_configuration_channel_quote_label: "Pre-recorded message"
+livechat_configuration_channel_forbidden_words_applytomoderators_label:  "Also moderate messages from moderators"
+livechat_configuration_channel_forbidden_words_applytomoderators_desc: |
+  By default, moderator messages will not be deleted when containing forbidden words.
+  By checking this option, messages from moderators will also be deleted.
+livechat_configuration_channel_quote_label: "Pre-recorded messages"
 livechat_configuration_channel_quote_desc: |
   You can configure several pre-recorded messages.
-  These messages will be sent by the bot every X minutes and/or when a chat user uses the corresponding command (for example "!help", where "help is the command name").
+  These messages will be sent by the bot every X minutes.
-  You can for example make the bot sent some sponsoring information every 5 minutes, or when a user types "!sponsor".
+  You can for example make the bot sent some sponsoring information every 5 minutes.
-  For more information about how to configure this feature, please refer to the documentation by clicking on the help button.
+livechat_configuration_channel_quote_desc2: |
+  One message per line.
+  If multiple messages, it will pick one randomly every X minutes.
 livechat_configuration_channel_quote_delay_label: "Send every X minutes"
 livechat_configuration_channel_quote_delay_desc: |
   The bot will post the message every X minutes.
-  Set to 0 if you don't want the bot to send the message periodically.
+livechat_configuration_channel_command_label: "Bot command"
-livechat_configuration_channel_quote_command_label: "Bot command"
+livechat_configuration_channel_command_desc: |
-livechat_configuration_channel_quote_command_desc: |
+  You can configure the bot to respond to commands.
-  A command on which the bot will respond.
+  A command is a message starting with a "!", like for example "!help" that calls the "help" command.
-  For example if you set "help", the bot will respond to messages starting with "!help".
+livechat_configuration_channel_command_cmd_label: "Command"
-  Left empty if you don't want the bot to respond to commands.
+livechat_configuration_channel_command_cmd_desc: |
+  The command, without the starting "!". For example "help", "sponsor", ...
+livechat_configuration_channel_command_message_label: "Message"
+livechat_configuration_channel_command_message_desc: |
+  The message to send. Can contain "{{NICK}}" that will be replaced by the user's nickname.
+livechat_configuration_channel_for_more_info: |
+  For more information about how to configure this feature, please refer to the documentation by clicking on the help button.
 livechat_configuration_channel_banned_jids_label: "Banned users and patterns"
 livechat_configuration_channel_bot_nickname: "Bot nickname"

server/lib/configuration/bot.ts

@@ -190,7 +190,7 @@ class BotConfiguration {
           // Note: using localhost, and not currentProsody.host, because it does not always resolve correctly
           service: 'xmpp://localhost:' + port
         },
-        name: 'Moderator',
+        name: 'Sepia',
         logger: 'ConsoleLogger',
         log_level: isDebugMode(this.options) ? 'debug' : 'info'
       }