Merge pull request #507 from CSUSTers/dev

Dev
CSUSTers · Dec 24, 2024 · 0e6b4c2 · 0e6b4c2
2 parents d8d20a5 + 78b80f6
commit 0e6b4c2
Show file tree

Hide file tree

Showing 10 changed files with 156 additions and 96 deletions.
diff --git a/.gitignore b/.gitignore
@@ -117,6 +117,7 @@ fabric.properties
 data/
 
 .vscode/
+.idea/
 
 # output
 got
@@ -126,3 +127,4 @@ csust-got.exe
 a.http
 .idea/GitLink.xml
 dictionary.txt
+/logs
diff --git a/Dockerfile b/Dockerfile
@@ -8,20 +8,22 @@ ARG BRANCH
 ARG TAG
 ARG RELEASE
 
+WORKDIR /go/src/app
+COPY . .
+RUN make deps
+
 ENV BRANCH=$BRANCH
 ENV TAG=$TAG
 ENV GOARCH=$TARGETARCH
 
-WORKDIR /go/src/app
-COPY . .
 RUN make deploy
 
 
 # deploy image
 FROM --platform=$BUILDPLATFORM alpine
 
 RUN apk add --no-cache tzdata
-COPY --from=hugefiver/ffmpeg:7.0.1-2 /ffmpeg /usr/local/bin/ffmpeg
+COPY --from=hugefiver/ffmpeg:7.1 /ffmpeg /usr/local/bin/ffmpeg
 # COPY --from=hugefiver/ffmpeg:7.0.1 /ffprobe /usr/local/bin/ffprobe
 
 WORKDIR /app

diff --git a/base/helper.go b/base/helper.go
@@ -29,6 +29,14 @@ func Info(ctx Context) error {
 	msg += fmt.Sprintf("Build Time:  %s\n", buildTime)
 	msg += fmt.Sprintf("Last Boot:   %s\n", lastBoot)
 	msg += fmt.Sprintf("Go Version:  %s\n", runtime.Version())
+	if ctx.Bot().URL != DefaultApiURL {
+		msg += "API Server:  CUSTOM\n"
+	} else {
+		msg += "API Server:  OFFICIAL\n"
+	}
+	if config.BotConfig.DebugMode {
+		msg += "Debug Mode:  YES\n"
+	}
 	msg += "```"
 
 	return ctx.Send(msg, ModeMarkdownV2)