Merge commit '4544a2261dc2980b3a7d32f894c8f6b5d6a3e544' into staging

9 files changed, 88 insertions, 93 deletions

diff --git a/album/perfectly-generic-album.yaml b/album/perfectly-generic-album.yaml
index b02d071..1ace991 100644
--- a/album/perfectly-generic-album.yaml
+++ b/album/perfectly-generic-album.yaml
@@ -3,6 +3,8 @@ Artists:
 - Cristata
 Date: November 10, 2019
 Date Added: May 25, 2020
+URLs:
+- https://www.youtube.com/playlist?list=PLjYwXMkTvx6XTlCI7yQymaeeow-92CCS9
 Has Track Art: false
 Cover Artists:
 - Cristata
@@ -34,20 +36,23 @@ Commentary: |-
 ---
 Track: New and Improved
 Duration: '1:31'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=PNFVwcHAqmI
 Commentary: |-
     <i>Cristata:</i>
     New And Improved Webcomic.
 ---
 Track: Healing June
 Duration: '3:08'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=xZtfOpp-0jo
 Referenced Tracks:
 - track:doctor
 ---
 Track: Moondancer
 Duration: '6:01'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=Y9ltxPAI1r4
 Referenced Tracks:
 - Moonsetter
 Commentary: |-
@@ -56,28 +61,32 @@ Commentary: |-
 ---
 Track: Perfectly Generic
 Duration: '2:36'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=hYDmVvC2lMU
 Commentary: |-
     <i>Cristata:</i>
     Perfectly.... generic!
 ---
 Track: Nepeta Plays Kingdom Hearts and Loses her Shit Over Lion King Sora
 Duration: '3:20'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=Xdp-61b-k2c
 Commentary: |-
     <i>Cristata:</i>
     This was made as a joke to annoy a friend but I ended up enjoying it instead, so now you all get to listen to it too.
 ---
 Track: NEBULAMPHIBIAN
 Duration: '3:07'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=pIf8vXLo-kg
 Commentary: |-
     <i>Cristata:</i>
     Frog time.
 ---
 Track: Quartz and Melody
 Duration: '2:52'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=I8AMmelSZm8
 Commentary: |-
     <i>Cristata:</i>
     You ever think about how cool the trolls' lands were?
@@ -85,7 +94,8 @@ Commentary: |-
 Track: Thought and Flow
 Directory: thought-and-flow-pga
 Duration: '3:46'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=3vE59Fdjdh4
 Commentary: |-
     <i>Cristata:</i>
     Because I do!
@@ -101,9 +111,11 @@ Commentary: |-
 ---
 Track: Another Noir (Extended Void Mix)
 Duration: '5:48'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=if21XVJnGlE
 Referenced Tracks:
-- track:gasters-theme-undertale
+- ANOTHER HIM
+- Liquid Negrocity
 Commentary: |-
     <i>Cristata:</i>
     Another Noir patch notes
@@ -112,21 +124,24 @@ Commentary: |-
 Track: Megalo in Death // ʞɔɐq ǝʞᴉɹʇS ɥʇɐǝp
 Directory: megalo-in-death
 Duration: '4:20'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=scoo6r7rW_E
 Commentary: |-
     <i>Cristata:</i>
     I promised I'd get a megalo on this album.
 ---
 Track: Welcome to Your New Suburban Reality
 Duration: '5:21'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=_3NstB6oouo
 Commentary: |-
     <i>Cristata:</i>
     Acts 1-3 were really good, actually.
 ---
 Track: Eternally You
 Duration: '5:22'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=mqPxB2ustEU
 Commentary: |-
     <i>Cristata:</i>
     See ya next time!
diff --git a/artists.yaml b/artists.yaml
index 8c12250..3cffbf6 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -4329,6 +4329,7 @@ Artist: Toby Fox
 URLs:
 - https://tobyfox.bandcamp.com/
 - https://twitter.com/tobyfox
+- https://toby.fangamer.com/
 ---
 Artist: Toe
 ---
diff --git a/static-page/about.yaml b/static-page/about.yaml
new file mode 100644
index 0000000..ba7eb70
--- /dev/null
+++ b/static-page/about.yaml
@@ -0,0 +1,21 @@
+Name: About &amp; Credits
+Directory: about
+Content: |-
+    Welcome to HSMusic, a fan-made Homestuck music wiki!
+    <a href="https://www.homestuck.com/">Homestuck</a> has always been an incredible creative collaboration, and especially beloved by the community—not to mention a crucial part of that collaboration—is Homestuck's humongous soundtrack, comprising well over 500 diverse tracks by dozens of musicians and artists. This wiki aims to be an interesting and useful resource for anyone interested in that music, as well as an archive and up-to-date reference for all things related.
+    On the history of this site: it was originally created  as a remake of Homestuck's official <a href="https://homestuck.bandcamp.com/">Bandcamp</a>, which saw its content particularly restructured on 25 October 2019. HSMusic Wiki aims to be a longer-lasting resource and reference: track art is archived for good, solo albums (and beyond!) are all catalogued in one place, and URLs will always stay consistent. And of course, nearly every track and album has links for listening on Bandcamp and other services.
+    Nowadays, HSMusic also operates as a center for all sorts of fan music, a starting point where avid listeners can explore, discover, and support artists and albums within the sphere around Homestuck music. We're always looking to share new music here, so if there's anything you'd like to see, please feel encouraged to [[static:feedback|drop a line]]! We also have an active [[static:discord|Discord community]] where a wide variety of folk discuss Homestuck music and work together to bring updates, new albums, and more to the HSMusic website - anyone is welcome to drop by and say hello!
+    The code for this website is open source (MIT license), and can be explored or forked <a href="https://github.com/hsmusic/hsmusic-wiki/">on GitHub</a>. If you want to get in touch with feature requests, comments on the code, or pesky bugs which passed through unnoticed, feel free to open an issue or contact through [[static:discord|Discord]] or [[static:feedback|other means]]!
+    <i>Resource &amp; Author Credits</i>
+    - Quasar Nebula: that's me - it's us! We programmed most of the site, and were resonsible for putting the whole thing together initially. [[static:feedback|Say hi!]]
+    - <a href="https://homestuck.bandcamp.com/">Homestuck's Bandcamp</a>, the official host of Homestuck's music: We got almost all the official album listings and basic track info from here.
+    - GiovanH's <a href="https://my.pcloud.com/publink/show?code=kZdJQ8kZNyIwh0Hn1ime6Ty7L2J87BE3E2ak">complete track art archive</a>: track art! A million thanks for putting this together and sharing this with me. (Prior to this, I used the <a href="https://web.archive.org/web/20190720035022/https://homestuck.bandcamp.com/music">Web Archive</a> to gather track art.)
+    - <a href="https://homestuck.net/music/references.html">NSND</a>: leitmotifs! Thanks to this site in combination with credits on the bandcamp and artists' own commentary, this wiki is a rather comprehensive resource for leitmotifs and other track references.
+    - <a href="https://www.bgreco.net/hsflash.html">bgreco.net (HQ Audio Flashes)</a>: thumbnail captures for the individual Flash animations! There were a few captures missing that we took ourselves, but many Flash thumbnails are from here.</a>
+    - The <a href="https://homestuck-and-mspa-music.fandom.com/wiki/Homestuck_and_MSPA_Music_Wiki">Homestuck and MSPA Music Wiki</a> on Fandom: the inspiration for this wiki! We've wanted to make a more complete and explorable wiki ever since seeing it. The Fandom wiki has also been a very handy reference in putting this together, so much thanks to everyone who's worked on it!
+    - <a href="https://www.homestuck.com/">homestuck.com</a>: Besides being the home of the webcomic this whole site is based around, the main wallpaper for the site is pulled from <a href="https://www.homestuck.com/info-more">More from Homestuck</a>.
+    - <a href="https://carrd.co/">carrd.co</a>: We stole your icons.svg file. It is ours now. :tobyfox_dog_sunglasses:
+    - All organizers and contributors of the <a href="https://sollay-b.tumblr.com/post/188094230423/hello-a-couple-of-years-ago-allyssinian">Homestuck Vol. 5 Anthology</a> - community-made track art for [[album:homestuck-vol-5]]! All of this art is <i>excellent</i>. Each track credits its respective cover artist.
+    - Likewise for the <a href="https://hsfanmusic.skaia.net/post/619761136023257089/unofficialmspafans-we-are-proud-to-announce-the">Beyond Canon Track Art Anthology</a> as well as <a href="https://alterniaart.tumblr.com/">Alternia/Bound</a>!
+    - All comments on the site: We appreciate all feedback immeasurably! People have shared a ton of ideas and suggestions, and we can't emphasize enough how incredible it is to share a project with like-minded folk interested in improving it with you.
+    - Each of the countless contributions, both from the awesome and dedicated community members of our Discord bringing album additions, reviewing existing data and content, localizing the site to languages beyond English, and more; and from everyone who has dropped an email or DM with feedback, lyrics, caught data errors, and the like: Thank you! HSMusic wouldn't be a fraction of what it is without everyone who has worked together to bring it here.
diff --git a/static-pages.yaml b/static-page/changelog.yaml
index 549ee2c..7c1a02b 100644
--- a/static-pages.yaml
+++ b/static-page/changelog.yaml
@@ -1,54 +1,3 @@
-Name: About &amp; Credits
-Directory: about
-Content: |-
-    Welcome to HSMusic, a fan-made Homestuck music wiki!
-    <a href="https://www.homestuck.com/">Homestuck</a> has always been an incredible creative collaboration, and especially beloved by the community and critical in that collaboration is the webcomic and world's humongous soundtrack, comprising well over 500 tracks by dozens of musicians and artists. This wiki aims to be an interesting and useful resource for anyone interested in that music, as well as an archive for all things related.
-    Pertaining to the history of this site: it was originally made as a remake of Homestuck's official <a href="https://homestuck.bandcamp.com/">Bandcamp</a>, which saw its content particularly reduced on <a href="https://twitter.com/hamesatron/status/1187842783618297856">10/25/19</a>. This site aims to be a more reliable resource and reference: track art (conspicuously missing from the Bandcamp) is archived here, solo albums (among other missing albums, like [[album:squiddles]]) are all indexed in the one place, and URLs will always stay consistent. And of course, also included are links for listening on Bandcamp and other services.
-    Nowadays, HSMusic also operates as a center for all sorts of fan music, a sort-of home where avid listeners can explore, discover, and support artists and albums within the sphere around Homestuck music. We're always looking to share new music here, so if there's anything you'd like to see, please feel encouraged to [[static:feedback|drop a message]]!
-    The code for this website is open source (GPL-3.0), and can be explored or forked <a href="https://notabug.org/hsmusic/">here</a>. If you want to get in touch with feature requests or comments on the code, our contact info is [[static:feedback|here]]!
-    <i>Resource &amp; Author Credits</i>
-    - Quasar Nebula: that's me - it's us! We programmed most of the site, and put the whole thing together. [[static:feedback|Say hi]]!
-    - <a href="https://homestuck.bandcamp.com/">Homestuck's Bandcamp</a>, the official host of Homestuck's music: I got almost all the official album listings and basic track info from here.
-    - GiovanH's <a href="https://my.pcloud.com/publink/show?code=kZdJQ8kZNyIwh0Hn1ime6Ty7L2J87BE3E2ak">complete track art archive</a>: track art! A million thanks for putting this together and sharing this with me. (Prior to this, I used the <a href="https://web.archive.org/web/20190720035022/https://homestuck.bandcamp.com/music">Web Archive</a> to gather track art.)
-    - <a href="https://homestuck.net/music/references.html">NSND</a>: leitmotifs! Thanks to this site in combination with credits on the bandcamp and artists' own commentary, this wiki is a rather comprehensive resource for leitmotifs and other track references.
-    - <a href="https://www.bgreco.net/hsflash.html">bgreco.net (HQ Audio Flashes)</a>: thumbnail captures for the individual Flash animations! There were a couple captures missing that I took myself, but most Flash thumbnails are from here.</a>
-    - The <a href="https://homestuck-and-mspa-music.fandom.com/wiki/Homestuck_and_MSPA_Music_Wiki">Homestuck and MSPA Music Wiki</a> on Fandom: the inspiration for this wiki! I've wanted to make a more complete and explorable wiki ever since seeing it. The Fandom wiki has also been a very handy reference in putting this together, so much thanks to everyone who's worked on it!
-    - <a href="https://www.homestuck.com/">homestuck.com</a>: Besides being the home of the comic this whole site is based around, the main wallpaper for the site is pulled from <a href="https://www.homestuck.com/info-more">More from Homestuck</a>.
-    - <a href="https://carrd.co/">carrd.co</a>: I stole your icons.svg file. It is mine now. :tobyfox_dog_sunglasses:
-    - All organizers and contributors of the <a href="https://sollay-b.tumblr.com/post/188094230423/hello-a-couple-of-years-ago-allyssinian">Homestuck Vol. 5 Anthology</a> - community-made track art for [[album:homestuck-vol-5]]! All of this art is <i>excellent</i>. Each track credits its respective cover artist.
-    - Likewise for the <a href="https://hsfanmusic.skaia.net/post/619761136023257089/unofficialmspafans-we-are-proud-to-announce-the">Beyond Canon Track Art Anthology</a> as well as <a href="https://alterniaart.tumblr.com/">Alternia/Bound</a>!
-    - All comments on the site: I appreciate all feedback a lot! People have shared a ton of ideas and suggestions with me, and I <i>cannot</i> emphasize enough how motivating it is to share a project with like-minded folx interested in making it better with you.
-    <i>Feature &amp; Contribution Acknowledgements</i>
-    - <b>Thank you,</b> GiovanH, for linking me to a resource for higher quality cover art, and bringing to my attention the fact that clicking a cover art on Bandcamp to zoom in will often reveal a higher quality image.
-    - cosmogonicalAuthor, for a variety of feature requests and comments! In particular: improving way the track list on author pages is sorted; expanding the introduction; expanding the introduction message to the website; and linking bonus art for Homestuck Vol. 5 - plus a few other good suggestions I haven't gotten to yet. Thanks!
-    - Monckat, for suggesting the album Strife 2 before I'd begun adding fandom-created albums and unofficial releases to this wiki, and for working with an emailer to reupload the original cover art for [[track:the-thirteenth-hour]].
-    - Kidpen, for suggesting the "Flashes that feature this track" feature.
-    - an emailer, for suggesting the "Random track" feature.
-    - foreverFlumoxed, for pointing out that [[flash:338]] contains reference to [[JOHN DO THE WINDY THING]] (this reminded me to add all the unreleased Flash tracks to the Unreleased Tracks album!), for recommending the restructure to [[album:unreleased-tracks]], and for going to the massive effort of checking every track page and pointing out a bunch of missing cover arts and title typos!
-    - Makin, for various initial help in data collection (especially commentary) and lifting the site off the ground by pinning it to the top of the /r/homestuck subreddit for a while, and for linking me the independent release of <a href="https://jamesdever.bandcamp.com/album/sburb">Sburb</a>.
-    - an emailer, for sending a crop of the YT thumbnail art for [[After the Sun]] (plus the SoundCloud link for that track), for reporting the "Random" buttons being broken, and for linking a bunch of resources and various official uploads of tracks and albums.
-    - Niklink, for contributing immensely to the existing lyrics on the wiki and transcribing plenty of new ones that had been totally missed before, as well as for help with archiving the early official album releases ([[album:homestuck-vol-1]] through [[album:homestuck-vol-4]]), and suggesting and contributing to the various album wallpapers across the site.
-    - nuclear333, for a variety of valuable feedback and discussion, as well as for spearheading projects like the <a href="https://twitter.com/nueclear333/status/1336407226492178432">unofficial Pesterquest OST album &amp; metadata</a>.
-    - Bambosh, for creating <a href="https://bambosh.github.io/unofficial-homestuck-collection/">The Unofficial Homestuck Collection</a> and integrating data from HSMusic so seamlessly into it, and for sharing a number of handy data fixes and comments.
-    - Nameless Rumia for providing an initial transcription of the [[track:audio-commentary-featuring-robert-j-lake-nick-smalley-luke-gfd-benjamins-and-erik-jit-scheele|40+ MINUTE LONG Jailbreak audio commentary]].
-    - Thanks for pointing out typos, errors in reference lists, and out of date details: cookiefonster, foreverFlummoxed, an emailer, Bambosh, Niklink, Leo, Cello, and Sgeo.
-    <i>Supporter &amp; Patron Thank-yous</i>
-    <b>Thank you</b> to all present and past [[static:donate|supporters]] of the wiki, including:
-    - Nights, enchantingHunter, leo homestuck, and Gradis.
----
-Name: Feedback &amp; Suggestions
-Directory: feedback
-Content: |-
-    <strong>Feature requests?<br>Noticed any errors?<br>Itching to see that one album you love on the wiki?</strong>
-    Please let us know! We appreciate feedback a lot, and always want to make this site better.
-    There are five main channels you can reach the dev through:
-    - [[static:discord|HSMusic Community Discord Server]] - The official Discord, and a friendly place to drop feedback or discuss the wiki. (We also share sneak peeks of the coming updates here frequently!)
-    - <a href="https://forum.homestuck.xyz/viewtopic.php?f=7&t=151">HomestuckXYZ</a> - A public forum thread for the wiki.
-    - <a href="https://twitter.com/sapphicGnostic">Twitter</a> - DMs for discussion or feedback are open! (It might go a while unnoticed, though - the site only indicates message requests when it's manually checked, and we're pretty terrible at remembering to do that!)
-    - <a href="https://types.pl/@quasar">Mastodon</a> - Same as birdsite but a moderately less terrible platform :)
-    - Email - it's <s><code>towerofnix at gmail dot beans</code></s> <b>now been revised</b> to <code>qznebula at protonmail dot com</code>! (We'll still get messages at the old address, though.) Old-fashioned, but personally our favorite besides the Discord, and certainly practical if you're sending a longer-form message.
-    Thanks so much for sharing your feedback!
----
 Name: Changelog
 Directory: changelog
 Style: |-
@@ -1266,29 +1215,3 @@ Content: |-
     - credits are all in one numbered list; most are just the name of the track contributed to and the album it's from
     - for tracks where an artist made a specific contribution, that's mentioned too, e.g. "Sburban Countdown (arrangement)"
     - if a musician's contribution is simply a track which was referenced, the line for that contribution is slightly dim (it still contributes to the counter)
----
-Name: Donate
-Directory: donate
-Content: |-
-    Donations for the wiki are now closed. Thank you to everyone who donated over the course of wiki development, including:
-    - Nights
-    - enchantingHunter
-    - leo homestuck
-    - Gradis
-Show in Navigation Bar: false
----
-Name: HSMusic Community Discord Server
-Directory: discord
-Short Name: Discord
-Content: |-
-    We have a public Discord server - <a href="https://discord.com/invite/6Cyt9TY">you're welcomed to join!</a>
-    We mostly discuss work-in-progress site updates here, sharing feedback and suggestions before (and after!) releases go online.
-    There are a few rules you'll have to read and accept before being let in, and we take moderation seriously - but the server is a pretty chill space in general! The rules are just there to ensure it <i>can</i> be safe and relaxed for everyone.
-    (Discord not your style? [[static:feedback|Check our other links!]])
----
-Name: JS Disabled
-Directory: js-disabled
-Content: |-
-    Sorry, that link won't work unless you're running a web browser that supports relatively modern JavaScript.
-    Please press the back button to get where you were, or [[home:-|head back to the index]].
-Show in Navigation Bar: false
diff --git a/static-page/discord.yaml b/static-page/discord.yaml
new file mode 100644
index 0000000..405d74b
--- /dev/null
+++ b/static-page/discord.yaml
@@ -0,0 +1,9 @@
+Name: HSMusic Community Discord Server
+Directory: discord
+Short Name: Discord
+Content: |-
+    HSMusic Wiki has a public Discord server - <a href="https://discord.com/invite/6Cyt9TY">you're welcomed to join!</a>
+    We discuss work-in-progress site updates here, sharing feedback and suggestions before (and after!) releases go online. Active discussion of the <a href="/preview-en/">preview website</a> takes place in the Discord, which also serves as the hub for all kinds of active collaboration on the wiki: localization improvements, bigger data and album additions, revising older data, and so on!
+    Plus, most everyone here are avid listeners of Homestuck music and beyond, and we have a dedicated #music-discussion channel for discussing favorites and anything music-related. You aren't obligated to bring anything to the wiki to join; the Discord is also a chill, friendly community to just hang out in!
+    There are a few rules you'll have to read and accept before passing beyond the lobby, and we take moderation seriously - but the server is a relaxed space in general! The rules are just there to ensure the community remains safe, relaxed, and welcoming for people of all sorts and persuasions.
+    (Discord not your style? [[static:feedback|Check our other links!]])
diff --git a/static-page/donate.yaml b/static-page/donate.yaml
new file mode 100644
index 0000000..ebdc74c
--- /dev/null
+++ b/static-page/donate.yaml
@@ -0,0 +1,9 @@
+Name: Donate
+Directory: donate
+Show in Navigation Bar: false
+Content: |-
+    For a few months during 2021, we welcomed donations to help support wiki development. Donations are now closed, but we remain in gratitude to everyone who gave, including:
+    - Nights
+    - enchantingHunter
+    - leo homestuck
+    - Gradis
diff --git a/static-page/feedback.yaml b/static-page/feedback.yaml
new file mode 100644
index 0000000..00168f3
--- /dev/null
+++ b/static-page/feedback.yaml
@@ -0,0 +1,13 @@
+Name: Feedback &amp; Suggestions
+Directory: feedback
+Content: |-
+    <strong>Feature requests?<br>Noticed a data error?<br>Itching to see that one album you love on the wiki?</strong>
+    Please let us know! We appreciate feedback a lot, and always want to bring improvements and additions to the wiki.
+    There are two main channels you can reach the folk working on the wiki through:
+    - [[static:discord|HSMusic Community Discord Server]] - The official Discord, and a friendly place to drop feedback or discuss the wiki. (We also share sneak peeks of the coming updates here frequently!)
+    - Email - it's <code>qznebula at protonmail dot com</code>! A tad less new-fashioned, but certainly practical if you're sending a longer-form message or aren't interested in showing in a community space.
+    Thanks so much for sharing your feedback!
+    <hr>
+    <b>Crediting &amp; privacy notice:</b>
+    We always want to give credits for contributions, but we strongly value privacy and anonymity, too. When you send feedback, either through the public Discord or email, we'll make sure to ask if you are okay with sharing your name in the [[static:changelog|public update changelog]], and if so, by what name you'd like to be credited.
+    Additionally, when sending via email, we will generally share the content of your email in the Discord (so the folk who are responsible for actually bringing your feedback to the website will see it!), with personal details (name, email address) stripped/anonymized.
diff --git a/static-page/js-disabled.yaml b/static-page/js-disabled.yaml
new file mode 100644
index 0000000..541fce2
--- /dev/null
+++ b/static-page/js-disabled.yaml
@@ -0,0 +1,6 @@
+Name: JS Disabled
+Directory: js-disabled
+Content: |-
+    Sorry, that link won't work unless you're running a web browser that supports relatively modern JavaScript.
+    Please press the back button to get where you were, or [[home:-|head back to the index]].
+Show in Navigation Bar: false
diff --git a/wiki-info.yaml b/wiki-info.yaml
index c3e5be4..e2ab4c2 100644
--- a/wiki-info.yaml
+++ b/wiki-info.yaml
@@ -16,6 +16,4 @@ Divide Track Lists By Groups:
 - group:beyond
 - group:additional-tracks
 Footer Content: >-
-    [[static:about|HSMusic is an unofficial fan project.]] Its creation and development
-    was made possible through the [[static:donate|support]] and [[static:feedback|feedback]]
-    of our wonderful and generous community. Thank you!
+    [[static:about|HSMusic is an unofficial fan project.]] Its creation and development are made possible through the [[static:discord|collaboration]] and [[static:feedback|feedback]] of our awesome and talented community. Thank you!