Skip to content

Commit

Permalink
Define session token via ENV
Browse files Browse the repository at this point in the history
  • Loading branch information
skrashevich committed Dec 12, 2022
1 parent 47e75ec commit ea82e04
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 19 deletions.
3 changes: 0 additions & 3 deletions .config/chatgpt.json

This file was deleted.

6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ RUN make build

FROM alpine
COPY --from=builder /build/chatgpt-telegram /bin/chatgpt-telegram
RUN chmod +x /bin/chatgpt-telegram
RUN chmod +x /bin/chatgpt-telegram && mkdir -p /root/.config

ENV TELEGRAM_ID ""
ENV TELEGRAM_TOKEN ""
ENV OPENAI_SESSION ""

ENTRYPOINT ["/bin/chatgpt-telegram"]
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ services:
chatgpt-telegram:
build: .
container_name: chatgpt-telegram
volumes:
- .config/:/root/.config
environment:
- TELEGRAM_ID=
- TELEGRAM_TOKEN=
- OPENAI_SESSION=
1 change: 1 addition & 0 deletions env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
TELEGRAM_ID=
TELEGRAM_TOKEN=
EDIT_WAIT_SECONDS=1
OPENAI_SESSION=
36 changes: 23 additions & 13 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,36 @@ func main() {
log.Fatalf("Couldn't load config: %v", err)
}

if persistentConfig.OpenAISession == "" {
token, err := session.GetSession()
if err != nil {
log.Fatalf("Couldn't get OpenAI session: %v", err)
}
err = godotenv.Load()
if err != nil {
log.Printf("Couldn't load .env file: %v. Using shell exposed env variables...", err)
}


if config.OpenAISession == "" {
if os.Getenv("OPENAI_SESSION") == "" {
session, err := session.GetSession()
if err != nil {
log.Fatalf("Couldn't get OpenAI session: %v", err)
}

if err = persistentConfig.SetSessionToken(token); err != nil {
log.Fatalf("Couldn't save OpenAI session: %v", err)
err = config.Set("OpenAISession", session)
if err != nil {
log.Fatalf("Couldn't save OpenAI session: %v", err)
}
} else
{
err = config.Set("OpenAISession", os.Getenv("OPENAI_SESSION"))
if err != nil {
log.Fatalf("Couldn't save OpenAI session: %v", err)
}
}
}

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

envConfig, err := config.LoadEnvConfig(".env")
if err != nil {
log.Printf("Couldn't load .env file: %v. Using shell exposed env variables...", err)
}

bot, err := tgbot.New(envConfig.TelegramToken, time.Duration(envConfig.EditWaitSeconds))
bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_TOKEN"))
if err != nil {
log.Fatalf("Couldn't start Telegram bot: %v", err)
}
Expand Down

0 comments on commit ea82e04

Please sign in to comment.