Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Strengthen feed filtering freshness" #2889

Merged
merged 1 commit into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tool/ood-gen/lib/changelog.ml
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ module ChangelogFeed = struct
let create_feed () =
let open Rss in
() |> all
|> create_entries ~create_entry
|> Ocamlorg.Import.List.take 365
|> create_entries ~create_entry ~days:365
|> entries_to_feed ~id:"changelog.xml" ~title:"OCaml Changelog"
|> feed_to_string
end
Expand Down
3 changes: 1 addition & 2 deletions tool/ood-gen/lib/news.ml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ module RssFeed = struct
let create_feed () =
let open Rss in
all ()
|> create_entries ~create_entry
|> Ocamlorg.Import.List.take 90
|> create_entries ~create_entry ~days:9000 (* FIXME *)
|> entries_to_feed ~id:"news.xml" ~title:"OCaml News @ OCaml.org"
|> feed_to_string
end
4 changes: 1 addition & 3 deletions tool/ood-gen/lib/planet.ml
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,7 @@ module GlobalFeed = struct

let create_feed () =
let open Rss in
let entries =
all () |> create_entries ~create_entry |> Ocamlorg.Import.List.take 90
in
let entries = all () |> create_entries ~create_entry ~days:90 in

match create_events_announcement_entry () with
| None ->
Expand Down
12 changes: 11 additions & 1 deletion tool/ood-gen/lib/rss.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
let create_entries ~create_entry = List.map create_entry
let create_entries ~create_entry ?days u =
let is_fresh =
let some days (entry : Syndic.Atom.entry) =
let now = Ptime.of_float_s (Unix.gettimeofday ()) |> Option.get in
let than = Ptime.sub_span now (Ptime.Span.v (days, 0L)) |> Option.get in
if Ptime.is_later entry.updated ~than then Some entry else None
in
Option.fold ~none:Option.some ~some days
in
let entries = u |> List.filter_map (fun x -> x |> create_entry |> is_fresh) in
entries

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