Uncomment and enable additional relayinfo features and fix order of event response handling in SaveEvent.

This commit is contained in:
2025-09-07 23:01:26 +01:00
parent 3d3a0fa520
commit f570660f37
2 changed files with 15 additions and 15 deletions

View File

@@ -122,6 +122,12 @@ func (l *Listener) HandleEvent(msg []byte) (err error) {
if _, _, err = l.SaveEvent(l.Ctx, env.E); chk.E(err) { if _, _, err = l.SaveEvent(l.Ctx, env.E); chk.E(err) {
return return
} }
// Send a success response storing
if err = Ok.Ok(l, env, ""); chk.E(err) {
return
}
defer l.publishers.Deliver(env.E)
log.D.F("saved event %0x", env.E.ID)
var isNewFromAdmin bool var isNewFromAdmin bool
for _, admin := range l.Admins { for _, admin := range l.Admins {
if utils.FastEqual(admin, env.E.Pubkey) { if utils.FastEqual(admin, env.E.Pubkey) {
@@ -137,11 +143,5 @@ func (l *Listener) HandleEvent(msg []byte) (err error) {
} }
} }
} }
l.publishers.Deliver(env.E)
// Send a success response storing
if err = Ok.Ok(l, env, ""); chk.E(err) {
return
}
log.D.F("saved event %0x", env.E.ID)
return return
} }

View File

@@ -33,32 +33,32 @@ func (s *Server) HandleRelayInfo(w http.ResponseWriter, r *http.Request) {
relayinfo.BasicProtocol, relayinfo.BasicProtocol,
// relayinfo.Authentication, // relayinfo.Authentication,
// relayinfo.EncryptedDirectMessage, // relayinfo.EncryptedDirectMessage,
// relayinfo.EventDeletion, relayinfo.EventDeletion,
relayinfo.RelayInformationDocument, relayinfo.RelayInformationDocument,
// relayinfo.GenericTagQueries, // relayinfo.GenericTagQueries,
// relayinfo.NostrMarketplace, // relayinfo.NostrMarketplace,
// relayinfo.EventTreatment, relayinfo.EventTreatment,
// relayinfo.CommandResults, // relayinfo.CommandResults,
// relayinfo.ParameterizedReplaceableEvents, relayinfo.ParameterizedReplaceableEvents,
// relayinfo.ExpirationTimestamp, // relayinfo.ExpirationTimestamp,
// relayinfo.ProtectedEvents, relayinfo.ProtectedEvents,
// relayinfo.RelayListMetadata, relayinfo.RelayListMetadata,
) )
if s.Config.ACLMode != "none" { if s.Config.ACLMode != "none" {
supportedNIPs = relayinfo.GetList( supportedNIPs = relayinfo.GetList(
relayinfo.BasicProtocol, relayinfo.BasicProtocol,
relayinfo.Authentication, relayinfo.Authentication,
// relayinfo.EncryptedDirectMessage, // relayinfo.EncryptedDirectMessage,
// relayinfo.EventDeletion, relayinfo.EventDeletion,
relayinfo.RelayInformationDocument, relayinfo.RelayInformationDocument,
// relayinfo.GenericTagQueries, // relayinfo.GenericTagQueries,
// relayinfo.NostrMarketplace, // relayinfo.NostrMarketplace,
// relayinfo.EventTreatment, relayinfo.EventTreatment,
// relayinfo.CommandResults, // relayinfo.CommandResults,
// relayinfo.ParameterizedReplaceableEvents, // relayinfo.ParameterizedReplaceableEvents,
// relayinfo.ExpirationTimestamp, // relayinfo.ExpirationTimestamp,
// relayinfo.ProtectedEvents, relayinfo.ProtectedEvents,
// relayinfo.RelayListMetadata, relayinfo.RelayListMetadata,
) )
} }
sort.Sort(supportedNIPs) sort.Sort(supportedNIPs)