@@ -133,46 +133,36 @@ generate_config() {
133133 "channels": {
134134EOF
135135
136- # Add messenger config based on selected platform
137- local messenger
138- messenger=" $( config-get messenger) "
139-
140- if [ -n " $messenger " ]; then
141- local bot_token
142- bot_token=" $( config-get bot-token) "
143-
144- case " $messenger " in
145- telegram)
146- if [ -n " $bot_token " ]; then
147- cat >> " $config_file " << EOF
136+ # Add platform-specific messenger configs
137+ local telegram_bot_token discord_bot_token slack_bot_token slack_app_token
138+ telegram_bot_token=" $( config-get telegram-bot-token) "
139+ discord_bot_token=" $( config-get discord-bot-token) "
140+ slack_bot_token=" $( config-get slack-bot-token) "
141+ slack_app_token=" $( config-get slack-app-token) "
142+
143+ if [ -n " $telegram_bot_token " ]; then
144+ cat >> " $config_file " << EOF
148145 "telegram": {
149- "botToken": "${bot_token } "
146+ "botToken": "${telegram_bot_token } "
150147 },
151148EOF
152- fi
153- ;;
154- discord)
155- if [ -n " $bot_token " ]; then
156- cat >> " $config_file " << EOF
149+ fi
150+
151+ if [ -n " $discord_bot_token " ]; then
152+ cat >> " $config_file " << EOF
157153 "discord": {
158- "token": "${bot_token } "
154+ "token": "${discord_bot_token } "
159155 },
160156EOF
161- fi
162- ;;
163- slack)
164- local app_token
165- app_token=" $( config-get app-token) "
166- if [ -n " $bot_token " ] && [ -n " $app_token " ]; then
167- cat >> " $config_file " << EOF
157+ fi
158+
159+ if [ -n " $slack_bot_token " ] && [ -n " $slack_app_token " ]; then
160+ cat >> " $config_file " << EOF
168161 "slack": {
169- "botToken": "${bot_token } ",
170- "appToken": "${app_token } "
162+ "botToken": "${slack_bot_token } ",
163+ "appToken": "${slack_app_token } "
171164 },
172165EOF
173- fi
174- ;;
175- esac
176166 fi
177167
178168 # Close channels object (remove trailing comma if exists)
@@ -389,34 +379,18 @@ validate_config() {
389379 errors=$(( errors + 1 ))
390380 fi
391381
392- local messenger
393- messenger=" $( config-get messenger) "
382+ local slack_bot_token slack_app_token
383+ slack_bot_token=" $( config-get slack-bot-token) "
384+ slack_app_token=" $( config-get slack-app-token) "
394385
395- if [ -n " $messenger " ]; then
396- case " $messenger " in
397- telegram|discord)
398- if [ -z " $( config-get bot-token) " ]; then
399- log_error " $messenger messenger selected but no bot-token configured"
400- errors=$(( errors + 1 ))
401- fi
402- ;;
403- slack)
404- if [ -z " $( config-get bot-token) " ]; then
405- log_error " Slack messenger selected but no bot-token configured"
406- errors=$(( errors + 1 ))
407- fi
408- if [ -z " $( config-get app-token) " ]; then
409- log_error " Slack messenger selected but no app-token configured"
410- errors=$(( errors + 1 ))
411- fi
412- ;;
413- * )
414- if [ " $messenger " != " " ]; then
415- log_error " Invalid messenger value: $messenger (valid: telegram, discord, slack)"
416- errors=$(( errors + 1 ))
417- fi
418- ;;
419- esac
386+ if [ -n " $slack_bot_token " ] && [ -z " $slack_app_token " ]; then
387+ log_error " Slack bot-token configured but app-token is missing"
388+ errors=$(( errors + 1 ))
389+ fi
390+
391+ if [ -z " $slack_bot_token " ] && [ -n " $slack_app_token " ]; then
392+ log_error " Slack app-token configured but bot-token is missing"
393+ errors=$(( errors + 1 ))
420394 fi
421395
422396 return $errors
0 commit comments