Skip to content

Commit 905d679

Browse files
committed
Define session token via ENV
1 parent b4d0e91 commit 905d679

File tree

5 files changed

+28
-18
lines changed

5 files changed

+28
-18
lines changed

.config/chatgpt.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ RUN make build
66

77
FROM alpine
88
COPY --from=builder /build/chatgpt-telegram /bin/chatgpt-telegram
9-
RUN chmod +x /bin/chatgpt-telegram
9+
RUN chmod +x /bin/chatgpt-telegram && mkdir -p /root/.config
10+
11+
ENV TELEGRAM_ID ""
12+
ENV TELEGRAM_TOKEN ""
13+
ENV OPENAI_SESSION ""
1014

1115
ENTRYPOINT ["/bin/chatgpt-telegram"]

docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ services:
22
chatgpt-telegram:
33
build: .
44
container_name: chatgpt-telegram
5-
volumes:
6-
- .config/:/root/.config
75
environment:
86
- TELEGRAM_ID=
97
- TELEGRAM_TOKEN=
8+
- OPENAI_SESSION=

env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
TELEGRAM_ID=
22
TELEGRAM_TOKEN=
3+
OPENAI_SESSION=

main.go

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,35 @@ func main() {
2929
log.Fatalf("Couldn't load config: %v", err)
3030
}
3131

32+
err = godotenv.Load()
33+
if err != nil {
34+
log.Printf("Couldn't load .env file: %v. Using shell exposed env variables...", err)
35+
}
36+
37+
3238
if config.OpenAISession == "" {
33-
session, err := session.GetSession()
34-
if err != nil {
35-
log.Fatalf("Couldn't get OpenAI session: %v", err)
36-
}
39+
if os.Getenv("OPENAI_SESSION") == "" {
40+
session, err := session.GetSession()
41+
if err != nil {
42+
log.Fatalf("Couldn't get OpenAI session: %v", err)
43+
}
3744

38-
err = config.Set("OpenAISession", session)
39-
if err != nil {
40-
log.Fatalf("Couldn't save OpenAI session: %v", err)
45+
err = config.Set("OpenAISession", session)
46+
if err != nil {
47+
log.Fatalf("Couldn't save OpenAI session: %v", err)
48+
}
49+
} else
50+
{
51+
err = config.Set("OpenAISession", os.Getenv("OPENAI_SESSION"))
52+
if err != nil {
53+
log.Fatalf("Couldn't save OpenAI session: %v", err)
54+
}
4155
}
4256
}
4357

4458
chatGPT := chatgpt.Init(config)
4559
log.Println("Started ChatGPT")
4660

47-
err = godotenv.Load()
48-
if err != nil {
49-
log.Printf("Couldn't load .env file: %v. Using shell exposed env variables...", err)
50-
}
51-
5261
bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_TOKEN"))
5362
if err != nil {
5463
log.Fatalf("Couldn't start Telegram bot: %v", err)

0 commit comments

Comments
 (0)