.gitea/workflows/release.yml

@@ -2,8 +2,7 @@ name: "Release"
 
 on:
   push:
-    tags:
-      - "v*"
+    tags: "v*"
 
 jobs:
   release:
@@ -21,16 +20,22 @@ jobs:
           echo "Releasing version: $VERSION"
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-      - name: Get the release notes from the changelog
-        run: |
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          RELEASE_NOTES=$(sed -n -e "/^## \[$VERSION\]/,/^## \[/{//"'!'"p;}" CHANGELOG.md | sed -e '1d;$d')
-          echo "Release notes:"
-          echo
-          echo "$RELEASE_NOTES"
-          echo "RELEASE_NOTES<<$EOF" >> "$GITHUB_ENV"
-          echo "$RELEASE_NOTES" >> "$GITHUB_ENV"
-          echo "$EOF" >> "$GITHUB_ENV"
+      - name: Install Rust stable toolchain
+        uses: https://github.com/actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Install cargo-deb
+        uses: https://github.com/brndnmtthws/rust-action-cargo-binstall@v1
+        with:
+          packages: cargo-deb
+
+      - name: Run cargo-deb
+        uses: https://github.com/actions-rs/cargo@v1
+        with:
+          command: deb
 
       - name: Install Go
         uses: actions/setup-go@v4
@@ -42,9 +47,8 @@ jobs:
         with:
           # This is available by default.
           api_key: '${{ secrets.RELEASE_TOKEN }}'
-          files: FIXME
+          files: target/debian/podbringer*.deb
           title: 'Release ${{ env.VERSION }}'
-          body: '${{ env.RELEASE_NOTES }}'
 
   release-crate:
     name: "Release crate"
@@ -72,41 +76,7 @@ jobs:
         uses: https://github.com/actions-rs/cargo@v1
         env:
           # This needs to be provided for the repository; no login necessary as a result.
-          CARGO_REGISTRIES_LUON_TOKEN: '${{ secrets.CARGO_TOKEN }}'
+          CARGO_REGISTRIES_LUON_TOKEN: '${{ secrets.CARGO_REGISTRIES_LUON_TOKEN }}'
         with:
           command: publish
           args: --registry luon
-
-  release-deb:
-    name: "Release Debian package"
-    runs-on: debian-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Install Rust stable toolchain
-        uses: https://github.com/actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
-      - name: Install cargo-deb
-        uses: https://github.com/brndnmtthws/rust-action-cargo-binstall@v1
-        with:
-          packages: cargo-deb
-
-      - name: Run cargo-deb
-        uses: https://github.com/actions-rs/cargo@v1
-        with:
-          command: deb
-
-      - name: Publish Debian package
-        env:
-          DEB_REPO_TOKEN: '${{ secrets.DEB_REPO_TOKEN }}'
-        run: |
-          curl --config <(printf "user=%s:%s" paul "${DEB_REPO_TOKEN}") \
-            --upload-file target/debian/podbringer*.deb \
-            https://git.luon.net/api/packages/paul/debian/pool/bookworm/main/upload

CHANGELOG.md

@@ -7,50 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.5.3] - 2024-02-27
-
-### Changed
-
-* Update dependency on `cached`
-
-### Security
-
-* Update dependencies, fixes security advisories:
-  * [RUSTSEC-2024-0003](https://rustsec.org/advisories/RUSTSEC-2024-0003)
-  * [RUSTSEC-2023-0072](https://rustsec.org/advisories/RUSTSEC-2024-0072)
-  * [RUSTSEC-2023-0074](https://rustsec.org/advisories/RUSTSEC-2024-0072)
-
-### Fixed
-
-* Handle paging information begin absent; fixes short feeds for Mixcloud (#17)
-
-## [0.5.2] - 2023-11-03
-
-### Security
-
-* Update dependencies
-  ([RUSTSEC-2020-0071](https://rustsec.org/advisories/RUSTSEC-2020-0071.html))
-
-### Changed
-
-* Switch to Rocket 0.5 RC4
-* Update dependency on `cached`
-
-## [0.5.1] - 2023-08-25
-
-### Changed
-
-* Bump the dependency on `youtube_dl`
-* Update release Gitea Actions workflow; add seperate job to release Debian
-  package to the new repository
-
-### Security
-
-* Update dependencies
-  ([RUSTSEC-2023-0034](https://rustsec.org/advisories/RUSTSEC-2023-0034),
-  [RUSTSEC-2023-0044](https://rustsec.org/advisories/RUSTSEC-2023-0044),
-  [RUSTSEC-2023-0052](https://rustsec.org/advisories/RUSTSEC-2023-0052))
-
 ## [0.5.0] - 2023-06-08
 
 ### Added
@@ -150,10 +106,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial release.
 
-[Unreleased]: https://git.luon.net/paul/podbringer/compare/v0.5.3...HEAD
-[0.5.3]: https://git.luon.net/paul/podbringer/compare/v0.5.1..v0.5.2
-[0.5.2]: https://git.luon.net/paul/podbringer/compare/v0.5.1..v0.5.2
-[0.5.1]: https://git.luon.net/paul/podbringer/compare/v0.5.0..v0.5.1
+[Unreleased]: https://git.luon.net/paul/podbringer/compare/v0.4.1...HEAD
 [0.5.0]: https://git.luon.net/paul/podbringer/compare/v0.4.1..v0.5.0
 [0.4.1]: https://git.luon.net/paul/podbringer/compare/v0.4.0..v0.4.1
 [0.4.0]: https://git.luon.net/paul/podbringer/compare/v0.3.0..v0.4.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "podbringer"
-version = "0.5.3"
+version = "0.5.0"
 authors = ["Paul van Tilburg <paul@luon.net>"]
 edition = "2021"
 description = "Web service that provides podcasts for services that don't offer them (anymore)"
@@ -10,7 +10,7 @@ license = "MIT"
 
 [dependencies]
 async-trait = "0.1.57"
-cached = { version = "0.49.2", features = ["async"] }
+cached = { version = "0.42.0", features = ["async"] }
 chrono = { version = "0.4.19", features = ["serde"] }
 enum_dispatch = "0.3.8"
 mime-db = "1.6.0"
@@ -20,7 +20,7 @@ rocket_dyn_templates = { version = "0.1.0-rc.2", features = ["tera"] }
 rss = "2.0.1"
 thiserror = "1.0.31"
 url = { version = "2.2.2", features = ["serde"] }
-youtube_dl = { version = "0.9.0", features = ["tokio"] }
+youtube_dl = { version = "0.8.0", features = ["tokio"] }
 ytextract = "0.11.2"
 
 [package.metadata.deb]

src/backends/mixcloud.rs

@@ -66,16 +66,11 @@ impl super::Backend for Backend {
             let count = cloudcasts_res.items.len();
             cloudcasts.extend(cloudcasts_res.items);
 
-            // Check if any paging information is present.
-            let Some(paging) = cloudcasts_res.paging else {
-                break;
-            };
-
             // Continue onto the next URL in the paging, if there is one and the limit was not
             // reached.
             limit = limit.saturating_sub(count);
             offset += count;
-            match (limit, paging.next) {
+            match (limit, cloudcasts_res.paging.next) {
                 (0, Some(_)) => break,
                 (_, Some(next_url)) => {
                     cloudcasts_url = Url::parse(&next_url)?;
@@ -131,8 +126,8 @@ pub(crate) struct CloudcastsResponse {
     #[serde(rename = "data")]
     items: Vec<Cloudcast>,
 
-    /// The paging information (if any).
-    paging: Option<CloudcastsPaging>,
+    /// The paging information.
+    paging: CloudcastsPaging,
 }
 
 /// The Mixcloud paging info.

src/backends/youtube.rs

@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
 
 use async_trait::async_trait;
 use cached::proc_macro::cached;
-use chrono::{TimeZone, Utc};
+use chrono::{DateTime, Utc};
 use reqwest::Url;
 use rocket::futures::StreamExt;
 use ytextract::playlist::video::{Error as YouTubeVideoError, Video as YouTubePlaylistVideo};
@@ -224,7 +224,7 @@ impl From<YouTubeVideoWithStream> for Item {
             .date()
             .and_hms_opt(12, 0, 0)
             .expect("Invalid hour, minute and/or second");
-        let published_at = Utc.from_utc_datetime(&timestamp);
+        let published_at = DateTime::from_utc(timestamp, Utc);
         // There is no updated at timestamp available, really.
         let updated_at = published_at;
 

src/feed.rs

@@ -2,7 +2,7 @@
 
 use std::path::PathBuf;
 
-use chrono::{DateTime, NaiveDateTime, TimeZone, Utc};
+use chrono::{DateTime, NaiveDateTime, Utc};
 use rocket::http::uri::Absolute;
 use rocket::uri;
 use rss::extension::itunes::{
@@ -30,7 +30,7 @@ pub(crate) fn construct(backend_id: &str, config: &Config, channel: Channel) ->
         .build();
     let unix_timestamp = NaiveDateTime::from_timestamp_opt(0, 0)
         .expect("Out-of-range seconds or invalid nanoseconds");
-    let mut last_build = Utc.from_utc_datetime(&unix_timestamp);
+    let mut last_build = DateTime::from_utc(unix_timestamp, Utc);
     let generator = String::from(concat!(
         env!("CARGO_PKG_NAME"),
         " ",