gochan/gochan
1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-08-04 16:16:22 -07:00
Code Releases Activity

Make zerolog error Event usage more consistent (Caller on the same line as Err)

Browse source
This commit is contained in:
Eggbertx 2024-03-18 12:41:03 -07:00
parent c2d834c712
commit bd6992cb87
13 changed files with 129 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pkg/manage/actionsAdminPerm.go
View file

@ -178,9 +178,9 @@ func boardsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.S
return "", err
}
if board, err = gcsql.GetBoardFromID(boardID); err != nil {
errEv.Err(err).
errEv.Err(err).Caller().
Int("boardID", boardID).
Caller().Msg("Unable to get board info")
Msg("Unable to get board info")
return "", err
}
case "modify":
@ -330,25 +330,24 @@ func cleanupCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staf
if request.FormValue("run") == "Run Cleanup" {
outputStr += "Removing deleted posts from the database.<hr />"
if err = gcsql.PermanentlyRemoveDeletedPosts(); err != nil {
errEv.Err(err).
Str("cleanup", "removeDeletedPosts").
Caller().Send()
err = errors.New("Error removing deleted posts from database: " + err.Error())
errEv.Err(err).Caller().
Str("cleanup", "removeDeletedPosts").Send()
err = errors.New("unable to remove deleted posts from database")
return outputStr + "<tr><td>" + err.Error() + "</td></tr></table>", err
}
outputStr += "Optimizing all tables in database.<hr />"
err = gcsql.OptimizeDatabase()
if err != nil {
errEv.Err(err).
Str("sql", "optimization").
Caller().Send()
errEv.Err(err).Caller().
Str("sql", "optimization").Send()
err = errors.New("Error optimizing SQL tables: " + err.Error())
return outputStr + "<tr><td>" + err.Error() + "</td></tr></table>", err
}
outputStr += "Cleanup finished"
} else {
outputStr += `<form action="` + config.GetSystemCriticalConfig().WebRoot + `manage/cleanup" method="post">` +
outputStr += `<form action="` + config.WebPath("manage/cleanup") + `" method="post">` +
`<input name="run" id="run" type="submit" value="Run Cleanup" />` +
`</form>`
}

51
pkg/manage/actionsModPerm.go
View file

@ -141,13 +141,12 @@ func appealsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
// approving an appeal
approveID, err := strconv.Atoi(approveStr)
if err != nil {
errEv.Err(err).
Str("approveStr", approveStr).Caller().Send()
errEv.Err(err).Caller().
Str("approveStr", approveStr).Send()
}
if err = gcsql.ApproveAppeal(approveID, staff.ID); err != nil {
errEv.Err(err).
Int("approveAppeal", approveID).
Caller().Send()
errEv.Err(err).Caller().
Int("approveAppeal", approveID).Send()
return "", err
}
}
@ -182,9 +181,8 @@ func fileBansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql
if boardidStr != "" {
boardid, err = strconv.Atoi(boardidStr)
if err != nil {
errEv.Err(err).
Str("boardid", boardidStr).
Caller().Send()
errEv.Err(err).Caller().
Str("boardid", boardidStr).Send()
return "", err
}
}
@ -199,9 +197,8 @@ func fileBansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql
_, err = regexp.Compile(filename)
if err != nil {
// invalid regular expression
errEv.Err(err).
Str("regex", filename).
Caller().Send()
errEv.Err(err).Caller().
Str("regex", filename).Send()
return "", err
}
}
@ -273,15 +270,13 @@ func fileBansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql
// user requested a checksum ban ID to delete
delChecksumBanID, err := strconv.Atoi(delChecksumBanIDStr)
if err != nil {
errEv.Err(err).
Str("deleteChecksumBanIDStr", delChecksumBanIDStr).
Caller().Send()
errEv.Err(err).Caller().
Str("deleteChecksumBanIDStr", delChecksumBanIDStr).Send()
return "", err
}
if err = (gcsql.FileBan{ID: delChecksumBanID}).Deactivate(staff.ID); err != nil {
errEv.Err(err).
Int("deleteChecksumBanID", delChecksumBanID).
Caller().Send()
errEv.Err(err).Caller().
Int("deleteChecksumBanID", delChecksumBanID).Send()
return "", err
}
infoEv.Int("deleteChecksumBanID", delChecksumBanID).Msg("File checksum ban deleted")
@ -293,8 +288,8 @@ func fileBansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql
var filterBoardID int
if filterBoardIDstr != "" {
if filterBoardID, err = strconv.Atoi(filterBoardIDstr); err != nil {
errEv.Err(err).
Str("filterboardid", filterBoardIDstr).Caller().Send()
errEv.Err(err).Caller().
Str("filterboardid", filterBoardIDstr).Send()
return "", err
}
}
@ -337,15 +332,14 @@ func nameBansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql
if deleteIDstr != "" {
deleteID, err := strconv.Atoi(deleteIDstr)
if err != nil {
errEv.Err(err).
Str("delStr", deleteIDstr).
Caller().Send()
errEv.Err(err).Caller().
Str("delStr", deleteIDstr).Send()
return "", err
}
if err = gcsql.DeleteNameBan(deleteID); err != nil {
errEv.Err(err).
errEv.Err(err).Caller().
Int("deleteID", deleteID).
Caller().Msg("Unable to delete name ban")
Msg("Unable to delete name ban")
return "", errors.New("Unable to delete name ban: " + err.Error())
}
}
@ -367,9 +361,9 @@ func nameBansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql
}
isRegex := request.FormValue("isregex") == "on"
if _, err = gcsql.NewNameBan(name, isRegex, boardID, staff.ID, request.FormValue("staffnote")); err != nil {
errEv.Err(err).
errEv.Err(err).Caller().
Str("name", name).
Int("boardID", boardID)
Int("boardID", boardID).Send()
return "", err
}
}
@ -439,9 +433,8 @@ func reportsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
}
found, err := gcsql.ClearReport(dismissID, staff.ID, block != "" && staff.Rank == 3)
if err != nil {
errEv.Err(err).
Int("postID", dismissID).
Caller().Send()
errEv.Err(err).Caller().
Int("postID", dismissID).Send()
return nil, err
}
if !found {

4
pkg/manage/bans.go
View file

@ -49,9 +49,9 @@ func ipBanFromRequest(ban *gcsql.IPBan, request *http.Request, infoEv *zerolog.E
durationStr := request.FormValue("duration")
duration, err := durationutil.ParseLongerDuration(durationStr)
if err != nil {
errEv.Err(err).
errEv.Err(err).Caller().
Str("duration", durationStr).
Caller().Msg("Invalid duration")
Msg("Invalid duration")
return err
}
ban.ExpiresAt = now.Add(duration)

5
pkg/manage/handler.go
View file

@ -60,9 +60,8 @@ func CallManageFunction(writer http.ResponseWriter, request *http.Request) {
staff = &gcsql.Staff{}
err = nil
} else if err != nil && err != sql.ErrNoRows {
errEv.Err(err).
Str("request", "getCurrentFullStaff").
Caller().Send()
errEv.Err(err).Caller().
Str("request", "getCurrentFullStaff").Send()
server.ServeError(writer, "Error getting staff info from request: "+err.Error(), wantsJSON, nil)
return
}

7
pkg/manage/util.go
View file

@ -46,9 +46,9 @@ func createSession(key, username, password string, request *http.Request, writer
staff, err := gcsql.GetStaffByUsername(username, true)
if err != nil {
if err != sql.ErrNoRows {
errEv.Err(err).
errEv.Err(err).Caller().
Str("remoteAddr", request.RemoteAddr).
Caller().Msg("Unrecognized username")
Msg("Unrecognized username")
}
return ErrBadCredentials
}
@ -56,8 +56,7 @@ func createSession(key, username, password string, request *http.Request, writer
err = bcrypt.CompareHashAndPassword([]byte(staff.PasswordChecksum), []byte(password))
if err == bcrypt.ErrMismatchedHashAndPassword {
// password mismatch
errEv.Caller().
Msg("Invalid password")
errEv.Caller().Msg("Invalid password")
return ErrBadCredentials
}