sam/pronounscc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(backend): add delete avatar logic

Browse source
This commit is contained in:
Sam 2023-03-13 02:19:03 +01:00
parent 163e7c3fd6
commit 57ed81add3
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
4 changed files with 95 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
backend/db/avatars.go
View file

@ -200,3 +200,31 @@ func (db *DB) WriteMemberAvatar(ctx context.Context,
return hash, nil return hash, nil
} }
func (db *DB) DeleteUserAvatar(ctx context.Context, userID xid.ID, hash string) error {
err := db.minio.RemoveObject(ctx, db.minioBucket, "/users/"+userID.String()+"/"+hash+".webp", minio.RemoveObjectOptions{})
if err != nil {
return errors.Wrap(err, "deleting webp avatar")
}
err = db.minio.RemoveObject(ctx, db.minioBucket, "/users/"+userID.String()+"/"+hash+".jpg", minio.RemoveObjectOptions{})
if err != nil {
return errors.Wrap(err, "deleting jpeg avatar")
}
return nil
}
func (db *DB) DeleteMemberAvatar(ctx context.Context, memberID xid.ID, hash string) error {
err := db.minio.RemoveObject(ctx, db.minioBucket, "/members/"+memberID.String()+"/"+hash+".webp", minio.RemoveObjectOptions{})
if err != nil {
return errors.Wrap(err, "deleting webp avatar")
}
err = db.minio.RemoveObject(ctx, db.minioBucket, "/members/"+memberID.String()+"/"+hash+".webp", minio.RemoveObjectOptions{})
if err != nil {
return errors.Wrap(err, "deleting jpeg avatar")
}
return nil
}

7
backend/routes/member/delete_member.go
View file

@ -40,6 +40,13 @@ func (s *Server) deleteMember(w http.ResponseWriter, r *http.Request) error {
return errors.Wrap(err, "deleting member") return errors.Wrap(err, "deleting member")
} }
if m.Avatar != nil {
err = s.DB.DeleteMemberAvatar(ctx, m.ID, *m.Avatar)
if err != nil {
return errors.Wrap(err, "deleting member avatar")
}
}
render.NoContent(w, r) render.NoContent(w, r)
return nil return nil
} }

11
backend/routes/member/patch_member.go
View file

@ -129,6 +129,16 @@ func (s *Server) patchMember(w http.ResponseWriter, r *http.Request) error {
// update avatar // update avatar
var avatarHash *string = nil var avatarHash *string = nil
if req.Avatar != nil { if req.Avatar != nil {
if *req.Avatar == "" {
if m.Avatar != nil {
err = s.DB.DeleteMemberAvatar(ctx, m.ID, *m.Avatar)
if err != nil {
log.Errorf("deleting member avatar: %v", err)
return errors.Wrap(err, "deleting avatar")
}
}
avatarHash = req.Avatar
} else {
webp, jpg, err := s.DB.ConvertAvatar(*req.Avatar) webp, jpg, err := s.DB.ConvertAvatar(*req.Avatar)
if err != nil { if err != nil {
if err == db.ErrInvalidDataURI { if err == db.ErrInvalidDataURI {
@ -154,6 +164,7 @@ func (s *Server) patchMember(w http.ResponseWriter, r *http.Request) error {
} }
avatarHash = &hash avatarHash = &hash
} }
}
// start transaction // start transaction
tx, err := s.DB.Begin(ctx) tx, err := s.DB.Begin(ctx)

11
backend/routes/user/patch_user.go
View file

@ -103,6 +103,16 @@ func (s *Server) patchUser(w http.ResponseWriter, r *http.Request) error {
// update avatar // update avatar
var avatarHash *string = nil var avatarHash *string = nil
if req.Avatar != nil { if req.Avatar != nil {
if *req.Avatar == "" {
if u.Avatar != nil {
err = s.DB.DeleteUserAvatar(ctx, u.ID, *u.Avatar)
if err != nil {
log.Errorf("deleting user avatar: %v", err)
return errors.Wrap(err, "deleting avatar")
}
}
avatarHash = req.Avatar
} else {
webp, jpg, err := s.DB.ConvertAvatar(*req.Avatar) webp, jpg, err := s.DB.ConvertAvatar(*req.Avatar)
if err != nil { if err != nil {
if err == db.ErrInvalidDataURI { if err == db.ErrInvalidDataURI {
@ -128,6 +138,7 @@ func (s *Server) patchUser(w http.ResponseWriter, r *http.Request) error {
} }
avatarHash = &hash avatarHash = &hash
} }
}
// start transaction // start transaction
tx, err := s.DB.Begin(ctx) tx, err := s.DB.Begin(ctx)