after getting an EOSE we should stop checking since/until.

This commit is contained in:
fiatjaf
2024-09-06 19:37:34 -03:00
parent cd145f4fcb
commit f57d93ac78
3 changed files with 28 additions and 8 deletions

View File

@@ -39,12 +39,37 @@ func (eff Filters) Match(event *Event) bool {
return false
}
func (eff Filters) MatchIgnoringTimestampConstraints(event *Event) bool {
for _, filter := range eff {
if filter.MatchesIgnoringTimestampConstraints(event) {
return true
}
}
return false
}
func (ef Filter) String() string {
j, _ := easyjson.Marshal(ef)
return string(j)
}
func (ef Filter) Matches(event *Event) bool {
if !ef.MatchesIgnoringTimestampConstraints(event) {
return false
}
if ef.Since != nil && event.CreatedAt < *ef.Since {
return false
}
if ef.Until != nil && event.CreatedAt > *ef.Until {
return false
}
return true
}
func (ef Filter) MatchesIgnoringTimestampConstraints(event *Event) bool {
if event == nil {
return false
}
@@ -67,14 +92,6 @@ func (ef Filter) Matches(event *Event) bool {
}
}
if ef.Since != nil && event.CreatedAt < *ef.Since {
return false
}
if ef.Until != nil && event.CreatedAt > *ef.Until {
return false
}
return true
}