Skip to content

Commit ccf5180

Browse files
authored
Revert "Strengthen feed filtering freshness (#2882)" (#2889)
This reverts commit aeeb412.
1 parent 845e73e commit ccf5180

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

tool/ood-gen/lib/changelog.ml

+1-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ module ChangelogFeed = struct
9393
let create_feed () =
9494
let open Rss in
9595
() |> all
96-
|> create_entries ~create_entry
97-
|> Ocamlorg.Import.List.take 365
96+
|> create_entries ~create_entry ~days:365
9897
|> entries_to_feed ~id:"changelog.xml" ~title:"OCaml Changelog"
9998
|> feed_to_string
10099
end

tool/ood-gen/lib/news.ml

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ module RssFeed = struct
5454
let create_feed () =
5555
let open Rss in
5656
all ()
57-
|> create_entries ~create_entry
58-
|> Ocamlorg.Import.List.take 90
57+
|> create_entries ~create_entry ~days:9000 (* FIXME *)
5958
|> entries_to_feed ~id:"news.xml" ~title:"OCaml News @ OCaml.org"
6059
|> feed_to_string
6160
end

tool/ood-gen/lib/planet.ml

+1-3
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,7 @@ module GlobalFeed = struct
148148

149149
let create_feed () =
150150
let open Rss in
151-
let entries =
152-
all () |> create_entries ~create_entry |> Ocamlorg.Import.List.take 90
153-
in
151+
let entries = all () |> create_entries ~create_entry ~days:90 in
154152

155153
match create_events_announcement_entry () with
156154
| None ->

tool/ood-gen/lib/rss.ml

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
let create_entries ~create_entry = List.map create_entry
1+
let create_entries ~create_entry ?days u =
2+
let is_fresh =
3+
let some days (entry : Syndic.Atom.entry) =
4+
let now = Ptime.of_float_s (Unix.gettimeofday ()) |> Option.get in
5+
let than = Ptime.sub_span now (Ptime.Span.v (days, 0L)) |> Option.get in
6+
if Ptime.is_later entry.updated ~than then Some entry else None
7+
in
8+
Option.fold ~none:Option.some ~some days
9+
in
10+
let entries = u |> List.filter_map (fun x -> x |> create_entry |> is_fresh) in
11+
entries
212

313
let entries_to_feed ~id ~title (entries : Syndic.Atom.entry list) =
414
let id = Uri.of_string ("https://ocaml.org/" ^ id) in

0 commit comments

Comments
 (0)