More improvements to licenses

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "badmanners.xyz",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "badmanners.xyz",
-      "version": "2.1.8",
+      "version": "2.1.9",
       "hasInstallScript": true,
       "dependencies": {
         "@astrojs/check": "^0.9.2",

package.json

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

public/licenses.toml

@@ -3,6 +3,7 @@
 [copyright]
 title = "badmanners.xyz"
 description = "Bad Manners's personal website."
+type = "website"
 date = "2023-2024"
 author = "Bad Manners <me@badmanners.xyz>"
 source = "https://git.badmanners.xyz/badmanners/badmanners.xyz"
@@ -10,22 +11,31 @@ license = { name = "MIT", url = "https://opensource.org/license/mit" }
 notes = "All rights reserved."
 
 [[copyright.additional]]
+type = "logo"
 notes = "The briefcase logo is copyrighted and trademarked by me. All rights reserved."
 
 [[copyright.additional]]
-notes = "The character Sam Brendan is copyrighted and trademarked by me. All rights reserved."
+title = "Sam Brendan"
+type = "character"
+notes = "The character/fursona Sam Brendan is copyrighted and trademarked by me. All rights reserved."
 
 [[attributions]]
 description = "Reference sheet of Sam Brendan, a mimic x maned wolf hybrid."
 type = "artwork"
 author = { name = "Rimmi", url = "https://linktr.ee/Rimmi1357" }
-notes = "Distributed under non-commercial use."
+source = "https://www.furaffinity.net/view/51098572/"
+license = "Distributed under non-commercial use."
 
 [[attributions]]
 description = "A set of ten stickers featuring my fursona, Sam Brendan."
 type = "artwork"
-author = { name = "OliveCow", url = "https://olivecow.carrd.co" }
+author = { name = "OliveCow", url = "https://olivecowcommissions.carrd.co" }
-note = "Distributed under non-commercial use."
+source = [
+  "https://www.furaffinity.net/view/51485469/",
+  "https://www.deviantart.com/olivecow/art/CM-Bad-Manners-954792435",
+  "https://x.com/Olive_Cow/status/1639236367971651586",
+]
+license = "Distributed under non-commercial use."
 
 [[attributions]]
 title = "Jost*"
@@ -62,12 +72,14 @@ items = [
   "X",
   "YouTube",
 ]
-notes = "All third-party copyrights and trademarks belong to their respective owners."
+notes = """All third-party copyrights and trademarks belong to their respective owners, \
+and I'm not affiliated with any of them."""
 
 [[attributions]]
 description = "Edited icons for other websites."
 type = "icons"
 author = "Bad Manners <me@badmanners.xyz>"
+source = "https://git.badmanners.xyz/badmanners/badmanners.xyz/src/branch/main/src/components/icons/brands"
 license = { name = "CC0 1.0 Universal", url = "https://creativecommons.org/publicdomain/zero/1.0/" }
 items = [
   "Cohost",
@@ -80,8 +92,7 @@ items = [
   "SoFurry",
   "SubscribeStar",
 ]
-notes = """
+notes = """Original icons edited for personal use and released under a permissive license.
-Original icons edited for personal use and released under a permissive license.
 All third-party copyrights and trademarks belong to their respective owners, \
 and I'm not affiliated with any of them."""
 

src/pages/[...config].ts

@@ -12,12 +12,12 @@ RedirectMatch 301 ^/@/carrd\b https://badmanners.carrd.co
 RedirectMatch 301 ^/@/code[_-]?berg\b https://codeberg.org/BadManners
 RedirectMatch 301 ^/@/co[_-]?host\b https://cohost.org/BadManners
 RedirectMatch 301 ^/@/discord\b /#discord
-RedirectMatch 301 ^/@/e-?mail(address)?\b /#e-mail
+RedirectMatch 301 ^/@/e[_-]?mail\b /#e-mail
 RedirectMatch 301 ^/@/(fur[_-]?affinity|fa)\b https://www.furaffinity.net/user/badmanners
 RedirectMatch 301 ^/@/(gallery|stor(y|ies)|games?)\b https://gallery.badmanners.xyz
 RedirectMatch 301 ^/@/(git[_-]?hub|gh)\b https://github.com/BadMannersXYZ
 RedirectMatch 301 ^/@/git[_-]?lab\b https://gitlab.com/Bad_Manners
-RedirectMatch 301 ^/@/(google|g-?mail(address)?)\b /#gmail
+RedirectMatch 301 ^/@/(google|g[_-]?mail)\b /#gmail
 RedirectMatch 301 ^/@/gum[_-]?road\b https://badmanners.gumroad.com
 RedirectMatch 301 ^/@/(ink[_-]?bunny|ib)\b https://inkbunny.net/BadManners
 RedirectMatch 301 ^/@/itaku\b https://itaku.ee/profile/badmanners
@@ -34,7 +34,7 @@ RedirectMatch 301 ^/@/redd\.?it\b https://www.reddit.com/user/BadManners_
 RedirectMatch 301 ^/@/signal\b https://signal.me/#eu/ytt_rk0fFmAB2JAW-x2PbUiJyc_H3kYmfL_Pq4QNh5QIDsiFtjdFHaqFRs1D36tB
 RedirectMatch 301 ^/@/(so[_-]?furry|sf)\b https://bad-manners.sofurry.com
 RedirectMatch 301 ^/@/ssh\b /ssh.pub
-RedirectMatch 301 ^/@/steam([_-]?(community|powered))?\b https://steamcommunity.com/id/badmanners_
+RedirectMatch 301 ^/@/steam(community|powered)?\b https://steamcommunity.com/id/badmanners_
 RedirectMatch 301 ^/@/subscribe[_-]?star\b https://subscribestar.adult/bad-manners
 RedirectMatch 301 ^/@/(telegram|t\.me)\b https://t.me/bad_manners
 RedirectMatch 301 ^/@/tumblr\b https://www.tumblr.com/badmannersxyz

src/pages/about.astro

@@ -50,7 +50,7 @@ import { ImageSamStickerJuicebox } from "../assets/images";
           A sticker of Sam by
           <a
             class="h-card u-url text-link transition-colors motion-reduce:transition-none"
-            href="https://olivecow.carrd.co"
+            href="https://olivecowcommissions.carrd.co"
             rel="nofollow"
             target="_blank"
           >

src/pages/sam_brendan.astro

@@ -93,7 +93,7 @@ import { ImageSamAllStickers, ImageSamRefsheet } from "../assets/images";
           A set of stickers featuring Sam Brendan, by
           <a
             class="h-card u-url text-link transition-colors motion-reduce:transition-none"
-            href="https://olivecow.carrd.co"
+            href="https://olivecowcommissions.carrd.co"
             rel="nofollow"
             target="_blank"
           >