internal/notes/notes.go

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

internal/notes/views/views.go

@@ -107,18 +107,10 @@ 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)