Refactor deletion checks and error handling; bump version to v0.6.4.

implement delete events
Remove unused JavaScript file index-tha189jf.js from dist directory.
2025-09-21 18:15:27 +01:00 · 2025-09-21 18:06:11 +01:00 · 2025-09-21 17:17:31 +01:00 · 2025-09-21 17:17:15 +01:00 · 2025-09-21 16:39:45 +01:00 · 2025-09-21 16:33:23 +01:00
8 changed files with 823 additions and 274 deletions
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="file://$PROJECT_DIR$/../github.com/jumble" libraries="{jumble/node_modules}" />
+    <file url="file://$PROJECT_DIR$/../github.com/mleku/jumble" libraries="{jumble/node_modules}" />
+  </component>
+</project>
--- a/app/handle-delete.go
+++ b/app/handle-delete.go
@@ -145,12 +145,10 @@ func (l *Listener) HandleDelete(env *eventenvelope.Submission) (err error) {
 					if ev, err = l.FetchEventBySerial(s); chk.E(err) {
 						continue
 					}
-					// check that the author is the same as the signer of the
-					// delete, for the e tag case the author is the signer of
-					// the event.
-					if !utils.FastEqual(env.E.Pubkey, ev.Pubkey) {
+					// allow deletion if the signer is the author OR an admin/owner
+					if !(ownerDelete || utils.FastEqual(env.E.Pubkey, ev.Pubkey)) {
 						log.W.F(
-							"HandleDelete: attempted deletion of event %s by different user - delete pubkey=%s, event pubkey=%s",
+							"HandleDelete: attempted deletion of event %s by unauthorized user - delete pubkey=%s, event pubkey=%s",
 							hex.Enc(ev.ID), hex.Enc(env.E.Pubkey),
 							hex.Enc(ev.Pubkey),
 						)
--- a/app/web/dist/index-sskmjaqz.js
+++ b/app/web/dist/index-sskmjaqz.js
--- a/app/web/dist/index-w8zpqk4w.js
+++ b/app/web/dist/index-w8zpqk4w.js
--- a/app/web/dist/index.html
+++ b/app/web/dist/index.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Nostr Relay</title>
    
-  <link rel="stylesheet" crossorigin href="./index-q4cwd1fy.css"><script type="module" crossorigin src="./index-sskmjaqz.js"></script></head>
+  <link rel="stylesheet" crossorigin href="./index-q4cwd1fy.css"><script type="module" crossorigin src="./index-w8zpqk4w.js"></script></head>
  <body>
    <script>
      // Apply system theme preference immediately to avoid flash of wrong theme
--- a/app/web/src/App.jsx
+++ b/app/web/src/App.jsx
--- a/pkg/database/query-for-deleted.go
+++ b/pkg/database/query-for-deleted.go
@@ -173,10 +173,10 @@ func (d *D) CheckForDeleted(ev *event.E, admins [][]byte) (err error) {
 				}
 			}
 			if ev.CreatedAt < maxTs {
-				// err = fmt.Errorf(
-				// 	"blocked: was deleted by address %s: event is older than the delete: event: %d delete: %d",
-				// 	at, ev.CreatedAt, maxTs,
-				// )
+				err = errorf.E(
+					"blocked: %0x was deleted by address %s because it is older than the delete: event: %d delete: %d",
+					ev.ID, at, ev.CreatedAt, maxTs,
+				)
 				return
 			}
 			return
@@ -203,22 +203,14 @@ func (d *D) CheckForDeleted(ev *event.E, admins [][]byte) (err error) {
 			return
 		}
 		if len(s) > 0 {
-			// For e-tag deletions (delete by ID), any deletion event means the event cannot be resubmitted
-			// regardless of timestamp, since it's a specific deletion of this exact event
-			// err = errorf.E(
-			// 	"blocked: was deleted by ID and cannot be resubmitted",
-			// 	// ev.ID,
-			// )
+			// Any e-tag deletion found means the exact event was deleted and cannot be resubmitted
+			err = errorf.E("blocked: %0x has been deleted", ev.ID)
 			return
 		}
 	}
 	if len(sers) > 0 {
-		// For e-tag deletions (delete by ID), any deletion event means the event cannot be resubmitted
-		// regardless of timestamp, since it's a specific deletion of this exact event
-		// err = errorf.E(
-		// 	"blocked: was deleted by ID and cannot be resubmitted",
-		// 	// ev.ID,
-		// )
+		// Any e-tag deletion found means the exact event was deleted and cannot be resubmitted
+		err = errorf.E("blocked: %0x has been deleted", ev.ID)
 		return
 	}

--- a/pkg/version/version
+++ b/pkg/version/version
@@ -1 +1 @@
-v0.6.2
+v0.6.4
Author	SHA1	Message	Date
mleku	199f922208	Refactor deletion checks and error handling; bump version to v0.6.4. Some checks failed Go / build (push) Has been cancelled Details	2025-09-21 18:15:27 +01:00
mleku	405e223aa6	implement delete events	2025-09-21 18:06:11 +01:00
mleku	fc3a89a309	Remove unused JavaScript file `index-tha189jf.js` from `dist` directory. - Cleaned up the `app/web/dist/` directory by deleting an unreferenced and outdated build artifact. - Maintained a lean and organized repository structure.	2025-09-21 17:17:31 +01:00
mleku	ba8166da07	Remove unused JavaScript file `index-wnwvj11w.js` from `dist` directory. - Cleaned up the `app/web/dist/` directory by deleting an unreferenced and outdated build artifact. - Maintained a lean and organized repository structure.	2025-09-21 17:17:15 +01:00
mleku	3e3af08644	Remove unused JavaScript file `index-wnwvj11w.js` from `dist` directory. Some checks failed Go / build (push) Has been cancelled Details - Cleaned up the `app/web/dist/` directory by deleting an unreferenced and outdated build artifact. - Maintained a lean and organized repository structure.	2025-09-21 16:39:45 +01:00
mleku	fbdf565bf7	Remove unused JavaScript file `index-sskmjaqz.js` from `dist` directory. - Cleaned up the `app/web/dist/` directory by deleting an unreferenced and outdated build artifact. - Maintained a lean and organized repository structure.	2025-09-21 16:33:23 +01:00