From 148196e3782662ae39af0340dad13f312dc4dde7 Mon Sep 17 00:00:00 2001 From: Jabbar03 Date: Sun, 19 May 2024 13:31:36 +0200 Subject: [PATCH 1/5] fixed typo --- json/actions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/json/actions.json b/json/actions.json index 1bb6396..e4c4036 100644 --- a/json/actions.json +++ b/json/actions.json @@ -22,9 +22,9 @@ "issue": { "type": "issue", "data": { - "description": "C'è un problema tecnico/tattico, portalo all'attenzione di un mantainer", - "response": "Mantainers, c'è bisogno del vostro aiuto \n", - "fallback": "Nessun mantainer è presente in questo gruppo. Riportate il problema direttamente sul gruppo di @csunibo nel topic Bot" + "description": "C'è un problema tecnico/tattico, portalo all'attenzione di un maintainer", + "response": "Maintainers, c'è bisogno del vostro aiuto \n", + "fallback": "Nessun maintainer è presente in questo gruppo. Riportate il problema direttamente sul gruppo di @csunibo nel topic Bot" } }, "unknown": { From 790371d94943cfe526e991aab0f9bc1c2df479fe Mon Sep 17 00:00:00 2001 From: Jabbar03 Date: Sun, 19 May 2024 14:08:42 +0200 Subject: [PATCH 2/5] fixed typo2 --- model/globals.go | 6 +++--- model/model.go | 2 +- model/parse.go | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/model/globals.go b/model/globals.go index c611bee..9e2016d 100644 --- a/model/globals.go +++ b/model/globals.go @@ -20,7 +20,7 @@ var ( Teachings map[string]Teaching Groups GroupsStruct Timetables map[string]Timetable - Mantainers []Mantainer + Maintainers []Maintainer Representatives map[string]Representative ) @@ -66,9 +66,9 @@ func InitGlobals() { log.Fatalf(err.Error()) } - Mantainers, err = ParseMantainers() + Maintainers, err = ParseMaintainers() if err != nil { - log.Fatalf("Error parsing mantainers.json file: %s", err.Error()) + log.Fatalf("Error parsing maintainers.json file: %s", err.Error()) } Representatives, err = ParseRepresentatives() diff --git a/model/model.go b/model/model.go index 19d87c0..99c1060 100644 --- a/model/model.go +++ b/model/model.go @@ -71,7 +71,7 @@ type Action struct { Data DataInterface `json:"data"` } -type Mantainer struct { +type Maintainer struct { Id int64 `json:"id"` Username string `json:"username"` } diff --git a/model/parse.go b/model/parse.go index 4762c08..bd25ef5 100644 --- a/model/parse.go +++ b/model/parse.go @@ -22,7 +22,7 @@ const ( degreesFile = "degrees.json" teachingsFile = "teachings.json" timetablesFile = "timetables.json" - mantainersFile = "mantainers.json" + maintainersFile = "maintainers.json" representativesFile = "representatives.json" ) @@ -232,32 +232,32 @@ func ParseTimetables() (timetables map[string]Timetable, err error) { return } -func ParseMantainers() (mantainer []Mantainer, err error) { - filepath := filepath.Join(jsonPath, configSubpath, mantainersFile) +func ParseMaintainers() (maintainer []Maintainer, err error) { + filepath := filepath.Join(jsonPath, configSubpath, maintainersFile) file, err := os.ReadFile(filepath) if errors.Is(err, os.ErrNotExist) { - return mantainer, fmt.Errorf("%s does not exist", mantainersFile) + return maintainer, fmt.Errorf("%s does not exist", maintainersFile) } else if err != nil { - return nil, fmt.Errorf("error reading %s file: %w", mantainersFile, err) + return nil, fmt.Errorf("error reading %s file: %w", maintainersFile, err) } var projects []struct { - Name string `json:"project"` - Mantainers []Mantainer `json:"mantainers"` + Name string `json:"project"` + Maintainers []Maintainer `json:"maintainers"` } err = json.Unmarshal(file, &projects) if err != nil { - return nil, fmt.Errorf("error parsing %s file: %w", mantainersFile, err) + return nil, fmt.Errorf("error parsing %s file: %w", maintainersFile, err) } for _, p := range projects { if p.Name == "informabot" { - return p.Mantainers, nil + return p.Maintainers, nil } } - return nil, fmt.Errorf("couldn't found informabot projects after parsing %s", mantainersFile) + return nil, fmt.Errorf("couldn't found informabot projects after parsing %s", maintainersFile) } func ParseRepresentatives() (map[string]Representative, error) { From e4e5389e4f2e69b1101e65bb5a200f8455718c65 Mon Sep 17 00:00:00 2001 From: Jabbar03 Date: Sun, 19 May 2024 18:56:27 +0200 Subject: [PATCH 3/5] fixed typo3 --- model/controller.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/model/controller.go b/model/controller.go index 051d3bd..87ec103 100644 --- a/model/controller.go +++ b/model/controller.go @@ -41,23 +41,23 @@ func (data HelpData) HandleBotCommand(*tgbotapi.BotAPI, *tgbotapi.Message) Comma } func (data IssueData) HandleBotCommand(bot *tgbotapi.BotAPI, message *tgbotapi.Message) CommandResponse { - noMantainerFound := true + noMaintainerFound := true var answer strings.Builder var Ids []int64 answer.WriteString(data.Response) - for _, m := range Mantainers { + for _, m := range Maintainers { Ids = append(Ids, int64(m.Id)) } for i, participant := range utils.GetChatMembers(bot, message.Chat.ID, Ids) { if Ids[i] == participant.User.ID && participant.User.UserName != "???" { answer.WriteString("@" + participant.User.UserName + " ") - noMantainerFound = false + noMaintainerFound = false } } - if noMantainerFound { + if noMiantainerFound { return makeResponseWithText(data.Fallback) } return makeResponseWithText(answer.String()) From 20142976a4ab0f0393ccdbefb99c94db98bdfafe Mon Sep 17 00:00:00 2001 From: Jabbar03 Date: Sun, 19 May 2024 18:59:11 +0200 Subject: [PATCH 4/5] chores --- model/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/controller.go b/model/controller.go index 87ec103..85acf5e 100644 --- a/model/controller.go +++ b/model/controller.go @@ -57,7 +57,7 @@ func (data IssueData) HandleBotCommand(bot *tgbotapi.BotAPI, message *tgbotapi.M noMaintainerFound = false } } - if noMiantainerFound { + if noMaintainerFound { return makeResponseWithText(data.Fallback) } return makeResponseWithText(answer.String()) From 486c41fb67ad61864e5a487bf587034cc39f68ec Mon Sep 17 00:00:00 2001 From: Jabbar03 Date: Sun, 19 May 2024 23:19:59 +0200 Subject: [PATCH 5/5] update submodule --- json/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/config b/json/config index 753ad5d..de9c3a8 160000 --- a/json/config +++ b/json/config @@ -1 +1 @@ -Subproject commit 753ad5d6d121de3048a797b459a640f8ef6b9657 +Subproject commit de9c3a841b4083f25960cf33f8322615ee8e9b61