max/gonotes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix delete behaviour

Browse source
This commit is contained in:
Maximilian Friedersdorff 2026-01-05 21:13:00 +00:00
parent 0498aadcf2
commit a955c49373
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/notes/notes.go
View file

@ -136,8 +136,9 @@ func (ns *NoteStore) Add(note *Note, user string) {
ns.notes[user][note] = true
}
func (ns *NoteStore) Del(note *Note, user string) {
func (ns *NoteStore) Del(note *Note, user string) error {
delete(ns.notes[user], note)
return note.Delete()
}
func (ns *NoteStore) UserTags(user string) []string {
@ -340,8 +341,8 @@ func (n *Note) DelViewer(viewer string) {
delete(n.Viewers, viewer)
}
func DeleteNote(uid string) error {
filename := filepath.Join(conf.Conf.NotesDir, fmtPath(uid))
func (n *Note) Delete() error {
filename := filepath.Join(conf.Conf.NotesDir, fmtPath(n.Uid))
return os.Remove(filename)
}

14
internal/notes/views/views.go
View file

@ -107,10 +107,18 @@ func new(w http.ResponseWriter, r *http.Request) {
}
func delete(w http.ResponseWriter, r *http.Request) {
// user := r.Context().Value(middleware.ContextKey("user")).(string)
user := r.Context().Value(middleware.ContextKey("user")).(string)
uid := r.PathValue("note")
note, ok := notes.Notes.GetOne(user, uid)
if !ok {
http.NotFound(w, r)
}
err := notes.Notes.Del(note, user)
encodedTitle := r.PathValue("note")
err := notes.DeleteNote(encodedTitle)
if err != nil {
log.Print(err.Error())
http.Error(w, "Couldn't delete note", http.StatusInternalServerError)