From 71d83a6ada6df7034d85a574cb4f5b849117df33 Mon Sep 17 00:00:00 2001 From: Jannover5000r Date: Wed, 25 Jun 2025 10:16:44 +0200 Subject: [PATCH] fixed decleration problem --- Bot/Timetable.go | 6 ++++++ Bot/Untis.go | 33 +-------------------------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/Bot/Timetable.go b/Bot/Timetable.go index 6b1a2ca..74afefc 100644 --- a/Bot/Timetable.go +++ b/Bot/Timetable.go @@ -71,6 +71,12 @@ type params struct { Id int `json:"id"` Type int `json:"type"` } +type Loginresult struct { + SessionID string `json:"sessionId"` + PersonType int `json:"personType"` + PersonID int `json:"personId"` + KlasseID int `json:"klasseId"` +} func ReadLoginResultFromFile(path string) (Loginresult, error) { var result Loginresult diff --git a/Bot/Untis.go b/Bot/Untis.go index db0771b..4722eb4 100644 --- a/Bot/Untis.go +++ b/Bot/Untis.go @@ -3,7 +3,6 @@ package Untis import ( "bytes" "encoding/json" - "io" "log" "net/http" "os" @@ -24,17 +23,6 @@ type Login struct { Jsonrpc string `json:"jsonrpc"` } -type LoginResponse struct { - Jsonrpc string `json:"jsonrpc"` - ID string `json:"id"` - Result Loginresult `json:"result"` -} -type Loginresult struct { - SessionID string `json:"sessionId"` - PersonType int `json:"personType"` - PersonID int `json:"personId"` - KlasseID int `json:"klasseId"` -} var Url = "https://thalia.webuntis.com/WebUntis/jsonrpc.do?school=Mons_Tabor" var Password = os.Getenv("UNTIS_PASSWORD") @@ -55,7 +43,6 @@ func Main() { //getTeachers sends empty response -> commented out //Teachers(cookies) - Timetable(cookies) } func Auth() ([]*http.Cookie, error) { @@ -81,25 +68,7 @@ func Auth() ([]*http.Cookie, error) { //log.Println("Set-Cookie headers:", LoginOut.Header["Set-Cookie"]) //loginRespBody, _ := io.ReadAll(LoginOut.Body) //log.Println("Login response body:", string(loginRespBody)) - //log.Println("Login successful") - response, err := io.ReadAll(LoginOut.Body) - if err != nil { - log.Fatalf("Error reading response body: %v", err) - } - var Response LoginResponse - err = json.Unmarshal(response, &Response) - if err != nil { - log.Fatalf("Error unmarshaling response: %v", err) - } - data, err := json.MarshalIndent(Response.Result, "", " ") - if err != nil { - log.Fatal(err) - } - err = os.WriteFile("login.json", data, 0644) - if err != nil { - log.Fatal(err) - } - + log.Println("Login successful") return cookies, nil }