mleku/next.orly.dev
1
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

refactored SaveEvent to return if it is replacing an event
Some checks failed
Go / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
mleku
2025-10-10 22:18:53 +01:00
parent bc5177e0ec
commit 3c11aa6f01
25 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/handle-event.go
View File

@@ -274,7 +274,7 @@ func (l *Listener) HandleEvent(msg []byte) (err error) {
env.E.Pubkey,
)
log.I.F("delete event pubkey hex: %s", hex.Enc(env.E.Pubkey))
if err, _ = l.SaveEvent(saveCtx, env.E); err != nil {
if _, err = l.SaveEvent(saveCtx, env.E); err != nil {
log.E.F("failed to save delete event %0x: %v", env.E.ID, err)
if strings.HasPrefix(err.Error(), "blocked:") {
errStr := err.Error()[len("blocked: "):len(err.Error())]
@@ -339,7 +339,7 @@ func (l *Listener) HandleEvent(msg []byte) (err error) {
saveCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
// log.I.F("saving event %0x, %s", env.E.ID, env.E.Serialize())
if err, _ = l.SaveEvent(saveCtx, env.E); err != nil {
if _, err = l.SaveEvent(saveCtx, env.E); err != nil {
if strings.HasPrefix(err.Error(), "blocked:") {
errStr := err.Error()[len("blocked: "):len(err.Error())]
if err = Ok.Error(

12
app/payment_processor.go
View File

@@ -166,7 +166,7 @@ func (pp *PaymentProcessor) syncFollowList() error {
}
// sign and save
ev.Sign(sign)
if err, _ := pp.db.SaveEvent(pp.ctx, ev); err != nil {
if _, err := pp.db.SaveEvent(pp.ctx, ev); err != nil {
return err
}
log.I.F(
@@ -358,7 +358,7 @@ Log in to the relay dashboard to access your configuration at: %s`,
// Sign and save the event
ev.Sign(sign)
if err, _ := pp.db.SaveEvent(pp.ctx, ev); err != nil {
if _, err := pp.db.SaveEvent(pp.ctx, ev); err != nil {
return fmt.Errorf("failed to save expiry warning note: %w", err)
}
@@ -472,7 +472,7 @@ Log in to the relay dashboard to access your configuration at: %s`,
// Sign and save the event
ev.Sign(sign)
if err, _ := pp.db.SaveEvent(pp.ctx, ev); err != nil {
if _, err := pp.db.SaveEvent(pp.ctx, ev); err != nil {
return fmt.Errorf("failed to save trial reminder note: %w", err)
}
@@ -695,7 +695,7 @@ func (pp *PaymentProcessor) createPaymentNote(
// Sign and save the event
ev.Sign(sign)
if err, _ := pp.db.SaveEvent(pp.ctx, ev); err != nil {
if _, err := pp.db.SaveEvent(pp.ctx, ev); err != nil {
return fmt.Errorf("failed to save payment note: %w", err)
}
@@ -801,7 +801,7 @@ Enjoy your time on the relay!`, monthlyPrice, monthlyPrice,
// Sign and save the event
ev.Sign(sign)
if err, _ := pp.db.SaveEvent(pp.ctx, ev); err != nil {
if _, err := pp.db.SaveEvent(pp.ctx, ev); err != nil {
return fmt.Errorf("failed to save welcome note: %w", err)
}
@@ -918,7 +918,7 @@ func (pp *PaymentProcessor) UpdateRelayProfile() error {
// Sign and save the event
ev.Sign(sign)
if err, _ := pp.db.SaveEvent(pp.ctx, ev); err != nil {
if _, err := pp.db.SaveEvent(pp.ctx, ev); err != nil {
return fmt.Errorf("failed to save relay profile: %w", err)
}