From 523b11d06842c47aeac41c781b17599adbadf26c Mon Sep 17 00:00:00 2001
From: Isaque Veras <isaqueveras@alu.ufc.br>
Date: Sat, 6 May 2023 10:43:19 -0300
Subject: [PATCH] fix(rss): fixing event creation date type

---
 .gitignore         |  1 +
 rss-bridge/feed.go |  6 +++---
 rss-bridge/main.go | 14 +++++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 03bd412..f85f391 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.env
+rss-bridge
\ No newline at end of file
diff --git a/rss-bridge/feed.go b/rss-bridge/feed.go
index 912896b..45b41a1 100644
--- a/rss-bridge/feed.go
+++ b/rss-bridge/feed.go
@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/nbd-wtf/go-nostr"
 	strip "github.com/grokify/html-strip-tags-go"
 	"github.com/mmcdole/gofeed"
+	"github.com/nbd-wtf/go-nostr"
 	"github.com/rif/cache2go"
 )
 
@@ -108,7 +108,7 @@ func feedToSetMetadata(pubkey string, feed *gofeed.Feed) nostr.Event {
 
 	evt := nostr.Event{
 		PubKey:    pubkey,
-		CreatedAt: createdAt,
+		CreatedAt: nostr.Timestamp(createdAt.Unix()),
 		Kind:      nostr.KindSetMetadata,
 		Tags:      nostr.Tags{},
 		Content:   string(content),
@@ -139,7 +139,7 @@ func itemToTextNote(pubkey string, item *gofeed.Item) nostr.Event {
 
 	evt := nostr.Event{
 		PubKey:    pubkey,
-		CreatedAt: createdAt,
+		CreatedAt: nostr.Timestamp(createdAt.Unix()),
 		Kind:      nostr.KindTextNote,
 		Tags:      nostr.Tags{},
 		Content:   content,
diff --git a/rss-bridge/main.go b/rss-bridge/main.go
index 52b8714..7a54591 100644
--- a/rss-bridge/main.go
+++ b/rss-bridge/main.go
@@ -75,7 +75,7 @@ func (relay *Relay) Init() error {
 						for _, item := range feed.Items {
 							evt := itemToTextNote(pubkey, item)
 							last, ok := relay.lastEmitted.Load(entity.URL)
-							if !ok || time.Unix(last.(int64), 0).Before(evt.CreatedAt) {
+							if !ok || time.Unix(last.(int64), 0).Before(evt.CreatedAt.Time()) {
 								evt.Sign(entity.PrivateKey)
 								relay.updates <- evt
 								relay.lastEmitted.Store(entity.URL, last)
@@ -137,10 +137,10 @@ func (b store) QueryEvents(filter *nostr.Filter) ([]nostr.Event, error) {
 			if filter.Kinds == nil || slices.Contains(filter.Kinds, nostr.KindSetMetadata) {
 				evt := feedToSetMetadata(pubkey, feed)
 
-				if filter.Since != nil && evt.CreatedAt.Before(*filter.Since) {
+				if filter.Since != nil && evt.CreatedAt.Time().Before(filter.Since.Time()) {
 					continue
 				}
-				if filter.Until != nil && evt.CreatedAt.After(*filter.Until) {
+				if filter.Until != nil && evt.CreatedAt.Time().After(filter.Until.Time()) {
 					continue
 				}
 
@@ -153,17 +153,17 @@ func (b store) QueryEvents(filter *nostr.Filter) ([]nostr.Event, error) {
 				for _, item := range feed.Items {
 					evt := itemToTextNote(pubkey, item)
 
-					if filter.Since != nil && evt.CreatedAt.Before(*filter.Since) {
+					if filter.Since != nil && evt.CreatedAt.Time().Before(filter.Since.Time()) {
 						continue
 					}
-					if filter.Until != nil && evt.CreatedAt.After(*filter.Until) {
+					if filter.Until != nil && evt.CreatedAt.Time().After(filter.Until.Time()) {
 						continue
 					}
 
 					evt.Sign(entity.PrivateKey)
 
-					if evt.CreatedAt.After(time.Unix(int64(last), 0)) {
-						last = uint32(evt.CreatedAt.Unix())
+					if evt.CreatedAt.Time().After(time.Unix(int64(last), 0)) {
+						last = uint32(evt.CreatedAt.Time().Unix())
 					}
 
 					evts = append(evts, evt)