badmanners/gallery.badmanners.xyz
badmanners/gallery.badmanners.xyz
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix copyrightedCharacters in feed

Browse source
This commit is contained in:
Bad Manners 2024-11-02 16:22:50 -03:00
parent b03aca87e7
commit 74e6e66665
Signed by: badmanners
GPG key ID: 8C88292CCB075609
3 changed files with 30 additions and 26 deletions

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "gallery.badmanners.xyz", "name": "gallery.badmanners.xyz",
"version": "1.12.0", "version": "1.12.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "gallery.badmanners.xyz", "name": "gallery.badmanners.xyz",
"version": "1.12.0", "version": "1.12.1",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@astrojs/alpinejs": "^0.4.0", "@astrojs/alpinejs": "^0.4.0",

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "gallery.badmanners.xyz", "name": "gallery.badmanners.xyz",
"type": "module", "type": "module",
"version": "1.12.0", "version": "1.12.1",
"scripts": { "scripts": {
"postinstall": "astro sync", "postinstall": "astro sync",
"dev": "astro dev", "dev": "astro dev",

50
src/utils/feed.ts
View file

@ -29,7 +29,7 @@ function toNoonUTCDate(date: Date) {
const getLinkForUser = (user: CollectionEntry<"users">, lang: Lang) => { const getLinkForUser = (user: CollectionEntry<"users">, lang: Lang) => {
const userName = getUsernameForLang(user, lang); const userName = getUsernameForLang(user, lang);
if (user.data.preferredLink) { if (user.data.preferredLink) {
return `<a href="${user.data.links[user.data.preferredLink]!.link}">${userName}</a>`; return `<a href="${encodeURI(user.data.links[user.data.preferredLink]!.link)}">${userName}</a>`;
} }
return userName; return userName;
}; };
@ -80,17 +80,19 @@ export async function storyFeedItem(
`<hr><h2>Description</h2>` + `<hr><h2>Description</h2>` +
(await markdown(await qualifyLocalURLsInMarkdown(data.description, data.lang, site))) + (await markdown(await qualifyLocalURLsInMarkdown(data.description, data.lang, site))) +
(copyrightedCharacters.length > 0 (copyrightedCharacters.length > 0
? `<br /><ul>${copyrightedCharacters.map( ? `<br /><ul>${copyrightedCharacters
({ user, characters }) => .map(
"<li>" + ({ user, characters }) =>
t( "<li>" +
data.lang, t(
"characters/characters_are_copyrighted_by", data.lang,
getLinkForUser(user, data.lang), "characters/characters_are_copyrighted_by",
characters, getLinkForUser(user, data.lang),
) + characters,
"</li>", ) +
)}</ul>` "</li>",
)
.join("")}</ul>`
: ""), : ""),
site, site,
), ),
@ -132,17 +134,19 @@ export async function gameFeedItem(
`<hr><h2>Description</h2>` + `<hr><h2>Description</h2>` +
(await markdown(await qualifyLocalURLsInMarkdown(data.description, data.lang, site))) + (await markdown(await qualifyLocalURLsInMarkdown(data.description, data.lang, site))) +
(copyrightedCharacters.length > 0 (copyrightedCharacters.length > 0
? `<br /><ul>${copyrightedCharacters.map( ? `<br /><ul>${copyrightedCharacters
({ user, characters }) => .map(
"<li>" + ({ user, characters }) =>
t( "<li>" +
data.lang, t(
"characters/characters_are_copyrighted_by", data.lang,
getLinkForUser(user, data.lang), "characters/characters_are_copyrighted_by",
characters, getLinkForUser(user, data.lang),
) + characters,
"</li>", ) +
)}</ul>` "</li>",
)
.join("")}</ul>`
: ""), : ""),
site, site,
), ),