feat: backend for warnings, partial frontend for reports
This commit is contained in:
parent
29274287a2
commit
a0bc39bcba
12 changed files with 479 additions and 79 deletions
|
@ -6,11 +6,9 @@ import (
|
|||
"encoding/base64"
|
||||
"net/http"
|
||||
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/db"
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/log"
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/server"
|
||||
"emperror.dev/errors"
|
||||
"github.com/georgysavva/scany/pgxscan"
|
||||
"github.com/go-chi/render"
|
||||
"github.com/mediocregopher/radix/v4"
|
||||
"github.com/rs/xid"
|
||||
|
@ -84,60 +82,13 @@ func (s *Server) forceDelete(w http.ResponseWriter, r *http.Request) error {
|
|||
return server.APIError{Code: server.ErrNotFound} // assume invalid token
|
||||
}
|
||||
|
||||
u, err := s.DB.User(ctx, id)
|
||||
err = s.DB.CleanUser(ctx, id)
|
||||
if err != nil {
|
||||
log.Errorf("getting user: %v", err)
|
||||
return errors.Wrap(err, "getting user")
|
||||
log.Errorf("cleaning user data: %v", err)
|
||||
return errors.Wrap(err, "cleaning user")
|
||||
}
|
||||
|
||||
if u.Avatar != nil {
|
||||
err = s.DB.DeleteUserAvatar(ctx, u.ID, *u.Avatar)
|
||||
if err != nil {
|
||||
log.Errorf("deleting avatars for user %v: %v", u.ID, err)
|
||||
return errors.Wrap(err, "deleting user avatar")
|
||||
}
|
||||
}
|
||||
|
||||
var exports []db.DataExport
|
||||
err = pgxscan.Select(ctx, s.DB, &exports, "SELECT * FROM data_exports WHERE user_id = $1", u.ID)
|
||||
if err != nil {
|
||||
log.Errorf("getting to-be-deleted export files: %v", err)
|
||||
return errors.Wrap(err, "getting export iles")
|
||||
}
|
||||
|
||||
for _, de := range exports {
|
||||
err = s.DB.DeleteExport(ctx, de)
|
||||
if err != nil {
|
||||
log.Errorf("deleting export %v: %v", de.ID, err)
|
||||
continue
|
||||
}
|
||||
|
||||
log.Debugf("deleted export %v", de.ID)
|
||||
}
|
||||
|
||||
members, err := s.DB.UserMembers(ctx, u.ID)
|
||||
if err != nil {
|
||||
log.Errorf("getting members for user %v: %v", u.ID, err)
|
||||
return errors.Wrap(err, "getting members")
|
||||
}
|
||||
|
||||
for _, m := range members {
|
||||
if m.Avatar == nil {
|
||||
continue
|
||||
}
|
||||
|
||||
log.Debugf("deleting avatars for member %v", m.ID)
|
||||
|
||||
err = s.DB.DeleteMemberAvatar(ctx, m.ID, *m.Avatar)
|
||||
if err != nil {
|
||||
log.Errorf("deleting avatars for member %v: %v", m.ID, err)
|
||||
continue
|
||||
}
|
||||
|
||||
log.Debugf("deleted avatars for member %v", m.ID)
|
||||
}
|
||||
|
||||
err = s.DB.ForceDeleteUser(ctx, u.ID)
|
||||
err = s.DB.ForceDeleteUser(ctx, id)
|
||||
if err != nil {
|
||||
log.Errorf("force deleting user: %v", err)
|
||||
return errors.Wrap(err, "deleting user")
|
||||
|
|
108
backend/routes/mod/resolve_report.go
Normal file
108
backend/routes/mod/resolve_report.go
Normal file
|
@ -0,0 +1,108 @@
|
|||
package mod
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/db"
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/log"
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/server"
|
||||
"emperror.dev/errors"
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/go-chi/render"
|
||||
)
|
||||
|
||||
type resolveReportRequest struct {
|
||||
Warn bool `json:"warn"`
|
||||
Ban bool `json:"ban"`
|
||||
Delete bool `json:"delete"`
|
||||
Reason string `json:"reason"`
|
||||
}
|
||||
|
||||
func (s *Server) resolveReport(w http.ResponseWriter, r *http.Request) error {
|
||||
ctx := r.Context()
|
||||
claims, _ := server.ClaimsFromContext(ctx)
|
||||
|
||||
id, err := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64)
|
||||
if err != nil {
|
||||
return server.APIError{Code: server.ErrBadRequest}
|
||||
}
|
||||
|
||||
var req resolveReportRequest
|
||||
err = render.Decode(r, &req)
|
||||
if err != nil {
|
||||
return server.APIError{Code: server.ErrBadRequest}
|
||||
}
|
||||
|
||||
if req.Reason == "" {
|
||||
return server.APIError{Code: server.ErrBadRequest, Details: "Reason cannot be empty"}
|
||||
}
|
||||
|
||||
tx, err := s.DB.Begin(ctx)
|
||||
if err != nil {
|
||||
log.Errorf("creating transaction: %v", err)
|
||||
return errors.Wrap(err, "creating transaction")
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
|
||||
report, err := s.DB.Report(ctx, tx, id)
|
||||
if err != nil {
|
||||
if err == db.ErrReportNotFound {
|
||||
return server.APIError{Code: server.ErrNotFound}
|
||||
}
|
||||
log.Errorf("getting report: %v", err)
|
||||
return errors.Wrap(err, "getting report")
|
||||
}
|
||||
|
||||
if report.ResolvedAt != nil {
|
||||
return server.APIError{Code: server.ErrReportAlreadyHandled}
|
||||
}
|
||||
|
||||
err = s.DB.ResolveReport(ctx, tx, report.ID, claims.UserID, req.Reason)
|
||||
if err != nil {
|
||||
log.Errorf("resolving report: %v", err)
|
||||
}
|
||||
|
||||
if req.Warn || req.Ban {
|
||||
_, err = s.DB.CreateWarning(ctx, tx, report.UserID, req.Reason)
|
||||
if err != nil {
|
||||
log.Errorf("creating warning: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
if req.Ban {
|
||||
err = s.DB.DeleteUser(ctx, tx, report.UserID, false, req.Reason)
|
||||
if err != nil {
|
||||
log.Errorf("banning user: %v", err)
|
||||
}
|
||||
|
||||
if req.Delete {
|
||||
err = s.DB.CleanUser(ctx, report.UserID)
|
||||
if err != nil {
|
||||
log.Errorf("cleaning user data: %v", err)
|
||||
return errors.Wrap(err, "cleaning user")
|
||||
}
|
||||
|
||||
err = s.DB.DeleteUserMembers(ctx, tx, report.UserID)
|
||||
if err != nil {
|
||||
log.Errorf("deleting members: %v", err)
|
||||
return errors.Wrap(err, "deleting members")
|
||||
}
|
||||
|
||||
err = s.DB.ResetUser(ctx, tx, report.UserID)
|
||||
if err != nil {
|
||||
log.Errorf("resetting user data: %v", err)
|
||||
return errors.Wrap(err, "resetting user")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
err = tx.Commit(ctx)
|
||||
if err != nil {
|
||||
log.Errorf("committing transaction: %v", err)
|
||||
return errors.Wrap(err, "committing transaction")
|
||||
}
|
||||
|
||||
render.JSON(w, r, map[string]any{"success": true})
|
||||
return nil
|
||||
}
|
|
@ -20,12 +20,14 @@ func Mount(srv *server.Server, r chi.Router) {
|
|||
r.Get("/reports/by-user/{id}", server.WrapHandler(s.getReportsByUser))
|
||||
r.Get("/reports/by-reporter/{id}", server.WrapHandler(s.getReportsByReporter))
|
||||
|
||||
r.Get("/reports/{id}", nil)
|
||||
r.Patch("/reports/{id}", nil)
|
||||
r.Patch("/reports/{id}", server.WrapHandler(s.resolveReport))
|
||||
})
|
||||
|
||||
r.With(server.MustAuth).Post("/users/{id}/reports", server.WrapHandler(s.createUserReport))
|
||||
r.With(server.MustAuth).Post("/members/{id}/reports", server.WrapHandler(s.createMemberReport))
|
||||
|
||||
r.With(server.MustAuth).Get("/auth/warnings", server.WrapHandler(s.getWarnings))
|
||||
r.With(server.MustAuth).Post("/auth/warnings/{id}/ack", server.WrapHandler(s.ackWarning))
|
||||
}
|
||||
|
||||
func MustAdmin(next http.Handler) http.Handler {
|
||||
|
|
63
backend/routes/mod/warnings.go
Normal file
63
backend/routes/mod/warnings.go
Normal file
|
@ -0,0 +1,63 @@
|
|||
package mod
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/db"
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/log"
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/server"
|
||||
"emperror.dev/errors"
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/go-chi/render"
|
||||
)
|
||||
|
||||
type warning struct {
|
||||
db.Warning
|
||||
Read bool `json:"read"`
|
||||
}
|
||||
|
||||
func dbWarningsToResponse(ws []db.Warning) []warning {
|
||||
out := make([]warning, len(ws))
|
||||
for i := range ws {
|
||||
out[i] = warning{ws[i], ws[i].ReadAt != nil}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func (s *Server) getWarnings(w http.ResponseWriter, r *http.Request) (err error) {
|
||||
ctx := r.Context()
|
||||
claims, _ := server.ClaimsFromContext(ctx)
|
||||
showAll := r.FormValue("all") == "true"
|
||||
|
||||
warnings, err := s.DB.Warnings(ctx, claims.UserID, !showAll)
|
||||
if err != nil {
|
||||
log.Errorf("getting warnings: %v", err)
|
||||
return errors.Wrap(err, "getting warnings from database")
|
||||
}
|
||||
|
||||
render.JSON(w, r, dbWarningsToResponse(warnings))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Server) ackWarning(w http.ResponseWriter, r *http.Request) (err error) {
|
||||
ctx := r.Context()
|
||||
claims, _ := server.ClaimsFromContext(ctx)
|
||||
|
||||
id, err := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64)
|
||||
if err != nil {
|
||||
return server.APIError{Code: server.ErrBadRequest}
|
||||
}
|
||||
|
||||
ok, err := s.DB.AckWarning(ctx, claims.UserID, id)
|
||||
if err != nil {
|
||||
log.Errorf("acknowledging warning: %v", err)
|
||||
return errors.Wrap(err, "acknowledging warning")
|
||||
}
|
||||
if !ok {
|
||||
return server.APIError{Code: server.ErrNotFound}
|
||||
}
|
||||
|
||||
render.JSON(w, r, map[string]any{"ok": true})
|
||||
return nil
|
||||
}
|
|
@ -27,7 +27,9 @@ type GetUserResponse struct {
|
|||
type GetMeResponse struct {
|
||||
GetUserResponse
|
||||
|
||||
MaxInvites int `json:"max_invites"`
|
||||
MaxInvites int `json:"max_invites"`
|
||||
IsAdmin bool `json:"is_admin"`
|
||||
|
||||
Discord *string `json:"discord"`
|
||||
DiscordUsername *string `json:"discord_username"`
|
||||
|
||||
|
@ -162,6 +164,7 @@ func (s *Server) getMeUser(w http.ResponseWriter, r *http.Request) error {
|
|||
render.JSON(w, r, GetMeResponse{
|
||||
GetUserResponse: dbUserToResponse(u, fields, members),
|
||||
MaxInvites: u.MaxInvites,
|
||||
IsAdmin: u.IsAdmin,
|
||||
Discord: u.Discord,
|
||||
DiscordUsername: u.DiscordUsername,
|
||||
Fediverse: u.Fediverse,
|
||||
|
|
|
@ -232,6 +232,7 @@ func (s *Server) patchUser(w http.ResponseWriter, r *http.Request) error {
|
|||
render.JSON(w, r, GetMeResponse{
|
||||
GetUserResponse: dbUserToResponse(u, fields, nil),
|
||||
MaxInvites: u.MaxInvites,
|
||||
IsAdmin: u.IsAdmin,
|
||||
Discord: u.Discord,
|
||||
DiscordUsername: u.DiscordUsername,
|
||||
Fediverse: u.Fediverse,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue