Skip to content

fix: improve sitemap content correctness in DefaultSitemapEntryLister #48

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
ruibaby merged 1 commit into from
Apr 27, 2026
Merged

fix: improve sitemap content correctness in DefaultSitemapEntryLister #48

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
8 changes: 5 additions & 3 deletions src/main/java/run/halo/sitemap/DefaultSitemapEntryLister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.time.Instant;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -43,6 +42,7 @@ private Flux<UrlEntryMeta> listPostUrls() {
&& Post.VisibleEnum.PUBLIC.equals(post.getSpec().getVisible()),
defaultComparator())
.map(Post::getStatusOrDefault)
.filter(status -> StringUtils.isNotBlank(status.getPermalink()))
.map(status -> new UrlEntryMeta(status.getPermalink())
.setLastModifiedTime(status.getLastModifyTime())
);
Expand All @@ -56,11 +56,11 @@ Comparator<Post> defaultComparator() {

private Flux<UrlEntryMeta> listSinglePageUrls() {
return client.list(SinglePage.class, singlePage -> singlePage.isPublished()
&& Objects.equals(false, singlePage.getSpec().getDeleted())
&& ExtensionOperator.isNotDeleted().test(singlePage)
&& Post.VisibleEnum.PUBLIC.equals(singlePage.getSpec().getVisible()),
pageDefaultComparator())
.map(SinglePage::getStatusOrDefault)
.filter(status -> StringUtils.isNotBlank(status.getPermalink()))
.map(status -> new UrlEntryMeta(status.getPermalink())
.setLastModifiedTime(status.getLastModifyTime())
);
Expand All @@ -78,6 +78,7 @@ private Flux<UrlEntryMeta> listCategoryUrls() {
category -> category.getMetadata().getDeletionTimestamp() == null,
Comparator.comparing(tag -> tag.getMetadata().getCreationTimestamp()))
.map(Category::getStatusOrDefault)
.filter(status -> StringUtils.isNotBlank(status.getPermalink()))
.map(status -> new UrlEntryMeta(status.getPermalink()));
}

Expand All @@ -86,11 +87,11 @@ private Flux<UrlEntryMeta> listTagUrls() {
tag -> tag.getMetadata().getDeletionTimestamp() == null,
Comparator.comparing(tag -> tag.getMetadata().getCreationTimestamp()))
.map(Tag::getStatusOrDefault)
.filter(status -> StringUtils.isNotBlank(status.getPermalink()))
.map(status -> new UrlEntryMeta(status.getPermalink()));
}

private Flux<UrlEntryMeta> urlsForListPages() {
// TODO 优化系统其他路由获取
return client.fetch(ConfigMap.class, SystemSetting.SYSTEM_CONFIG)
.mapNotNull(ConfigMap::getData)
.map(data -> {
Expand All @@ -99,6 +100,7 @@ private Flux<UrlEntryMeta> urlsForListPages() {
.map(json -> JsonUtils.jsonToObject(json, ThemeRouteRules.class))
.orElseGet(ThemeRouteRules::empty);
return List.of(
"/",
StringUtils.prependIfMissing(themeRouteRules.getTags(), "/"),
StringUtils.prependIfMissing(themeRouteRules.getCategories(), "/"),
StringUtils.prependIfMissing(themeRouteRules.getArchives(), "/")
Expand Down
Loading