Skip to content

Commit ea82e04

Browse files
committed
Define session token via ENV
1 parent 47e75ec commit ea82e04

File tree

5 files changed

+30
-19
lines changed

5 files changed

+30
-19
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,3 +1,4 @@
11
TELEGRAM_ID=
22
TELEGRAM_TOKEN=
33
EDIT_WAIT_SECONDS=1
4+
OPENAI_SESSION=

main.go

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,36 @@ func main() {
2020
log.Fatalf("Couldn't load config: %v", err)
2121
}
2222

23-
if persistentConfig.OpenAISession == "" {
24-
token, err := session.GetSession()
25-
if err != nil {
26-
log.Fatalf("Couldn't get OpenAI session: %v", err)
27-
}
23+
err = godotenv.Load()
24+
if err != nil {
25+
log.Printf("Couldn't load .env file: %v. Using shell exposed env variables...", err)
26+
}
27+
28+
29+
if config.OpenAISession == "" {
30+
if os.Getenv("OPENAI_SESSION") == "" {
31+
session, err := session.GetSession()
32+
if err != nil {
33+
log.Fatalf("Couldn't get OpenAI session: %v", err)
34+
}
2835

29-
if err = persistentConfig.SetSessionToken(token); err != nil {
30-
log.Fatalf("Couldn't save OpenAI session: %v", err)
36+
err = config.Set("OpenAISession", session)
37+
if err != nil {
38+
log.Fatalf("Couldn't save OpenAI session: %v", err)
39+
}
40+
} else
41+
{
42+
err = config.Set("OpenAISession", os.Getenv("OPENAI_SESSION"))
43+
if err != nil {
44+
log.Fatalf("Couldn't save OpenAI session: %v", err)
45+
}
3146
}
3247
}
3348

3449
chatGPT := chatgpt.Init(persistentConfig)
3550
log.Println("Started ChatGPT")
3651

37-
envConfig, err := config.LoadEnvConfig(".env")
38-
if err != nil {
39-
log.Printf("Couldn't load .env file: %v. Using shell exposed env variables...", err)
40-
}
41-
42-
bot, err := tgbot.New(envConfig.TelegramToken, time.Duration(envConfig.EditWaitSeconds))
52+
bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_TOKEN"))
4353
if err != nil {
4454
log.Fatalf("Couldn't start Telegram bot: %v", err)
4555
}

0 commit comments

Comments
 (0)