diff --git a/TASVideos/Pages/RssFeeds/News.cshtml b/TASVideos/Pages/RssFeeds/News.cshtml
index 797dd1166..cfb0ae57b 100644
--- a/TASVideos/Pages/RssFeeds/News.cshtml
+++ b/TASVideos/Pages/RssFeeds/News.cshtml
@@ -13,7 +13,17 @@
@foreach (var news in Model.News)
{
-
+ var postUrl = $"{Settings.BaseUrl}/Forum/Posts/{news.PostId}";
+ -
+ @news.Subject
+ @postUrl
+
+
+
+ @postUrl
+ @postUrl
+ @news.PubDate
+
}
\ No newline at end of file
diff --git a/TASVideos/Pages/RssFeeds/Publications.cshtml b/TASVideos/Pages/RssFeeds/Publications.cshtml
index 113b80b32..b5e0f61d3 100644
--- a/TASVideos/Pages/RssFeeds/Publications.cshtml
+++ b/TASVideos/Pages/RssFeeds/Publications.cshtml
@@ -1,4 +1,5 @@
@page
+@using System.Globalization
@inject AppSettings Settings
@model PublicationsModel
@{
@@ -13,7 +14,36 @@
@foreach (var pub in Model.Publications)
{
-
+ var movieUrl = $"{Settings.BaseUrl}/{pub.Id}M";
+ var primaryStreaming = pub.StreamingUrls.FirstOrDefault(u => u.Contains("youtube"));
+ var secondaryStreaming = pub.StreamingUrls.Where(u => u != primaryStreaming);
+ -
+ @pub.Title
+ @movieUrl
+
+
+
+
+
+ @foreach (var tag in pub.TagNames)
+ {
+ @tag
+ }
+
+
+
+ @foreach (var url in secondaryStreaming)
+ {
+
+ }
+
+
+
+
+
+ @movieUrl
+ @pub.CreateTimestamp.ToString("u", CultureInfo.InvariantCulture)
+
}
\ No newline at end of file
diff --git a/TASVideos/Pages/RssFeeds/Submissions.cshtml b/TASVideos/Pages/RssFeeds/Submissions.cshtml
index 09382b124..b821a93d9 100644
--- a/TASVideos/Pages/RssFeeds/Submissions.cshtml
+++ b/TASVideos/Pages/RssFeeds/Submissions.cshtml
@@ -1,4 +1,5 @@
@page
+@using System.Globalization
@inject AppSettings Settings
@model SubmissionsModel
@{
@@ -13,7 +14,20 @@
@foreach (var sub in Model.Submissions)
{
-
+ var subUrl = $"{Settings.BaseUrl}/{sub.Id}S";
+ -
+ @sub.Title
+ @subUrl
+
+
+
+
+
+ @(Settings.BaseUrl)/Forum/Topics/@sub.TopicId
+
+ @subUrl
+ @sub.CreateTimestamp.ToString("u", CultureInfo.InvariantCulture)
+
}
\ No newline at end of file
diff --git a/TASVideos/Pages/RssFeeds/_RssNews.cshtml b/TASVideos/Pages/RssFeeds/_RssNews.cshtml
deleted file mode 100644
index 1f77841da..000000000
--- a/TASVideos/Pages/RssFeeds/_RssNews.cshtml
+++ /dev/null
@@ -1,16 +0,0 @@
-@model TASVideos.Pages.RssFeeds.NewsModel.RssNews
-@inject AppSettings Settings
-@{
- var baseUrl = Settings.BaseUrl;
- var postUrl = $"{baseUrl}/Forum/Posts/{Model.PostId}";
-}
--
- @Model.Subject
- @postUrl
-
-
-
- @postUrl
- @postUrl
- @Model.PubDate
-
\ No newline at end of file
diff --git a/TASVideos/Pages/RssFeeds/_RssPublication.cshtml b/TASVideos/Pages/RssFeeds/_RssPublication.cshtml
deleted file mode 100644
index 6d2f24a58..000000000
--- a/TASVideos/Pages/RssFeeds/_RssPublication.cshtml
+++ /dev/null
@@ -1,37 +0,0 @@
-@using System.Globalization
-@inject AppSettings Settings
-@model TASVideos.Pages.RssFeeds.PublicationsModel.RssPublication
-@{
- var baseUrl = Settings.BaseUrl;
- var movieUrl = $"{baseUrl}/{Model.Id}M";
-
- var primaryStreaming = Model.StreamingUrls.FirstOrDefault(u => u.Contains("youtube"));
- var secondaryStreaming = Model.StreamingUrls.Where(u => u != primaryStreaming);
-}
--
- @Model.Title
- @movieUrl
-
-
-
-
-
- @foreach (var tag in Model.TagNames)
- {
- @tag
- }
-
-
-
- @foreach (var url in secondaryStreaming)
- {
-
- }
-
-
-
-
-
- @movieUrl
- @Model.CreateTimestamp.ToString("u", CultureInfo.InvariantCulture)
-
\ No newline at end of file
diff --git a/TASVideos/Pages/RssFeeds/_RssSubmission.cshtml b/TASVideos/Pages/RssFeeds/_RssSubmission.cshtml
deleted file mode 100644
index 21563710c..000000000
--- a/TASVideos/Pages/RssFeeds/_RssSubmission.cshtml
+++ /dev/null
@@ -1,21 +0,0 @@
-@using System.Globalization
-@using TASVideos.TagHelpers
-@inject AppSettings Settings
-@model TASVideos.Pages.RssFeeds.SubmissionsModel.RssSubmission
-@{
- var baseUrl = Settings.BaseUrl;
- var subUrl = $"{baseUrl}/{Model.Id}S";
-}
--
- @Model.Title
- @subUrl
-
-
-
-
-
- @(baseUrl)/Forum/Topics/@Model.TopicId
-
- @subUrl
- @Model.CreateTimestamp.ToString("u", CultureInfo.InvariantCulture)
-
\ No newline at end of file
diff --git a/TASVideos/TASVideos.csproj b/TASVideos/TASVideos.csproj
index 82dfb5d98..d2d00d866 100644
--- a/TASVideos/TASVideos.csproj
+++ b/TASVideos/TASVideos.csproj
@@ -92,18 +92,9 @@
$(IncludeRazorContentInPack)
-
- $(IncludeRazorContentInPack)
-
$(IncludeRazorContentInPack)
-
- $(IncludeRazorContentInPack)
-
-
- $(IncludeRazorContentInPack)
-
$(IncludeRazorContentInPack)
diff --git a/TASVideos/TagHelpers/RssLink.cs b/TASVideos/TagHelpers/RssLink.cs
new file mode 100644
index 000000000..518323331
--- /dev/null
+++ b/TASVideos/TagHelpers/RssLink.cs
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TASVideos.TagHelpers;
+
+// A work-around for the fact that tools do not understand we are building RSS and not HTML, this makes errors and warnings go away
+public class RssLink : TagHelper
+{
+ public override void Process(TagHelperContext context, TagHelperOutput output)
+ {
+ output.TagName = "link";
+ }
+}