Skip to content

Fix news feed showing placeholder: read news from main #222

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.

Sign up for GitHub

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

Merged
fboucher merged 1 commit into from
Oct 27, 2026
Merged

Fix news feed showing placeholder: read news from main #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion src/NoteBookmark.MauiApp.Tests/NewsFeedServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Net.Http;
Expand Down Expand Up @@ -50,6 +51,24 @@ public async Task RefreshAsync_CachesMarkdownAndReferencedImagesForOfflineRender
File.Exists(Path.Combine(_appDataDirectory, "docs", "assets", "logo.png")).Should().BeTrue();
}

[Fact]
public async Task RefreshAsync_DownloadsFeedAndAssetsFromMainBranch()
{
var requestedUrls = new List<string>();
var handler = CreateFeedHandler("# Updates\n\n![Logo](assets/logo.png)", "/docs/assets/logo.png");
var service = CreateService(new StubHttpMessageHandler(request =>
{
requestedUrls.Add(request.RequestUri!.AbsoluteUri);
return handler.Respond(request);
}));

await service.RefreshAsync();

requestedUrls.Should().Equal(
"https://raw.githubusercontent.com/fboucher/NoteBookmark/main/docs/news.md",
"https://raw.githubusercontent.com/fboucher/NoteBookmark/main/docs/assets/logo.png");
}

[Fact]
public async Task GetHtmlAsync_WhenNoFeedIsCached_LoadsRemoteFeed()
{
Expand Down Expand Up @@ -180,6 +199,8 @@ private static StubHttpMessageHandler CreateFeedHandler(string markdown, params
private sealed class StubHttpMessageHandler(Func<HttpRequestMessage, HttpResponseMessage> responseFactory) : HttpMessageHandler
{
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) =>
Task.FromResult(responseFactory(request));
Task.FromResult(Respond(request));

public HttpResponseMessage Respond(HttpRequestMessage request) => responseFactory(request);
}
}
4 changes: 2 additions & 2 deletions src/NoteBookmark.MauiApp/Data/NewsFeedService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ namespace NoteBookmark.MauiApp.Data;

public sealed class NewsFeedService : INewsFeedService
{
private const string NewsFeedUrl = "https://raw.githubusercontent.com/fboucher/NoteBookmark/v-next/docs/news.md";
private const string NewsAssetsUrl = "https://raw.githubusercontent.com/fboucher/NoteBookmark/v-next/docs/assets/";
private const string NewsFeedUrl = "https://raw.githubusercontent.com/fboucher/NoteBookmark/main/docs/news.md";
private const string NewsAssetsUrl = "https://raw.githubusercontent.com/fboucher/NoteBookmark/main/docs/assets/";
private const string FallbackHtml = "<p>Welcome to NoteBookmark! Check back here for product updates.</p>";
private static readonly Regex HtmlUrlAttributePattern = new(
@"(?<attribute>href|src)=""(?<value>[^""]*)""",
Expand Down
Loading