update all discord templates and handlers, update bot config file

abdfnx · May 9, 2022 · b339b8b · b339b8b
1 parent f541955
commit b339b8b
Show file tree

Hide file tree

Showing 26 changed files with 245 additions and 609 deletions.
diff --git a/docker/full.dockerfile b/docker/full.dockerfile
diff --git a/internal/pipes/new/cmds.go b/internal/pipes/new/cmds.go
@@ -158,8 +158,8 @@ func buildBot(msg tea.Msg, m model, botName string) (tea.Model, tea.Cmd) {
 		viper.SetDefault("bot.version", "0.1.0")
 		dockerImage := conf.String("user.docker_id") + "/" + opts.BotName
 		viper.SetDefault("docker.image", dockerImage)
-		viper.SetDefault("docker.build_cmd", "docker build -t " + dockerImage + " .")
-		viper.SetDefault("docker.run_cmd", "docker run -it " + dockerImage)
+		viper.SetDefault("docker.cmds.build", "docker build -t " + dockerImage + " .")
+		viper.SetDefault("docker.cmds.run", "docker run -it " + dockerImage)
 
 		if err := viper.SafeWriteConfig(); err != nil {
 			if os.IsNotExist(err) {

diff --git a/internal/pipes/new/discord_handler.go b/internal/pipes/new/discord_handler.go
@@ -3,14 +3,11 @@ package new
 import (
 	"github.com/abdfnx/botway/templates/discord/deno"
 	"github.com/abdfnx/botway/templates/discord/go"
-	"github.com/abdfnx/botway/templates/discord/nodejs/npm"
-	"github.com/abdfnx/botway/templates/discord/nodejs/pnpm"
-	"github.com/abdfnx/botway/templates/discord/nodejs/yarn"
+	"github.com/abdfnx/botway/templates/discord/nodejs"
 	"github.com/abdfnx/botway/templates/discord/python/pip"
 	"github.com/abdfnx/botway/templates/discord/python/pipenv"
 	"github.com/abdfnx/botway/templates/discord/ruby"
-	"github.com/abdfnx/botway/templates/discord/rust/cargo"
-	"github.com/abdfnx/botway/templates/discord/rust/fleet"
+	"github.com/abdfnx/botway/templates/discord/rust"
 )
 
 func DiscordHandler(m model) {
@@ -21,17 +18,17 @@ func DiscordHandler(m model) {
 	} else if m.PlatformChoice == 0 && m.LangChoice == 1 {
 		dgo.DiscordGo(opts.BotName)
 	} else if m.PlatformChoice == 0 && m.LangChoice == 2 && m.PMCoice == 0 {
-		npm.DiscordNodejsNpm(opts.BotName)
+		nodejs.DiscordNodejs(opts.BotName, "npm")
 	} else if m.PlatformChoice == 0 && m.LangChoice == 2 && m.PMCoice == 1 {
-		yarn.DiscordNodejsYarn(opts.BotName)
+		nodejs.DiscordNodejs(opts.BotName, "yarn")
 	} else if m.PlatformChoice == 0 && m.LangChoice == 2 && m.PMCoice == 2 {
-		pnpm.DiscordNodejsPnpm(opts.BotName)
+		nodejs.DiscordNodejs(opts.BotName, "pnpm")
 	} else if m.PlatformChoice == 0 && m.LangChoice == 3 {
 		ruby.DiscordRuby(opts.BotName)
 	} else if m.PlatformChoice == 0 && m.LangChoice == 4 && m.PMCoice == 0 {
-		cargo.DiscordRustCargo(opts.BotName)
+		rust.DiscordRust(opts.BotName, "cargo")
 	} else if m.PlatformChoice == 0 && m.LangChoice == 4 && m.PMCoice == 1 {
-		fleet.DiscordRustFleet(opts.BotName)
+		rust.DiscordRust(opts.BotName, "fleet")
 	} else if m.PlatformChoice == 0 && m.LangChoice == 5 {
 		deno.DiscordDeno(opts.BotName)
 	}

diff --git a/internal/pipes/new/utils.go b/internal/pipes/new/utils.go
@@ -75,7 +75,7 @@ func BotStartCmd(m model) string {
 	} else if m.LangChoice == 1 {
 		return "go run src/main.go"
 	} else if m.LangChoice == 2 {
-		return "node src/main.js"
+		return "node src/index.js"
 	} else if m.LangChoice == 3 {
 		return "bundle exec ruby src/main.rb"
 	} else if m.LangChoice == 4 {

diff --git a/templates/discord/deno/assets/Dockerfile b/templates/discord/deno/assets/Dockerfile
@@ -1,11 +1,11 @@
 FROM alpine:latest
-FROM node:alpine
 FROM denoland/deno:alpine
 FROM botwayorg/botway:latest
 
-ENV DISCORD_BOT_NAME="{{.BotName}}"
 ARG DISCORD_TOKEN
 ARG DISCORD_CLIENT_ID
+# Uncomment the comment below to add your guild id, like this syntax --> ARG MY_SERVER_GUILD_ID
+# ARG SERVER_GUILD_ID
 
 ADD . .
 
@@ -15,12 +15,12 @@ RUN apk update && \
 # Add packages you want
 # RUN apk add PACKAGE_NAME
 
-RUN botway init --docker --name ${DISCORD_BOT_NAME}
+RUN botway init --docker
 
 USER deno
 
 RUN deno cache deps.ts
 
 EXPOSE 8000
 
-ENTRYPOINT ["deno", "run", "--allow-net", "--allow-write", "--allow-read", "--allow-run", "mod.ts"]
+ENTRYPOINT ["deno", "run", "--allow-all", "mod.ts"]
diff --git a/templates/discord/deno/index.go b/templates/discord/deno/index.go
@@ -43,7 +43,7 @@ func DiscordDeno(botName string) {
 		utilsHelpersTsFile := os.WriteFile(filepath.Join(botName, "src", "utils", "helpers.ts"), []byte(UtilsHelpersTsContent()), 0644)
 		utilsLoggerTsFile := os.WriteFile(filepath.Join(botName, "src", "utils", "logger.ts"), []byte(UtilsLoggerTsContent()), 0644)
 		dockerFile := os.WriteFile(filepath.Join(botName, "Dockerfile"), []byte(DockerfileContent(botName)), 0644)
-		procFile := os.WriteFile(filepath.Join(botName, "Procfile"), []byte("process: deno run --allow-net --allow-write --allow-read --allow-run mod.ts"), 0644)
+		procFile := os.WriteFile(filepath.Join(botName, "Procfile"), []byte("process: deno run --allow-all mod.ts"), 0644)
 		resourcesFile := os.WriteFile(filepath.Join(botName, "resources.md"), []byte(Resources()), 0644)
 
 		if modFile != nil {

diff --git a/templates/discord/go/assets/Dockerfile b/templates/discord/go/assets/Dockerfile
@@ -5,6 +5,8 @@ FROM botwayorg/botway:latest
 ENV DISCORD_BOT_NAME="{{.BotName}}"
 ARG DISCORD_TOKEN
 ARG DISCORD_CLIENT_ID
+# Uncomment the comment below to add your guild id, like this syntax --> ARG MY_SERVER_GUILD_ID
+# ARG SERVER_GUILD_ID
 
 COPY . .
 
@@ -14,7 +16,7 @@ RUN apk update && \
 # Add packages you want
 # RUN apk add PACKAGE_NAME
 
-RUN botway init --docker --name ${DISCORD_BOT_NAME}
+RUN botway init --docker
 RUN go mod tidy
 RUN go build src/main.go -o ${DISCORD_BOT_NAME}
 

diff --git a/templates/discord/nodejs/assets/npm/Dockerfile b/templates/discord/nodejs/assets/npm/Dockerfile
@@ -3,9 +3,10 @@ FROM node:alpine
 FROM botwayorg/botway:latest
 
 ENV NODE_ENV=production
-ENV DISCORD_BOT_NAME="{{.BotName}}"
 ARG DISCORD_TOKEN
 ARG DISCORD_CLIENT_ID
+# Uncomment the comment below to add your guild id, like this syntax --> ARG MY_SERVER_GUILD_ID
+# ARG SERVER_GUILD_ID
 
 COPY . .
 
@@ -15,7 +16,7 @@ RUN apk update && \
 # Add packages you want
 # RUN apk add PACKAGE_NAME
 
-RUN botway init --docker --name ${DISCORD_BOT_NAME}
+RUN botway init --docker
 RUN npm i --production
 
 EXPOSE 8000

diff --git a/templates/discord/nodejs/assets/pnpm/Dockerfile b/templates/discord/nodejs/assets/pnpm/Dockerfile
@@ -2,17 +2,18 @@ FROM alpine:latest
 FROM node:alpine
 FROM botwayorg/botway:latest
 
-ENV DISCORD_BOT_NAME="{{.BotName}}"
 ARG DISCORD_TOKEN
 ARG DISCORD_CLIENT_ID
+# Uncomment the comment below to add your guild id, like this syntax --> ARG MY_SERVER_GUILD_ID
+# ARG SERVER_GUILD_ID
 
 RUN apk update && \
 	apk add --no-cache --virtual build-dependencies build-base gcc git ffmpeg
 
 # Add packages you want
 # RUN apk add PACKAGE_NAME
 
-RUN botway init --docker --name ${DISCORD_BOT_NAME}
+RUN botway init --docker
 RUN curl -fsSL https://get.pnpm.io/install.sh | PNPM_VERSION=7.0.0 sh -
 
 RUN pnpm fetch --prod

diff --git a/templates/discord/nodejs/assets/yarn/Dockerfile b/templates/discord/nodejs/assets/yarn/Dockerfile
@@ -2,9 +2,10 @@ FROM alpine:latest
 FROM node:alpine
 FROM botwayorg/botway:latest
 
-ENV DISCORD_BOT_NAME="{{.BotName}}"
 ARG DISCORD_TOKEN
 ARG DISCORD_CLIENT_ID
+# Uncomment the comment below to add your guild id, like this syntax --> ARG MY_SERVER_GUILD_ID
+# ARG SERVER_GUILD_ID
 
 COPY . .
 

diff --git a/templates/discord/nodejs/npm/contents.go b/templates/discord/nodejs/npm/contents.go
diff --git a/templates/discord/nodejs/npm/index.go b/templates/discord/nodejs/npm/index.go
diff --git a/templates/discord/nodejs/pnpm/contents.go b/templates/discord/nodejs/pnpm/contents.go