Prepare URLs for the VisJam2023 feed

.gitignore

@@ -16,7 +16,6 @@ local/backups
 /tmp
 *.exe
 .DS_Store
-__debug_bin*
 
 # vim session saves
 Session.vim

README.md

@@ -10,12 +10,10 @@ We want the website to be a great example of Handmade software on the web. We en
 
 You will need the following software installed:
 
-- Go 1.18 or 1.19: https://go.dev/
+- Go 1.18 or higher: https://go.dev/
 
     You can download Go directly from the website, or install it through major package managers. If you already have Go installed, but are unsure of the version, you can check by running `go version`.
 
-    **PLEASE NOTE:** Go 1.20 currently does not work due to a bug in a third-party library. See [this issue](https://git.handmade.network/hmn/hmn/issues/59#issuecomment-1335).
-
 - Postgres: https://www.postgresql.org/
 
     Any Postgres installation should work fine, although less common distributions may not work as nicely with our scripts out of the box. On Mac, [Postgres.app](https://postgresapp.com/) is recommended.

adminmailer/config.go.example

@@ -4,7 +4,6 @@ const RecvAddress = "admin@example.com"
 const RecvName = "Admin"
 const FromName = "From Name"
 const FromAddress = "from@address.com"
-const ServerUsername = "username"
-const ServerPassword = "password"
+const FromAddressPassword = "password"
 const ServerAddress = "server.address"
 const ServerPort = 587

adminmailer/main.go

@@ -46,7 +46,7 @@ func sendMail(toAddress, toName, subject, contentHtml string) error {
 	)
 	return smtp.SendMail(
 		fmt.Sprintf("%s:%d", ServerAddress, ServerPort),
-		smtp.PlainAuth("", ServerUsername, ServerPassword, ServerAddress),
+		smtp.PlainAuth("", FromAddress, FromAddressPassword, ServerAddress),
 		FromAddress,
 		[]string{toAddress},
 		contents,

fishbowl-tools/steps.md

@@ -1,4 +1,4 @@
-- [ ]  Export with [DiscordChatExporter](https://github.com/Tyrrrz/DiscordChatExporter) CLI 2.39.1
+- [ ]  Export with [DiscordChatExporter](https://github.com/Tyrrrz/DiscordChatExporter) CLI 2.34
     
     ```
     DiscordChatExporter.Cli.exe export -c [thread-id] -t [token] -o [fishbowl].html --media
@@ -49,7 +49,7 @@
     go run twemoji.go [fishbowl]-dragged.html files [fishbowl]-twemojied.html
     ```
     
-- [ ]  Fix timestamps, validate they look correct
+- [ ]  Fix timestamps
     
     ```
     go run timestamps.go [fishbowl]-twemojied.html [fishbowl]-timestamped.html
@@ -59,7 +59,7 @@
 - [ ]  Create fishbowl folder under `hmn/src/templates/src/fishbowls/`
 - [ ]  Copy timestamped html and files, rename html
 - [ ]  Remove everything from html but chatlog
-- [ ]  Remove js, css and ggsans from files
+- [ ]  Remove js, css and whitney from files
 - [ ]  Add content path to `fishbowl.go`
 - [ ]  Test locally
 - [ ]  Submit a pull request

fishbowl-tools/timestamps.go

@@ -4,13 +4,11 @@ import (
 	"fmt"
 	"os"
 	"regexp"
-	"strconv"
-	"time"
 )
 
 func main() {
 	if len(os.Args) != 3 {
-		fmt.Println("Usage: go run timestamps.go <fishbowl>.html <fishbowl>-timestamped.html")
+		fmt.Println("Usage: go run timestamps.go [fishbowl].html [fishbowl]-timestamped.html")
 		os.Exit(1)
 	}
 
@@ -24,19 +22,17 @@ func main() {
 
 	html := string(htmlBytes)
 
-	regex := regexp.MustCompile(
-		`(<span class="?chatlog__timestamp"?><a href=[^>]+>)(\d+)/(\d+)/(\d+)( [^<]+</a></span>)`,
+	regex, err := regexp.Compile(
+		"(<span class=\"chatlog__timestamp\">)(\\d+)-([A-Za-z]+)-(\\d+)( [^<]+</span>)",
 	)
+	if err != nil {
+		panic(err)
+	}
 
-	htmlOut := regex.ReplaceAllStringFunc(html, func(s string) string {
-		match := regex.FindStringSubmatch(s)
-		month, err := strconv.ParseInt(match[2], 10, 64)
-		if err != nil {
-			panic(err)
-		}
-		monthStr := time.Month(month).String()
-		return fmt.Sprintf("%s%s %s, %s%s", match[1], monthStr, match[3], match[4], match[5])
-	})
+	htmlOut := regex.ReplaceAllString(
+		html,
+		"$1$3 $2, 20$4$5",
+	)
 
 	err = os.WriteFile(htmlOutPath, []byte(htmlOut), 0666)
 	if err != nil {

go.mod

@@ -11,7 +11,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.3.3
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.13.0
 	github.com/aws/smithy-go v1.7.0
-	github.com/emersion/go-ical v0.0.0-20220601085725-0864dccc089f
 	github.com/frustra/bbcode v0.0.0-20201127003707-6ef347fbe1c8
 	github.com/go-stack/stack v1.8.0
 	github.com/google/uuid v1.2.0
@@ -48,8 +47,14 @@ require (
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.14.0 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/jackc/pgx/v4 v4.18.1 // indirect
 	github.com/jackc/puddle/v2 v2.1.2 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
@@ -57,7 +62,6 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/teambition/rrule-go v1.7.2 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	golang.org/x/net v0.6.0 // indirect
 	golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 // indirect

go.sum

@@ -15,12 +15,15 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/HandmadeNetwork/bbcode v0.0.0-20210623031351-ec0e2e2e39d9 h1:5WhEr56CD1uWDPcDIIa+UtNPPlJCoNJ3u38Rk+4XIks=
 github.com/HandmadeNetwork/bbcode v0.0.0-20210623031351-ec0e2e2e39d9/go.mod h1:vMiNHD8absjmnO60Do5KCaJBwdbaiI/AzhMmSipMme4=
+github.com/HandmadeNetwork/goldmark v1.4.1-0.20210707024600-f7e596e26b5e h1:z0GlF2OMmy852mrcMVpjZIzEHYCbUweS8RaWRCPfL1g=
+github.com/HandmadeNetwork/goldmark v1.4.1-0.20210707024600-f7e596e26b5e/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/HandmadeNetwork/golorem v0.0.0-20220507185207-414965a3a817 h1:cBqVP/sLiK7DPay7Aac1PRUwu3fCVyL5Wc+xLXzqwkE=
 github.com/HandmadeNetwork/golorem v0.0.0-20220507185207-414965a3a817/go.mod h1:doKbGBIdiM1nkEfvAeP5hvUmERah9H6StTVfCverqdE=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60=
 github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
@@ -70,13 +73,16 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ=
 github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -88,18 +94,19 @@ github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55k
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/emersion/go-ical v0.0.0-20220601085725-0864dccc089f h1:feGUUxxvOtWVOhTko8Cbmp33a+tU0IMZxMEmnkoAISQ=
-github.com/emersion/go-ical v0.0.0-20220601085725-0864dccc089f/go.mod h1:2MKFUgfNMULRxqZkadG1Vh44we3y5gJAtTBlVsx1BKQ=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -157,14 +164,60 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
+github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
+github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
+github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
+github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
+github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
+github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
+github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
+github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
+github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q=
+github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
+github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
+github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
+github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
+github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c=
+github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
+github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0=
+github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
 github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
+github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
+github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
+github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
+github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=
+github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae h1:s/r/bBI1EUCZvGtoJ/Ow6WPUYe08V9VpQY3fv6eq99s=
 github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae/go.mod h1:CRUuPsmIajLt3dZIlJ5+O8IDSib6y8yrst8DkCthTa4=
+github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
+github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
+github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
+github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
+github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=
+github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE=
 github.com/jackc/pgx/v5 v5.2.0 h1:NdPpngX0Y6z6XDFKqmFQaE+bCtkqzvQIOt1wvBlAqs8=
 github.com/jackc/pgx/v5 v5.2.0/go.mod h1:Ptn7zmohNsWEsdxRawMzk3gaKma2obW+NWTnKa0S4nk=
+github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle/v2 v2.1.2 h1:0f7vaaXINONKTsxYDn4otOAiJanX/BMeAtY//BXqzlg=
 github.com/jackc/puddle/v2 v2.1.2/go.mod h1:2lpufsF5mRHO6SuZkm0fNYxM6SWHfvyFj62KwNzgels=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
@@ -179,20 +232,29 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
@@ -237,16 +299,24 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
+github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
 github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -262,13 +332,17 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -277,8 +351,6 @@ github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300 h1:XQdibLKagjdevRB6vA
 github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300/go.mod h1:FNa/dfN95vAYCNFrIKRrlRo+MBLbwmR9Asa5f2ljmBI=
 github.com/teacat/noire v1.1.0 h1:5IgJ1H8jodiSSYnrVadV2JjbAnEgCCjYUQxSUuaQ7Sg=
 github.com/teacat/noire v1.1.0/go.mod h1:cetGlnqr+9yKJcFgRgYXOWJY66XIrrjUsGBwNlNNtAk=
-github.com/teambition/rrule-go v1.7.2 h1:goEajFWYydfCgavn2m/3w5U+1b3PGqPUHx/fFSVfTy0=
-github.com/teambition/rrule-go v1.7.2/go.mod h1:mBJ1Ht5uboJ6jexKdNUJg2NcwP8uUMNvStWXlJD3MvU=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/wellington/go-libsass v0.9.2 h1:6Ims04UDdBs6/CGSVK5JC8FNikR5ssrsMMKE/uaO5Q8=
 github.com/wellington/go-libsass v0.9.2/go.mod h1:mxgxgam0N0E+NAUMHLcu20Ccfc3mVpDkyrLDayqfiTs=
@@ -288,19 +360,38 @@ github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark-highlighting v0.0.0-20210516132338-9216f9c5aa01 h1:0SJnXjE4jDClMW6grE0xpNhwpqbPwkBTn8zpVw5C0SI=
 github.com/yuin/goldmark-highlighting v0.0.0-20210516132338-9216f9c5aa01/go.mod h1:TwKQPa5XkCCRC2GRZ5wtfNUTQ2+9/i19mGRijFeJ4BE=
+github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY=
+golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -323,6 +414,8 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -337,6 +430,11 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -348,6 +446,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc=
 golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -358,24 +457,44 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
+golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -389,15 +508,25 @@ golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -427,10 +556,12 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

local/download_database.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-
-import boto3
-
-# You must already have configured your "AWS" (DigitalOcean) credentials via the AWS CLI.
-
-s3 = boto3.resource("s3")
-bucket = s3.Bucket("hmn-backup")
-for obj in bucket.objects.filter(Prefix="db"):
-    print(obj.key)
-
-print()
-print("Above is a list of all the available database backups.")
-print("Enter the name of the one you would like to download (e.g. \"hmn_pg_dump_live_2023-09-24\"):")
-filename = input()
-
-s3 = boto3.client("s3")
-s3.download_file("hmn-backup", f"db/{filename}", f"local/backups/{filename}")
-
-print(f"Downloaded {filename} to local/backups.")

local/download_database.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -euo pipefail
+
+s3cmd ls s3://hmn-backup/db/
+
+echo ""
+echo "Above is a list of all the available database backups."
+echo "Enter the name of the one you would like to download (e.g. \"hmn_pg_dump_live_2021-09-01\"):"
+read filename
+
+s3cmd get --force s3://hmn-backup/db/$filename ./local/backups/$filename
+
+echo ""
+echo "Downloaded $filename to local/backups."

local/requirements.txt

@@ -1 +0,0 @@
-boto3

public/discord-login.svg

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 256 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(0.402516,0,0,0.410256,60.3774,109.538)">
-        <rect x="-150" y="-267" width="636" height="117" style="fill:rgb(88,101,242);"/>
-    </g>
-    <g transform="matrix(0.266745,0,0,0.266745,60.1574,11.1482)">
-        <g id="图层_2">
-            <g id="Discord_Logos">
-                <g id="Discord_Logo_-_Large_-_White">
-                    <path d="M170.85,20.2L198.15,20.2C204.73,20.2 210.297,21.227 214.85,23.28C219.042,25.042 222.602,28.034 225.06,31.86C227.361,35.639 228.54,39.996 228.46,44.42C228.511,48.864 227.285,53.231 224.93,57C222.303,60.982 218.545,64.088 214.14,65.92C209.313,68.12 203.33,69.217 196.19,69.21L170.85,69.21L170.85,20.2ZM195.91,56.74C200.343,56.74 203.75,55.633 206.13,53.42C208.57,51.054 209.873,47.745 209.7,44.35C209.85,41.202 208.699,38.127 206.52,35.85C204.387,33.73 201.177,32.667 196.89,32.66L188.35,32.66L188.35,56.74L195.91,56.74Z" style="fill:white;fill-rule:nonzero;"/>
-                    <path d="M269.34,69.13C265.738,68.228 262.293,66.788 259.12,64.86L259.12,53.24C261.89,55.255 265.009,56.74 268.32,57.62C271.942,58.725 275.704,59.301 279.49,59.33C280.797,59.4 282.102,59.174 283.31,58.67C284.17,58.23 284.6,57.67 284.6,57.09C284.619,56.435 284.365,55.801 283.9,55.34C283.101,54.726 282.164,54.317 281.17,54.15L272.77,52.26C267.957,51.14 264.54,49.59 262.52,47.61C260.471,45.543 259.381,42.707 259.52,39.8C259.486,37.194 260.437,34.668 262.18,32.73C264.248,30.543 266.855,28.939 269.74,28.08C273.452,26.913 277.329,26.356 281.22,26.43C284.852,26.396 288.474,26.819 292,27.69C294.848,28.365 297.583,29.449 300.12,30.91L300.12,41.91C297.741,40.53 295.184,39.483 292.52,38.8C289.634,38.026 286.658,37.636 283.67,37.64C279.283,37.64 277.09,38.387 277.09,39.88C277.075,40.559 277.47,41.183 278.09,41.46C279.289,41.97 280.544,42.332 281.83,42.54L288.83,43.8C293.377,44.6 296.767,46 299,48C301.233,50 302.353,52.927 302.36,56.78C302.432,60.898 300.308,64.758 296.79,66.9C293.103,69.373 287.84,70.607 281,70.6C277.067,70.606 273.149,70.112 269.34,69.13Z" style="fill:white;fill-rule:nonzero;"/>
-                    <path d="M318.9,67.66C315.158,65.941 312.003,63.158 309.83,59.66C307.803,56.23 306.764,52.304 306.83,48.32C306.77,44.338 307.864,40.423 309.98,37.05C312.235,33.607 315.447,30.896 319.22,29.25C323.807,27.251 328.778,26.282 333.78,26.41C340.78,26.41 346.59,27.88 351.21,30.82L351.21,43.65C349.452,42.468 347.532,41.549 345.51,40.92C343.246,40.205 340.884,39.851 338.51,39.87C334.17,39.87 330.773,40.663 328.32,42.25C326.06,43.511 324.655,45.905 324.655,48.493C324.655,51.041 326.016,53.403 328.22,54.68C330.6,56.287 334.053,57.09 338.58,57.09C340.916,57.096 343.241,56.759 345.48,56.09C347.522,55.504 349.484,54.668 351.32,53.6L351.32,66C345.91,69.154 339.731,70.754 333.47,70.62C328.451,70.757 323.467,69.744 318.9,67.66Z" style="fill:white;fill-rule:nonzero;"/>
-                    <path d="M368.64,67.66C364.856,65.932 361.645,63.155 359.39,59.66C357.265,56.238 356.161,52.278 356.21,48.25C356.142,44.27 357.248,40.356 359.39,37C361.657,33.594 364.854,30.907 368.6,29.26C377.799,25.528 388.101,25.528 397.3,29.26C401.031,30.894 404.215,33.568 406.47,36.96C408.597,40.328 409.693,44.247 409.62,48.23C409.67,52.254 408.577,56.211 406.47,59.64C404.239,63.138 401.044,65.917 397.27,67.64C388.133,71.558 377.777,71.558 368.64,67.64L368.64,67.66ZM389.91,55.24C391.657,53.436 392.584,50.989 392.47,48.48C392.592,45.994 391.662,43.568 389.91,41.8C388.01,40.058 385.483,39.159 382.91,39.31C380.339,39.175 377.818,40.072 375.91,41.8C374.164,43.571 373.239,45.996 373.36,48.48C373.247,50.987 374.169,53.433 375.91,55.24C377.8,57.004 380.328,57.925 382.91,57.79C385.494,57.94 388.028,57.017 389.91,55.24Z" style="fill:white;fill-rule:nonzero;"/>
-                    <path d="M451.69,29L451.69,44.14C449.6,42.893 447.191,42.285 444.76,42.39C441.03,42.39 438.15,43.53 436.15,45.79C434.15,48.05 433.15,51.56 433.15,56.32L433.15,69.2L416,69.2L416,28.25L432.8,28.25L432.8,41.25C433.733,36.49 435.24,32.98 437.32,30.72C439.36,28.472 442.286,27.228 445.32,27.32C447.56,27.259 449.771,27.842 451.69,29Z" style="fill:white;fill-rule:nonzero;"/>
-                    <path d="M508.67,18.8L508.67,69.2L491.52,69.2L491.52,60C490.227,63.275 487.903,66.041 484.9,67.88C481.585,69.769 477.814,70.71 474,70.6C470.411,70.684 466.878,69.698 463.85,67.77C460.918,65.865 458.581,63.172 457.11,60C455.504,56.499 454.705,52.681 454.77,48.83C454.657,44.837 455.508,40.875 457.25,37.28C458.851,33.988 461.351,31.214 464.46,29.28C467.656,27.344 471.334,26.349 475.07,26.41C483.23,26.41 488.713,29.957 491.52,37.05L491.52,18.8L508.67,18.8ZM489,55C490.766,53.261 491.722,50.857 491.63,48.38C491.705,45.976 490.747,43.652 489,42C484.971,38.719 479.139,38.719 475.11,42C473.368,43.69 472.425,46.045 472.52,48.47C472.431,50.918 473.384,53.292 475.14,55C476.995,56.725 479.47,57.63 482,57.51C484.575,57.652 487.102,56.746 489,55Z" style="fill:white;fill-rule:nonzero;"/>
-                    <path d="M107.7,8.07C99.347,4.246 90.528,1.533 81.47,0C80.23,2.216 79.109,4.496 78.11,6.83C68.461,5.376 58.649,5.376 49,6.83C48.001,4.496 46.879,2.216 45.64,-0C36.576,1.546 27.752,4.265 19.39,8.09C2.79,32.65 -1.71,56.6 0.54,80.21C10.261,87.392 21.143,92.855 32.71,96.36C35.315,92.857 37.62,89.14 39.6,85.25C35.838,83.845 32.208,82.112 28.75,80.07C29.66,79.41 30.55,78.73 31.41,78.07C51.768,87.644 75.372,87.644 95.73,78.07C96.6,78.78 97.49,79.46 98.39,80.07C94.926,82.115 91.288,83.852 87.52,85.26C89.498,89.149 91.803,92.862 94.41,96.36C105.987,92.869 116.877,87.409 126.6,80.22C129.24,52.84 122.09,29.11 107.7,8.07ZM42.45,65.69C36.18,65.69 31,60 31,53C31,46 36,40.26 42.43,40.26C48.86,40.26 54,46 53.89,53C53.78,60 48.84,65.69 42.45,65.69ZM84.69,65.69C78.41,65.69 73.25,60 73.25,53C73.25,46 78.25,40.26 84.69,40.26C91.13,40.26 96.23,46 96.12,53C96.01,60 91.08,65.69 84.69,65.69Z" style="fill:white;fill-rule:nonzero;"/>
-                    <ellipse cx="242.92" cy="24.93" rx="8.55" ry="7.68" style="fill:white;"/>
-                    <path d="M234.36,37.9C239.829,40.199 246.001,40.199 251.47,37.9L251.47,69.42L234.36,69.42L234.36,37.9Z" style="fill:white;fill-rule:nonzero;"/>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

public/fishbowl-dark.css

@@ -94,7 +94,7 @@
     text-align: center;
 }
 
-.fishbowl .chatlog__reference-symbol, .fishbowl .chatlog__reply-symbol {
+.fishbowl .chatlog__reference-symbol {
     height: 10px;
     margin: 6px 4px 4px 36px;
     border-left: 2px solid #4f545c;
@@ -122,7 +122,7 @@
     min-width: 0;
 }
 
-.fishbowl .chatlog__reference, .fishbowl .chatlog__reply {
+.fishbowl .chatlog__reference {
     display: flex;
     margin-bottom: 0.15rem;
     align-items: center;
@@ -133,53 +133,53 @@
     text-overflow: ellipsis;
 }
 
-.fishbowl .chatlog__reference-avatar, .fishbowl .chatlog__reply-avatar {
+.fishbowl .chatlog__reference-avatar {
     width: 16px;
     height: 16px;
     margin-right: 0.25rem;
     border-radius: 50%;
 }
 
-.fishbowl .chatlog__reference-author, .fishbowl .chatlog__reply-author {
+.fishbowl .chatlog__reference-author {
     margin-right: 0.3rem;
     font-weight: 600;
 }
 
-.fishbowl .chatlog__reference-content, .fishbowl .chatlog__reply-content {
+.fishbowl .chatlog__reference-content {
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
-.fishbowl .chatlog__reference-link, .fishbowl .chatlog__reply-link {
+.fishbowl .chatlog__reference-link {
     cursor: pointer;
 }
 
-.fishbowl .chatlog__reference-link *, .fishbowl .chatlog__reply-link * {
+.fishbowl .chatlog__reference-link * {
     display: inline;
     pointer-events: none;
 }
 
-.fishbowl .chatlog__reference-link .hljs, .fishbowl .chatlog__reply-link .hljs {
+.fishbowl .chatlog__reference-link .hljs {
     display: inline;
 }
 
-.fishbowl .chatlog__reference-link .chatlog__markdown-quote, .fishbowl .chatlog__reply-link .chatlog__markdown-quote {
+.fishbowl .chatlog__reference-link .chatlog__markdown-quote {
     display: inline
 }
 
-.fishbowl .chatlog__reference-link .chatlog__markdown-pre, .fishbowl .chatlog__reply-link .chatlog__markdown-pre {
+.fishbowl .chatlog__reference-link .chatlog__markdown-pre {
     display: inline
 }
 
-.fishbowl .chatlog__reference-link:hover, .fishbowl .chatlog__reply-link:hover {
+.fishbowl .chatlog__reference-link:hover {
     color: #ffffff;
 }
 
-.fishbowl .chatlog__reference-link:hover *:not(.chatlog__markdown-spoiler), .fishbowl .chatlog__reply-link:hover *:not(.chatlog__markdown-spoiler) {
+.fishbowl .chatlog__reference-link:hover *:not(.chatlog__markdown-spoiler) {
     color: inherit;
 }
 
-.fishbowl .chatlog__reference-edited-timestamp, .fishbowl .chatlog__reply-edited-timestamp {
+.fishbowl .chatlog__reference-edited-timestamp {
     margin-left: 0.25rem;
     color: #a3a6aa;
     font-size: 0.75rem;

public/fishbowl-light.css

@@ -95,7 +95,7 @@
     text-align: center;
 }
 
-.fishbowl .chatlog__reference-symbol, .fishbowl .chatlog__reply-symbol {
+.fishbowl .chatlog__reference-symbol {
     height: 10px;
     margin: 6px 4px 4px 36px;
     border-left: 2px solid #c7ccd1;
@@ -123,7 +123,7 @@
     min-width: 0;
 }
 
-.fishbowl .chatlog__reference, .fishbowl .chatlog__reply {
+.fishbowl .chatlog__reference {
     display: flex;
     margin-bottom: 0.15rem;
     align-items: center;
@@ -134,53 +134,53 @@
     text-overflow: ellipsis;
 }
 
-.fishbowl .chatlog__reference-avatar, .fishbowl .chatlog__reply-avatar {
+.fishbowl .chatlog__reference-avatar {
     width: 16px;
     height: 16px;
     margin-right: 0.25rem;
     border-radius: 50%;
 }
 
-.fishbowl .chatlog__reference-author, .fishbowl .chatlog__reply-author {
+.fishbowl .chatlog__reference-author {
     margin-right: 0.3rem;
     font-weight: 600;
 }
 
-.fishbowl .chatlog__reference-content, .fishbowl .chatlog__reply-content {
+.fishbowl .chatlog__reference-content {
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
-.fishbowl .chatlog__reference-link, .fishbowl .chatlog__reply-link {
+.fishbowl .chatlog__reference-link {
     cursor: pointer;
 }
 
-.fishbowl .chatlog__reference-link *, .fishbowl .chatlog__reply-link * {
+.fishbowl .chatlog__reference-link * {
     display: inline;
     pointer-events: none;
 }
 
-.fishbowl .chatlog__reference-link .hljs, .fishbowl .chatlog__reply-link .hljs {
+.fishbowl .chatlog__reference-link .hljs {
     display: inline;
 }
 
-.fishbowl .chatlog__reference-link .chatlog__markdown-quote, .fishbowl .chatlog__reply-link .chatlog__markdown-quote {
+.fishbowl .chatlog__reference-link .chatlog__markdown-quote {
     display: inline
 }
 
-.fishbowl .chatlog__reference-link .chatlog__markdown-pre, .fishbowl .chatlog__reply-link .chatlog__markdown-pre {
+.fishbowl .chatlog__reference-link .chatlog__markdown-pre {
     display: inline
 }
 
-.fishbowl .chatlog__reference-link:hover, .fishbowl .chatlog__reply-link:hover {
+.fishbowl .chatlog__reference-link:hover {
     color: #2f3136;
 }
 
-.fishbowl .chatlog__reference-link:hover *:not(.chatlog__markdown-spoiler), .fishbowl .chatlog__reply-link:hover *:not(.chatlog__markdown-spoiler) {
+.fishbowl .chatlog__reference-link:hover *:not(.chatlog__markdown-spoiler) {
     color: inherit;
 }
 
-.fishbowl .chatlog__reference-edited-timestamp, .fishbowl .chatlog__reply-edited-timestamp {
+.fishbowl .chatlog__reference-edited-timestamp {
     margin-left: 0.25rem;
     color: #5e6772;
     font-size: 0.75rem;

public/js/showcase.js

@@ -52,30 +52,19 @@ function makeShowcaseItem(timelineItem) {
         break;
     case TimelineMediaTypes.VIDEO:
         addThumbnailFunc = () => {
-            let thumbEl;
-            if (timelineItem.thumbnail_url) {
-                thumbEl = document.createElement('img');
-                thumbEl.src = timelineItem.thumbnail_url;
-            } else {
-                thumbEl = document.createElement('video');
-                thumbEl.src = timelineItem.asset_url;
-                thumbEl.controls = false;
-                thumbEl.preload = 'metadata';
-            }
-            thumbEl.classList.add('h-100');
-            itemEl.thumbnail.appendChild(thumbEl);
+            const video = document.createElement('video');
+            video.src = timelineItem.asset_url; // TODO: Use image thumbnails
+            video.controls = false;
+            video.classList.add('h-100');
+            video.preload = 'metadata';
+            itemEl.thumbnail.appendChild(video);
         };
 
         createModalContentFunc = () => {
             const modalVideo = document.createElement('video');
             modalVideo.src = timelineItem.asset_url;
-            if (timelineItem.thumbnail_url) {
-                modalVideo.poster = timelineItem.thumbnail_url;
-                modalVideo.preload = 'none';
-            } else {
-                modalVideo.preload = 'metadata';
-            }
             modalVideo.controls = true;
+            modalVideo.preload = 'metadata';
             modalVideo.classList.add('mw-100', 'mh-60vh');
             return modalVideo;
         };

public/learningjam2024/books.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 236 253" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><rect id="books" x="0" y="0" width="235.74" height="252.97" style="fill:none;"/><path d="M77.61,252.704l0,-230.569l80.52,-0l-0,230.569l-80.52,0Zm59.686,-188.853l0,-20.883l-38.853,-0l0,20.883l38.853,0Zm0,128.926l0,-108.092l-38.853,-0l0,108.092l38.853,-0Zm-38.853,20.833l0,18.261l38.853,-0l0,-18.261l-38.853,0Zm-98.032,39.094l-0,-252.438l70.429,-0l-0,252.438l-70.429,0Zm49.596,-206.372l-0,-25.233l-28.763,-0l0,25.233l28.763,0Zm-0,142.369l-0,-121.536l-28.763,0l0,121.536l28.763,-0Zm-28.763,20.833l0,22.337c0,-0 28.763,-0 28.763,-0l-0,-22.337l-28.763,-0Zm143.656,43.17l-0,-252.438l70.429,-0l-0,252.438l-70.429,0Zm49.596,-206.372l-0,-25.233l-28.763,-0l0,25.233l28.763,0Zm-0,142.369l-0,-121.536l-28.763,0l0,121.536l28.763,-0Zm-28.763,20.833l0,22.337l28.763,-0l-0,-22.337l-28.763,-0Z"/></svg>

public/learningjam2024/lightbulb.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 336 233" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><rect id="lightbulb" x="0" y="0" width="335.159" height="232.656" style="fill:none;"/><path d="M197.613,202.015c0,16.576 -13.457,30.034 -30.034,30.034c-16.576,-0 -30.034,-13.458 -30.034,-30.034l60.068,-0Zm0.06,-9.97l-60.206,-0c-3.155,-16.04 -5.152,-23.793 -32.39,-57.373c-10.513,-12.96 -16.178,-29.812 -16.178,-47.773c0,-43.425 35.256,-78.68 78.68,-78.68c43.425,-0 78.68,34.8 78.68,78.224c0,17.961 -5.665,34.814 -16.177,47.774c-27.238,33.58 -29.254,41.788 -32.409,57.828Zm-16.343,-20.834c3.88,-11.276 11.569,-24.225 32.572,-50.118c7.611,-9.383 11.524,-21.647 11.524,-34.65c-0,-31.893 -25.954,-57.391 -57.847,-57.391c-31.926,0 -57.846,25.92 -57.846,57.847c-0,13.003 3.913,25.266 11.524,34.649c20.946,25.823 28.639,38.556 32.521,49.663l27.552,0Zm-160.921,-151.684c-4.694,-3.321 -5.808,-9.827 -2.488,-14.52c3.321,-4.693 9.827,-5.808 14.52,-2.488l31.239,22.101c4.694,3.321 5.808,9.827 2.488,14.52c-3.32,4.693 -9.827,5.808 -14.52,2.488l-31.239,-22.101Zm12.032,153.97c-4.693,3.32 -11.199,2.205 -14.52,-2.488c-3.32,-4.693 -2.206,-11.199 2.488,-14.52l31.239,-22.101c4.693,-3.32 11.2,-2.205 14.52,2.488c3.32,4.693 2.206,11.199 -2.488,14.52l-31.239,22.101Zm-21.856,-74.77c-5.749,-0 -10.416,-4.668 -10.416,-10.417c-0,-5.749 4.667,-10.417 10.416,-10.417l38.267,0c5.749,0 10.417,4.668 10.417,10.417c-0,5.749 -4.668,10.417 -10.417,10.417l-38.267,-0Zm292.133,-95.906c4.693,-3.32 11.199,-2.205 14.519,2.488c3.321,4.693 2.206,11.199 -2.487,14.52l-31.239,22.101c-4.694,3.32 -11.2,2.206 -14.52,-2.488c-3.321,-4.693 -2.206,-11.199 2.487,-14.52l31.24,-22.101Zm12.032,153.97c4.693,3.321 5.808,9.827 2.487,14.52c-3.32,4.694 -9.826,5.808 -14.519,2.488l-31.24,-22.101c-4.693,-3.321 -5.808,-9.827 -2.487,-14.52c3.32,-4.693 9.826,-5.808 14.52,-2.488l31.239,22.101Zm9.823,-78.595c5.75,-0 10.417,4.667 10.417,10.416c0,5.749 -4.667,10.417 -10.417,10.417l-38.266,-0c-5.75,-0 -10.417,-4.668 -10.417,-10.417c-0,-5.749 4.667,-10.416 10.417,-10.416l38.266,-0Z"/></svg>

public/learningjam2024/presentation.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 301 229" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><rect id="presentation" x="-0" y="0" width="300.716" height="228.578" style="fill:none;"/><path d="M124.979,14.95l175.159,0l0,152.429l-137.896,0c-1.49,-7.262 -3.898,-14.19 -7.097,-20.659l124.334,-0l-0,-111.11l-143.514,-0c-2.302,-7.632 -6.074,-14.628 -10.986,-20.66Zm-119.77,196.191c-2.997,-8.252 -4.631,-17.155 -4.631,-26.437c0,-42.797 34.745,-77.542 77.541,-77.542c42.796,0 77.541,34.745 77.541,77.542c0,9.282 -1.634,18.185 -4.631,26.437c-22.091,10.548 -46.816,16.455 -72.91,16.455c-26.094,0 -50.819,-5.907 -72.91,-16.455Zm15.522,-13.612c17.693,7.296 37.075,11.317 57.388,11.317c20.314,0 39.695,-4.021 57.389,-11.317c0.919,-4.129 1.402,-8.421 1.402,-12.825c0,-32.448 -26.343,-58.792 -58.791,-58.792c-32.448,0 -58.791,26.344 -58.791,58.792c0,4.404 0.484,8.696 1.403,12.825Zm57.388,-196.547c28.741,-0 52.075,23.334 52.075,52.074c-0,28.741 -23.334,52.075 -52.075,52.075c-28.74,-0 -52.074,-23.334 -52.074,-52.075c-0,-28.74 23.334,-52.074 52.074,-52.074Zm0,18.75c-18.392,-0 -33.324,14.932 -33.324,33.324c-0,18.392 14.932,33.325 33.324,33.325c18.392,-0 33.325,-14.933 33.325,-33.325c-0,-18.392 -14.933,-33.324 -33.325,-33.324Z"/></svg>

public/style.css

@@ -4602,7 +4602,7 @@ code, .code {
 .pa2, .tab, figure, header .root-item > a, header .submenu > a {
   padding: 0.5rem; }
 
-.pa3 {
+.pa3, header #login-popup {
   padding: 1rem; }
 
 .pa4 {
@@ -7346,6 +7346,12 @@ article code {
   margin-left: auto;
   margin-right: auto; }
 
+.flex-shrink-0, .edit-form .edit-form-row > :first-child {
+  flex-shrink: 0; }
+
+.flex-grow-1, .edit-form .edit-form-row > :nth-child(2) {
+  flex-grow: 1; }
+
 .flex-fair {
   flex-basis: 1px;
   flex-grow: 1;
@@ -7416,7 +7422,7 @@ article code {
   color: #ccc;
   color: var(--theme-color-dimmest); }
 
-.b--dimmest, .optionbar, blockquote, .post-content th, .post-content td {
+.b--dimmest, .optionbar, blockquote, .post-content th, .post-content td, header #login-popup {
   border-color: #bbb;
   border-color: var(--dimmest-color); }
 
@@ -7547,18 +7553,6 @@ article code {
 .g5 {
   gap: 4rem; }
 
-.grid {
-  display: grid; }
-
-.grid-1 {
-  grid-template-columns: 1fr; }
-
-.grid-2 {
-  grid-template-columns: 1fr 1fr; }
-
-.aspect-ratio--2x1 {
-  padding-bottom: 50%; }
-
 .hide-if-empty:empty {
   display: none !important; }
 
@@ -7585,25 +7579,9 @@ article code {
     column-gap: 2rem; }
   .cg5-ns {
     column-gap: 4rem; }
-  .grid-1-ns {
-    grid-template-columns: 1fr; }
-  .grid-2-ns {
-    grid-template-columns: 1fr 1fr; }
   .bg--dim-ns {
     background-color: #f0f0f0;
-    background-color: var(--dim-background); }
-  .g0-ns {
-    gap: 0; }
-  .g1-ns {
-    gap: 0.25rem; }
-  .g2-ns {
-    gap: 0.5rem; }
-  .g3-ns {
-    gap: 1rem; }
-  .g4-ns {
-    gap: 2rem; }
-  .g5-ns {
-    gap: 4rem; } }
+    background-color: var(--dim-background); } }
 
 @media screen and (min-width: 35em) and (max-width: 60em) {
   .bi-avoid-m {
@@ -7626,25 +7604,9 @@ article code {
     column-gap: 2rem; }
   .cg5-m {
     column-gap: 4rem; }
-  .grid-1-m {
-    grid-template-columns: 1fr; }
-  .grid-2-m {
-    grid-template-columns: 1fr 1fr; }
   .bg--dim-m {
     background-color: #f0f0f0;
-    background-color: var(--dim-background); }
-  .g0-m {
-    gap: 0; }
-  .g1-m {
-    gap: 0.25rem; }
-  .g2-m {
-    gap: 0.5rem; }
-  .g3-m {
-    gap: 1rem; }
-  .g4-m {
-    gap: 2rem; }
-  .g5-m {
-    gap: 4rem; } }
+    background-color: var(--dim-background); } }
 
 @media screen and (min-width: 60em) {
   .bi-avoid-l {
@@ -7667,25 +7629,9 @@ article code {
     column-gap: 2rem; }
   .cg5-l {
     column-gap: 4rem; }
-  .grid-1-l {
-    grid-template-columns: 1fr; }
-  .grid-2-l {
-    grid-template-columns: 1fr 1fr; }
   .bg--dim-l {
     background-color: #f0f0f0;
-    background-color: var(--dim-background); }
-  .g0-l {
-    gap: 0; }
-  .g1-l {
-    gap: 0.25rem; }
-  .g2-l {
-    gap: 0.5rem; }
-  .g3-l {
-    gap: 1rem; }
-  .g4-l {
-    gap: 2rem; }
-  .g5-l {
-    gap: 4rem; } }
+    background-color: var(--dim-background); } }
 
 .not-first:first-child {
   display: none; }
@@ -8987,19 +8933,25 @@ header #login-popup {
   background-color: var(--login-popup-background);
   color: black;
   color: var(--fg-font-color);
+  border-width: 1px;
+  border-style: dashed;
   visibility: hidden;
   position: absolute;
   z-index: 12;
+  margin-top: 10px;
+  right: 0px;
+  top: 20px;
+  width: 290px;
+  max-height: 0px;
   overflow: hidden;
-  right: 0;
-  top: 100%;
-  width: 100%; }
+  opacity: 0;
+  transition: all 0.2s; }
   header #login-popup.open {
+    max-height: 170px;
+    opacity: 1;
     visibility: visible; }
-  @media screen and (min-width: 35em) {
-    header #login-popup {
-      top: 2.2rem;
-      width: 17rem; } }
+  header #login-popup label {
+    padding-right: 10px; }
 
 @font-face {
   font-family: icons;

public/wheeljam2023/logo.svg

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 475 283" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g id="Handlebars" transform="matrix(1,0,0,1,-100,-167)">
-        <path d="M404,196C407.778,166.333 384.333,169 364,184" style="fill:none;stroke:white;stroke-width:9px;"/>
-    </g>
-    <g id="Seat">
-    </g>
-    <path d="M120,42L160,42C177.006,42.052 186.77,48.289 191,58" style="fill:none;stroke:white;stroke-width:9px;"/>
-    <g id="Frame" transform="matrix(1,0,0,1,-100,-167)">
-        <path d="M314,390L445,274" style="fill:none;stroke:white;stroke-width:9px;"/>
-        <path d="M500,375L404,196" style="fill:none;stroke:white;stroke-width:9px;stroke-linecap:butt;"/>
-        <path d="M266,259L437,259" style="fill:none;stroke:white;stroke-width:9px;"/>
-        <path d="M314,390L248,209" style="fill:none;stroke:white;stroke-width:9px;stroke-linecap:butt;"/>
-        <g transform="matrix(0.815396,-0.0212494,-0.0212494,0.997554,66.2531,7.62625)">
-            <path d="M143.044,371.322L314,390" style="fill:none;stroke:white;stroke-width:10.11px;"/>
-        </g>
-        <path d="M175,375L266,259" style="fill:none;stroke:white;stroke-width:9px;"/>
-    </g>
-    <g id="Wheel" transform="matrix(1,0,0,1,-100,-167)">
-        <g transform="matrix(0.980392,0,0,0.980392,-46.0784,31.3725)">
-            <path d="M302,293.019C302,282.522 293.478,274 282.981,274L168.019,274C157.522,274 149,282.522 149,293.019L149,407.981C149,418.478 157.522,427 168.019,427L282.981,427C293.478,427 302,418.478 302,407.981L302,293.019ZM292.82,293.019L292.82,407.981C292.82,413.411 288.411,417.82 282.981,417.82C282.981,417.82 168.019,417.82 168.019,417.82C162.589,417.82 158.18,413.411 158.18,407.981L158.18,293.019C158.18,287.589 162.589,283.18 168.019,283.18L282.981,283.18C288.411,283.18 292.82,287.589 292.82,293.019Z" style="fill:white;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-50,26)">
-            <path d="M237,343C237,339.689 234.311,337 231,337L219,337C215.689,337 213,339.689 213,343L213,355C213,358.311 215.689,361 219,361L231,361C234.311,361 237,358.311 237,355L237,343Z" style="fill:white;"/>
-        </g>
-    </g>
-    <g id="Wheel1" serif:id="Wheel" transform="matrix(1,0,0,1,225,-167)">
-        <g transform="matrix(0.980392,0,0,0.980392,-46.0784,31.3725)">
-            <path d="M302,293.019C302,282.522 293.478,274 282.981,274L168.019,274C157.522,274 149,282.522 149,293.019L149,407.981C149,418.478 157.522,427 168.019,427L282.981,427C293.478,427 302,418.478 302,407.981L302,293.019ZM292.82,293.019L292.82,407.981C292.82,413.411 288.411,417.82 282.981,417.82C282.981,417.82 168.019,417.82 168.019,417.82C162.589,417.82 158.18,413.411 158.18,407.981L158.18,293.019C158.18,287.589 162.589,283.18 168.019,283.18L282.981,283.18C288.411,283.18 292.82,287.589 292.82,293.019Z" style="fill:white;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-50,26)">
-            <path d="M237,343C237,339.689 234.311,337 231,337L219,337C215.689,337 213,339.689 213,343L213,355C213,358.311 215.689,361 219,361L231,361C234.311,361 237,358.311 237,355L237,343Z" style="fill:white;"/>
-        </g>
-    </g>
-</svg>

server/serversetup.sh

@@ -298,16 +298,6 @@ SCRIPT
     savecheckpoint 110
 fi
 
-# Install ffmpeg and cpulimit
-if [ $checkpoint -lt 120 ]; then    
-    apt update
-    apt install -y \
-        ffmpeg \
-        cpulimit
-
-    savecheckpoint 120
-fi
-
 cat <<HELP
 Everything has been successfully installed!
 

src/admintools/admintools.go

@@ -1,32 +1,22 @@
 package admintools
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"net"
 	"os"
-	"os/exec"
-	"path/filepath"
 	"strconv"
-	"strings"
 	"time"
 
-	"git.handmade.network/hmn/hmn/src/assets"
 	"git.handmade.network/hmn/hmn/src/auth"
-	"git.handmade.network/hmn/hmn/src/config"
 	"git.handmade.network/hmn/hmn/src/db"
 	"git.handmade.network/hmn/hmn/src/email"
-	"git.handmade.network/hmn/hmn/src/hmnurl"
 	"git.handmade.network/hmn/hmn/src/logging"
 	"git.handmade.network/hmn/hmn/src/models"
 	"git.handmade.network/hmn/hmn/src/oops"
 	"git.handmade.network/hmn/hmn/src/perf"
 	"git.handmade.network/hmn/hmn/src/templates"
-	"git.handmade.network/hmn/hmn/src/utils"
 	"git.handmade.network/hmn/hmn/src/website"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
@@ -519,103 +509,5 @@ func init() {
 	}
 	adminCommand.AddCommand(fixupSnippetAssociation)
 
-	extractImage := &cobra.Command{
-		Use:   "extractimage [source] [dest]",
-		Short: "Tests ffmpeg for extracting image from video",
-		Run: func(cmd *cobra.Command, args []string) {
-			ctx := context.Background()
-			if len(args) < 2 {
-				fmt.Printf("You must provide input and output files.\n")
-				cmd.Usage()
-				os.Exit(1)
-			}
-			inFile := args[0]
-			outFile := args[1]
-
-			inBytes, err := ioutil.ReadFile(inFile)
-			if err != nil {
-				fmt.Printf("Error while reading input: %v\n", err)
-				os.Exit(1)
-			}
-
-			fmt.Printf("%v\n", len(inBytes))
-			file, err := os.CreateTemp("", "hmnasset")
-			if err != nil {
-				fmt.Printf("%v", err)
-			}
-			defer os.Remove(file.Name())
-			_, err = file.Write(inBytes)
-			if err != nil {
-				fmt.Printf("%v", err)
-			}
-			err = file.Close()
-			if err != nil {
-				fmt.Printf("%v", err)
-			}
-
-			inputArg := fmt.Sprintf("-i %s -filter_complex [0]select=gte(n\\,1)[s0] -map [s0] -f image2 -vcodec png -vframes 1 pipe:1", file.Name())
-			ffmpegCmd := exec.CommandContext(ctx, config.Config.PreviewGeneration.FFMpegPath, strings.Split(inputArg, " ")...)
-			fmt.Printf("\n%s\n", ffmpegCmd.String())
-
-			var output bytes.Buffer
-			var errorOut bytes.Buffer
-			ffmpegCmd.Stdout = &output
-			ffmpegCmd.Stderr = &errorOut
-			err = ffmpegCmd.Run()
-			if err != nil {
-				fmt.Printf("%v", err)
-			}
-
-			if len(errorOut.Bytes()) > 0 {
-				fmt.Printf("FFMpeg error:\n%s\n", string(errorOut.Bytes()))
-			}
-
-			out, err := os.Create(outFile)
-			if err != nil {
-				fmt.Printf("Error opening output file: %v\n", err)
-				os.Exit(1)
-			}
-			_, err = out.Write(output.Bytes())
-			if err != nil {
-				fmt.Printf("Error writing output: %v\n", err)
-				os.Exit(1)
-			}
-			fmt.Printf("%v", len(output.Bytes()))
-			out.Close()
-
-			fmt.Printf("Done!\n")
-		},
-	}
-	adminCommand.AddCommand(extractImage)
-
-	uploadAsset := &cobra.Command{
-		Use:   "uploadasset <file> <content type>",
-		Short: "Upload a file to our asset CDN",
-		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) < 2 {
-				cmd.Usage()
-				os.Exit(1)
-			}
-			fname := args[0]
-			contentType := args[1]
-
-			ctx := context.Background()
-			conn := db.NewConn()
-			defer conn.Close(ctx)
-
-			assetContents := utils.Must1(io.ReadAll(utils.Must1(os.Open(fname))))
-			assetFilename := filepath.Base(fname)
-
-			fmt.Printf("Uploading %s with content type %s...\n", assetFilename, contentType)
-			asset := utils.Must1(assets.Create(ctx, conn, assets.CreateInput{
-				Content:     assetContents,
-				Filename:    assetFilename,
-				ContentType: contentType,
-			}))
-			fmt.Printf("Uploaded and accessible at %s\n", hmnurl.BuildS3Asset(asset.S3Key))
-		},
-	}
-	adminCommand.AddCommand(uploadAsset)
-
 	addProjectCommands(adminCommand)
 }

src/assets/assets.go

@@ -6,19 +6,10 @@ import (
 	"crypto/sha1"
 	"errors"
 	"fmt"
-	"image"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
 	"regexp"
-	"strings"
 
 	"git.handmade.network/hmn/hmn/src/config"
 	"git.handmade.network/hmn/hmn/src/db"
-	"git.handmade.network/hmn/hmn/src/hmnurl"
-	"git.handmade.network/hmn/hmn/src/jobs"
-	"git.handmade.network/hmn/hmn/src/logging"
 	"git.handmade.network/hmn/hmn/src/models"
 	"git.handmade.network/hmn/hmn/src/oops"
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -28,7 +19,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/aws/smithy-go"
 	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 var client *s3.Client
@@ -128,50 +118,21 @@ func Create(ctx context.Context, dbConn db.ConnOrTx, in CreateInput) (*models.As
 		}
 	}
 
-	var thumbnailKey *string
-
-	width := in.Width
-	height := in.Height
-	if previewBytes, thumbWidth, thumbHeight, err := ExtractPreview(ctx, in.ContentType, in.Content); err != nil {
-		logging.Error().Err(err).Msg("Failed to generate preview for asset")
-	} else if len(previewBytes) > 0 {
-		keyStr := AssetKey(id.String(), fmt.Sprintf("%s_thumb.jpg", id.String()))
-		thumbnailType := "image/jpeg"
-		_, err = client.PutObject(ctx, &s3.PutObjectInput{
-			Bucket:      &config.Config.DigitalOcean.AssetsSpacesBucket,
-			Key:         &keyStr,
-			Body:        bytes.NewReader(previewBytes),
-			ACL:         types.ObjectCannedACLPublicRead,
-			ContentType: &thumbnailType,
-		})
-		if err != nil {
-			logging.Error().Err(err).Msg("Failed to upload thumbnail for video")
-		} else {
-			thumbnailKey = &keyStr
-		}
-
-		if width == 0 || height == 0 {
-			width = thumbWidth
-			height = thumbHeight
-		}
-	}
-
 	// Save a record in our database
 	// TODO(db): Would be convient to use RETURNING here...
 	_, err = dbConn.Exec(ctx,
 		`
-		INSERT INTO asset (id, s3_key, thumbnail_s3_key, filename, size, mime_type, sha1sum, width, height, uploader_id)
-		VALUES            ($1, $2,     $3,               $4,       $5,   $6,        $7,      $8,    $9,     $10)
+		INSERT INTO asset (id, s3_key, filename, size, mime_type, sha1sum, width, height, uploader_id)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
 		`,
 		id,
 		key,
-		thumbnailKey,
 		filename,
 		len(in.Content),
 		in.ContentType,
 		checksum,
-		width,
-		height,
+		in.Width,
+		in.Height,
 		in.UploaderID,
 	)
 	if err != nil {
@@ -193,175 +154,3 @@ func Create(ctx context.Context, dbConn db.ConnOrTx, in CreateInput) (*models.As
 
 	return asset, nil
 }
-
-func getFFMpegPath() string {
-	path := config.Config.PreviewGeneration.FFMpegPath
-	if path != "" {
-		return path
-	}
-	var err error
-	path, err = exec.LookPath("ffmpeg")
-	if err == nil {
-		return path
-	}
-	return ""
-}
-
-func ExtractPreview(ctx context.Context, mimeType string, inBytes []byte) ([]byte, int, int, error) {
-	log := logging.ExtractLogger(ctx)
-
-	execPath := getFFMpegPath()
-	if execPath == "" {
-		return nil, 0, 0, nil
-	}
-
-	if !strings.HasPrefix(mimeType, "video") {
-		return nil, 0, 0, nil
-	}
-
-	file, err := os.CreateTemp("", "hmnasset")
-	if err != nil {
-		return nil, 0, 0, oops.New(err, "Failed to create temp file for preview generation")
-	}
-	defer os.Remove(file.Name())
-	_, err = file.Write(inBytes)
-	if err != nil {
-		return nil, 0, 0, oops.New(err, "Failed to write to temp file for preview generation")
-	}
-	err = file.Close()
-	if err != nil {
-		return nil, 0, 0, oops.New(err, "Failed to close temp file for preview generation")
-	}
-
-	args := fmt.Sprintf("-i %s -filter_complex [0]select=gte(n\\,1)[s0] -map [s0] -c:v mjpeg -f mjpeg -vframes 1 pipe:1", file.Name())
-	if config.Config.PreviewGeneration.CPULimitPath != "" {
-		args = fmt.Sprintf("-l 10 -- %s %s", execPath, args)
-		execPath = config.Config.PreviewGeneration.CPULimitPath
-	}
-	ffmpegCmd := exec.CommandContext(ctx, execPath, strings.Split(args, " ")...)
-
-	var output bytes.Buffer
-	var errorOut bytes.Buffer
-	ffmpegCmd.Stdout = &output
-	ffmpegCmd.Stderr = &errorOut
-	err = ffmpegCmd.Run()
-	if err != nil {
-		log.Error().Str("ffmpeg output", errorOut.String()).Msg("FFMpeg returned error while generating preview thumbnail")
-		return nil, 0, 0, oops.New(err, "FFMpeg failed for preview generation")
-	}
-
-	imageBytes := output.Bytes()
-	cfg, _, err := image.DecodeConfig(bytes.NewBuffer(imageBytes))
-	if err != nil {
-		log.Error().Err(err).Msg("failed to get width/height from video thumbnail")
-		return nil, 0, 0, oops.New(err, "FFMpeg failed for preview generation")
-	}
-
-	return imageBytes, cfg.Width, cfg.Height, nil
-}
-
-func BackgroundPreviewGeneration(ctx context.Context, conn *pgxpool.Pool) jobs.Job {
-	log := logging.ExtractLogger(ctx).With().Str("module", "preview_gen").Logger()
-	job := jobs.New()
-
-	go func() {
-		defer job.Done()
-		log.Debug().Msg("Starting preview gen job")
-
-		if getFFMpegPath() == "" {
-			log.Warn().Msg("Couldn't find ffmpeg! No thumbnails will be generated.")
-			return
-		}
-
-		assets, err := db.Query[models.Asset](ctx, conn,
-			`
-			SELECT $columns
-			FROM asset
-			WHERE
-				mime_type LIKE 'video%'
-				AND (
-					thumbnail_s3_key IS NULL
-					OR thumbnail_s3_key = ''
-					OR thumbnail_s3_key LIKE '%.png'
-					OR width = 0
-					OR height = 0
-				)
-			`,
-		)
-		if err != nil {
-			log.Error().Err(oops.New(err, "Failed to fetch assets for preview generation")).Msg("Asset preview generation job failed")
-			return
-		}
-
-		log.Debug().Int("Num assets", len(assets)).Msg("Processing...")
-
-		for _, asset := range assets {
-			select {
-			case <-ctx.Done():
-				return
-			default:
-			}
-
-			log := log.With().Str("AssetID", asset.ID.String()).Logger()
-			ctx := logging.AttachLoggerToContext(&log, ctx)
-
-			log.Debug().Msg("Generating preview")
-			assetUrl := hmnurl.BuildS3Asset(asset.S3Key)
-			resp, err := http.Get(assetUrl)
-			if err != nil || resp.StatusCode != 200 {
-				log.Error().Err(err).Msg("Failed to fetch asset file for preview generation")
-				continue
-			}
-			defer resp.Body.Close()
-			body, err := io.ReadAll(resp.Body)
-			if err != nil {
-				log.Error().Err(err).Msg("Failed to read asset body for preview generation")
-				continue
-			}
-			thumbBytes, width, height, err := ExtractPreview(ctx, asset.MimeType, body)
-			if err != nil {
-				log.Error().Err(err).Msg("Failed to run extraction for preview generation")
-				continue
-			} else if len(thumbBytes) > 0 {
-				keyStr := AssetKey(asset.ID.String(), fmt.Sprintf("%s_thumb.jpg", asset.ID.String()))
-				thumbnailType := "image/jpeg"
-				_, err = client.PutObject(ctx, &s3.PutObjectInput{
-					Bucket:      &config.Config.DigitalOcean.AssetsSpacesBucket,
-					Key:         &keyStr,
-					Body:        bytes.NewReader(thumbBytes),
-					ACL:         types.ObjectCannedACLPublicRead,
-					ContentType: &thumbnailType,
-				})
-				if err != nil {
-					log.Error().Err(err).Msg("Failed to upload thumbnail for video")
-					continue
-				}
-
-				_, err = conn.Exec(ctx,
-					`
-					UPDATE asset
-					SET
-						thumbnail_s3_key = $1,
-						width = $2,
-						height = $3
-					WHERE asset.id = $4
-					`,
-					keyStr,
-					width,
-					height,
-					asset.ID,
-				)
-				if err != nil {
-					log.Error().Err(err).Msg("Failed to update asset for preview generation")
-					continue
-				}
-				log.Debug().Msg("Generated preview successfully!")
-			} else {
-				log.Debug().Msg("No error, but no thumbnail was generated, skipping")
-			}
-		}
-		log.Debug().Msg("No more previews to generate")
-	}()
-
-	return job
-}

src/auth/session.go

@@ -24,7 +24,7 @@ const CSRFFieldName = "csrf_token"
 
 const sessionDuration = time.Hour * 24 * 14
 
-func MakeSessionId() string {
+func makeSessionId() string {
 	idBytes := make([]byte, 40)
 	_, err := io.ReadFull(rand.Reader, idBytes)
 	if err != nil {
@@ -47,16 +47,7 @@ func makeCSRFToken() string {
 var ErrNoSession = errors.New("no session found")
 
 func GetSession(ctx context.Context, conn *pgxpool.Pool, id string) (*models.Session, error) {
-	sess, err := db.QueryOne[models.Session](ctx, conn,
-		`
-		SELECT $columns
-		FROM session
-		WHERE
-			id = $1
-			AND expires_at > CURRENT_TIMESTAMP
-		`,
-		id,
-	)
+	sess, err := db.QueryOne[models.Session](ctx, conn, "SELECT $columns FROM session WHERE id = $1", id)
 	if err != nil {
 		if errors.Is(err, db.NotFound) {
 			return nil, ErrNoSession
@@ -70,7 +61,7 @@ func GetSession(ctx context.Context, conn *pgxpool.Pool, id string) (*models.Ses
 
 func CreateSession(ctx context.Context, conn *pgxpool.Pool, username string) (*models.Session, error) {
 	session := models.Session{
-		ID:        MakeSessionId(),
+		ID:        makeSessionId(),
 		Username:  username,
 		ExpiresAt: time.Now().Add(sessionDuration),
 		CSRFToken: makeCSRFToken(),
@@ -143,16 +134,7 @@ func DeleteExpiredSessions(ctx context.Context, conn *pgxpool.Pool) (int64, erro
 	return tag.RowsAffected(), nil
 }
 
-func DeleteExpiredPendingLogins(ctx context.Context, conn *pgxpool.Pool) (int64, error) {
-	tag, err := conn.Exec(ctx, "DELETE FROM pending_login WHERE expires_at <= CURRENT_TIMESTAMP")
-	if err != nil {
-		return 0, oops.New(err, "failed to delete expired pending logins")
-	}
-
-	return tag.RowsAffected(), nil
-}
-
-func PeriodicallyDeleteExpiredStuff(ctx context.Context, conn *pgxpool.Pool) jobs.Job {
+func PeriodicallyDeleteExpiredSessions(ctx context.Context, conn *pgxpool.Pool) jobs.Job {
 	job := jobs.New()
 	go func() {
 		defer job.Done()
@@ -163,7 +145,6 @@ func PeriodicallyDeleteExpiredStuff(ctx context.Context, conn *pgxpool.Pool) job
 			case <-t.C:
 				err := func() (err error) {
 					defer utils.RecoverPanicAsError(&err)
-
 					n, err := DeleteExpiredSessions(ctx, conn)
 					if err == nil {
 						if n > 0 {
@@ -172,20 +153,10 @@ func PeriodicallyDeleteExpiredStuff(ctx context.Context, conn *pgxpool.Pool) job
 					} else {
 						logging.Error().Err(err).Msg("Failed to delete expired sessions")
 					}
-
-					n, err = DeleteExpiredPendingLogins(ctx, conn)
-					if err == nil {
-						if n > 0 {
-							logging.Info().Int64("num deleted pending logins", n).Msg("Deleted expired pending logins")
-						}
-					} else {
-						logging.Error().Err(err).Msg("Failed to delete expired pending logins")
-					}
-
 					return nil
 				}()
 				if err != nil {
-					logging.Error().Err(err).Msg("Panicked in PeriodicallyDeleteExpiredStuff")
+					logging.Error().Err(err).Msg("Panicked in PeriodicallyDeleteExpiredSessions")
 				}
 			case <-ctx.Done():
 				return

src/calendar/calendar.go

@@ -1,383 +0,0 @@
-package calendar
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha1"
-	"io"
-	"net/http"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	"git.handmade.network/hmn/hmn/src/config"
-	"git.handmade.network/hmn/hmn/src/jobs"
-	"git.handmade.network/hmn/hmn/src/logging"
-	"git.handmade.network/hmn/hmn/src/oops"
-	"git.handmade.network/hmn/hmn/src/utils"
-	"github.com/emersion/go-ical"
-)
-
-type RawCalendarData struct {
-	Name string
-	Url  string
-	Data []byte
-	Hash [sha1.Size]byte
-}
-
-type CalendarEvent struct {
-	ID        string
-	Name      string
-	Desc      string
-	StartTime time.Time
-	EndTime   time.Time
-	Duration  time.Duration
-	CalName   string
-}
-
-var unifiedCalendar *ical.Calendar
-var rawCalendarData = make([]*RawCalendarData, 0)
-var cachedICals = make(map[string][]byte)
-var httpClient = http.Client{}
-
-// NOTE(asaf): Passing an empty array for selectedCals returns all cals
-func GetICal(selectedCals []string) ([]byte, error) {
-	if unifiedCalendar == nil {
-		return nil, oops.New(nil, "No calendar")
-	}
-	sort.Strings(selectedCals)
-	cacheKey := strings.Join(selectedCals, "##")
-	cachedICal, ok := cachedICals[cacheKey]
-	if ok {
-		return cachedICal, nil
-	}
-
-	var cal *ical.Calendar
-	if len(selectedCals) == 0 {
-		cal = unifiedCalendar
-	} else {
-		cal = newHMNCalendar()
-		for _, child := range unifiedCalendar.Children {
-			include := true
-
-			if child.Name == ical.CompEvent {
-				calName, _ := child.Props.Text(ical.PropComment)
-				if calName != "" {
-					found := false
-					for _, s := range selectedCals {
-						if calName == s {
-							found = true
-						}
-					}
-					if !found {
-						include = false
-					}
-				}
-			}
-
-			if include {
-				cal.Children = append(cal.Children, child)
-			}
-		}
-	}
-	var calBytes []byte
-	if len(cal.Children) > 0 {
-		var buffer bytes.Buffer
-		err := ical.NewEncoder(&buffer).Encode(cal)
-		if err != nil {
-			return nil, oops.New(err, "Failed to encode calendar to iCal")
-		}
-		calBytes = buffer.Bytes()
-	} else {
-		calBytes = emptyCalendarString()
-	}
-	cachedICals[cacheKey] = calBytes
-	return calBytes, nil
-}
-
-func GetFutureEvents() []CalendarEvent {
-	if unifiedCalendar == nil {
-		return nil
-	}
-
-	futureEvents := make([]CalendarEvent, 0)
-	eventObjects := unifiedCalendar.Events()
-	now := time.Now()
-	lastTime := now.Add(time.Hour * 24 * 365)
-	for _, ev := range eventObjects {
-		summary, err := ev.Props.Text(ical.PropSummary)
-		if err != nil {
-			logging.Error().Err(err).Msg("Failed to get summary for calendar event")
-			continue
-		}
-
-		startTime, err := ev.DateTimeStart(nil)
-		if err != nil {
-			logging.Error().Err(err).Str("Event name", summary).Msg("Failed to get start time for calendar event")
-			continue
-		}
-
-		var evTimes []time.Time
-		set, err := ev.RecurrenceSet(nil)
-		if err != nil {
-			logging.Error().Err(err).Str("Event name", summary).Msg("Failed to get recurrence set for calendar event")
-			continue
-		}
-		if set != nil {
-			evTimes = set.Between(now, lastTime, true)
-		} else if startTime.After(now) {
-			evTimes = []time.Time{startTime}
-		}
-
-		if len(evTimes) == 0 {
-			continue
-		}
-
-		desc, err := ev.Props.Text(ical.PropDescription)
-		if err != nil {
-			logging.Error().Err(err).Str("Event name", summary).Msg("Failed to get description for calendar event")
-			continue
-		}
-
-		calName, _ := ev.Props.Text(ical.PropComment)
-
-		uid, err := ev.Props.Text(ical.PropUID)
-		if err != nil {
-			logging.Error().Err(err).Str("Event name", summary).Msg("Failed to get uid for calendar event")
-			continue
-		}
-
-		endTime, err := ev.DateTimeStart(nil)
-		if err != nil {
-			logging.Error().Err(err).Str("Event name", summary).Msg("Failed to get end time for calendar event")
-			continue
-		}
-
-		evDuration := endTime.Sub(startTime)
-
-		for _, t := range evTimes {
-			futureEvents = append(futureEvents, CalendarEvent{
-				ID:        uid,
-				Name:      summary,
-				Desc:      desc,
-				StartTime: t,
-				EndTime:   t.Add(evDuration),
-				Duration:  evDuration,
-				CalName:   calName,
-			})
-		}
-	}
-	sort.Slice(futureEvents, func(i, j int) bool {
-		return futureEvents[i].StartTime.Before(futureEvents[j].StartTime)
-	})
-	return futureEvents
-}
-
-func MonitorCalendars(ctx context.Context) jobs.Job {
-	log := logging.ExtractLogger(ctx).With().Str("calendar goroutine", "calendar monitor").Logger()
-	if len(config.Config.Calendars) == 0 {
-		log.Info().Msg("No calendars specified in config")
-		return jobs.Noop()
-	}
-
-	ctx = logging.AttachLoggerToContext(&log, ctx)
-
-	job := jobs.New()
-
-	go func() {
-		defer func() {
-			log.Info().Msg("Shutting down calendar monitor")
-			job.Done()
-		}()
-		log.Info().Msg("Running calendar monitor")
-
-		monitorTimer := time.NewTimer(time.Second)
-
-		for {
-			select {
-			case <-monitorTimer.C:
-				err := func() (err error) {
-					defer utils.RecoverPanicAsError(&err)
-
-					ReloadCalendars(ctx)
-
-					return nil
-				}()
-				if err != nil {
-					logging.Error().Err(err).Msg("Panicked in MonitorCalendars")
-				}
-				monitorTimer.Reset(time.Minute)
-			case <-ctx.Done():
-				return
-			}
-		}
-	}()
-
-	return job
-}
-
-func ReloadCalendars(ctx context.Context) {
-	log := logging.ExtractLogger(ctx)
-
-	// Download calendars
-	calChan := make(chan RawCalendarData, len(config.Config.Calendars))
-	var wg sync.WaitGroup
-	wg.Add(len(config.Config.Calendars))
-	for _, c := range config.Config.Calendars {
-		go func(cal config.CalendarSource) {
-			defer func() {
-				wg.Done()
-				logging.LogPanics(log)
-			}()
-			calUrl := cal.Url
-			req, err := http.NewRequestWithContext(ctx, "GET", calUrl, nil)
-			if err != nil {
-				log.Error().Err(err).Msg("Failed to create request for calendar fetch")
-				return
-			}
-			res, err := httpClient.Do(req)
-			if err != nil {
-				log.Error().Err(err).Str("Url", calUrl).Msg("Failed to fetch calendar")
-				return
-			}
-			if res.StatusCode > 299 || !strings.HasPrefix(res.Header.Get("Content-Type"), "text/calendar") {
-				log.Error().Str("Url", calUrl).Str("Status", res.Status).Msg("Failed to fetch calendar")
-				io.ReadAll(res.Body)
-				res.Body.Close()
-				return
-			}
-
-			data, err := io.ReadAll(res.Body)
-			res.Body.Close()
-			if err != nil {
-				log.Error().Err(err).Str("Url", calUrl).Msg("Failed to fetch calendar")
-				return
-			}
-
-			calChan <- RawCalendarData{Name: cal.Name, Url: calUrl, Data: data}
-		}(c)
-	}
-	wg.Wait()
-	newRawCalendarData := make([]*RawCalendarData, 0, len(config.Config.Calendars))
-Collect:
-	for {
-		select {
-		case d := <-calChan:
-			newRawCalendarData = append(newRawCalendarData, &d)
-		default:
-			break Collect
-		}
-	}
-
-	// Diff calendars
-	same := true
-	for _, n := range newRawCalendarData {
-		n.Hash = sha1.Sum(n.Data)
-	}
-
-	sort.Slice(newRawCalendarData, func(i, j int) bool {
-		return newRawCalendarData[i].Name < newRawCalendarData[j].Name
-	})
-
-	if len(newRawCalendarData) != len(rawCalendarData) {
-		same = false
-	} else {
-		for i := range newRawCalendarData {
-			newData := newRawCalendarData[i]
-			oldData := rawCalendarData[i]
-			if newData.Name != oldData.Name {
-				same = false
-				break
-			}
-			if newData.Hash != oldData.Hash {
-				same = false
-				break
-			}
-		}
-	}
-
-	if same {
-		return
-	}
-
-	// Unify calendars and clear cache
-	rawCalendarData = newRawCalendarData
-	cachedICals = make(map[string][]byte)
-
-	unified := newHMNCalendar()
-
-	var timezones []string
-
-	for _, calData := range rawCalendarData {
-		decoder := ical.NewDecoder(bytes.NewReader(calData.Data))
-		calNameProp := ical.NewProp(ical.PropComment)
-		calNameProp.SetText(calData.Name)
-		for {
-			cal, err := decoder.Decode()
-			if err == io.EOF {
-				break
-			} else if err != nil {
-				log.Error().Err(err).Str("Url", calData.Url).Msg("Failed to parse calendar")
-				break
-			}
-
-			for _, child := range cal.Children {
-				if child.Name == ical.CompTimezone {
-					tzid, err := child.Props.Text(ical.PropTimezoneID)
-					if err != nil {
-						found := false
-						for _, s := range timezones {
-							if s == tzid {
-								found = true
-							}
-						}
-						if found {
-							continue
-						} else {
-							timezones = append(timezones, tzid)
-						}
-					} else {
-						continue
-					}
-				}
-				if child.Name == ical.CompEvent {
-					child.Props.Set(calNameProp)
-				}
-				unified.Children = append(unified.Children, child)
-			}
-		}
-	}
-
-	unifiedCalendar = unified
-}
-
-func newHMNCalendar() *ical.Calendar {
-	cal := ical.NewCalendar()
-
-	prodID := ical.NewProp(ical.PropProductID)
-	prodID.SetText("Handmade Network")
-	cal.Props.Set(prodID)
-
-	version := ical.NewProp(ical.PropVersion)
-	version.SetText("1.0")
-	cal.Props.Set(version)
-
-	name := ical.NewProp("X-WR-CALNAME")
-	name.SetText("Handmade Network")
-	cal.Props.Set(name)
-
-	return cal
-}
-
-// NOTE(asaf): The ical library we're using doesn't like encoding empty calendars, so we have to do this manually.
-func emptyCalendarString() []byte {
-	empty := `BEGIN:VCALENDAR
-VERSION:1.0
-PRODID:Handmade Network
-X-WR-CALNAME:Handmade Network
-END:VCALENDAR
-	`
-
-	return []byte(empty)
-}

src/config/config.go.example

@@ -78,17 +78,8 @@ var Config = HMNConfig{
 		BaseUrl:        "https://api.twitch.tv/helix",
 		BaseIDUrl:      "https://id.twitch.tv/oauth2",
 	},
-	Calendars: []CalendarSource{
-	},
 	EpisodeGuide: EpisodeGuide{
 		CineraOutputPath: "./annotations/",
 		Projects:         map[string]string{"hero": "code", "riscy": "riscy", "bitwise": "bitwise"},
 	},
-	DevConfig: DevConfig{
-		LiveTemplates: true,
-	},
-    PreviewGeneration: PreviewGenerationConfig{
-        FFMpegPath: "", // Will not generate asset video thumbnails if ffmpeg is not specified
-        CPULimitPath: "", // Not mandatory. FFMpeg will not limited if this is not provided
-    },
 }

src/config/types.go

@@ -16,23 +16,19 @@ const (
 )
 
 type HMNConfig struct {
-	Env               Environment
-	Addr              string
-	PrivateAddr       string
-	BaseUrl           string
-	LogLevel          zerolog.Level
-	Postgres          PostgresConfig
-	Auth              AuthConfig
-	Admin             AdminConfig
-	Email             EmailConfig
-	DigitalOcean      DigitalOceanConfig
-	Discord           DiscordConfig
-	Twitch            TwitchConfig
-	Matrix            MatrixConfig
-	EpisodeGuide      EpisodeGuide
-	DevConfig         DevConfig
-	PreviewGeneration PreviewGenerationConfig
-	Calendars      []CalendarSource
+	Env          Environment
+	Addr         string
+	PrivateAddr  string
+	BaseUrl      string
+	LogLevel     zerolog.Level
+	Postgres     PostgresConfig
+	Auth         AuthConfig
+	Admin        AdminConfig
+	Email        EmailConfig
+	DigitalOcean DigitalOceanConfig
+	Discord      DiscordConfig
+	Twitch       TwitchConfig
+	EpisodeGuide EpisodeGuide
 }
 
 type PostgresConfig struct {
@@ -95,18 +91,6 @@ type TwitchConfig struct {
 	BaseIDUrl      string
 }
 
-type MatrixConfig struct {
-	Username            string
-	Password            string
-	BaseUrl             string
-	AnnouncementsRoomID string
-}
-
-type CalendarSource struct {
-	Name string
-	Url string
-}
-
 type EpisodeGuide struct {
 	CineraOutputPath string
 	Projects         map[string]string // NOTE(asaf): Maps from slugs to default episode guide topic
@@ -117,15 +101,6 @@ type AdminConfig struct {
 	AtomPassword string
 }
 
-type DevConfig struct {
-	LiveTemplates bool // load templates live from the filesystem instead of embedding them
-}
-
-type PreviewGenerationConfig struct {
-	FFMpegPath   string
-	CPULimitPath string
-}
-
 func init() {
 	if Config.EpisodeGuide.Projects == nil {
 		Config.EpisodeGuide.Projects = make(map[string]string)

src/discord/gateway.go

@@ -23,34 +23,6 @@ import (
 	"github.com/jpillora/backoff"
 )
 
-type BotEvent struct {
-	Timestamp time.Time
-	Name      string
-	Extra     string
-}
-
-var botEvents = make([]BotEvent, 0, 1000)
-var botEventsMutex = sync.Mutex{}
-
-func RecordBotEvent(name, extra string) {
-	botEventsMutex.Lock()
-	defer botEventsMutex.Unlock()
-	if len(botEvents) > 1000 {
-		botEvents = botEvents[len(botEvents)-500:]
-	}
-	botEvents = append(botEvents, BotEvent{
-		Timestamp: time.Now(),
-		Name:      name,
-		Extra:     extra,
-	})
-}
-
-func GetBotEvents() []BotEvent {
-	botEventsMutex.Lock()
-	defer botEventsMutex.Unlock()
-	return botEvents[:]
-}
-
 func RunDiscordBot(ctx context.Context, dbConn *pgxpool.Pool) jobs.Job {
 	log := logging.ExtractLogger(ctx).With().Str("module", "discord").Logger()
 	ctx = logging.AttachLoggerToContext(&log, ctx)
@@ -84,11 +56,6 @@ func RunDiscordBot(ctx context.Context, dbConn *pgxpool.Pool) jobs.Job {
 				log.Info().Msg("Connecting to the Discord gateway")
 				bot := newBotInstance(dbConn)
 				err := bot.Run(ctx)
-				disconnectMessage := ""
-				if err != nil {
-					disconnectMessage = err.Error()
-				}
-				RecordBotEvent("Disconnected", disconnectMessage)
 				if err != nil {
 					dur := boff.Duration()
 					log.Error().
@@ -134,8 +101,6 @@ type botInstance struct {
 	conn   *websocket.Conn
 	dbConn *pgxpool.Pool
 
-	resuming bool
-
 	heartbeatIntervalMs int
 	forceHeartbeat      chan struct{}
 
@@ -228,7 +193,6 @@ func (bot *botInstance) Run(ctx context.Context) (err error) {
 			logging.ExtractLogger(ctx).Info().Msg("Discord asked us to reconnect to the gateway")
 			return nil
 		case OpcodeInvalidSession:
-			RecordBotEvent("Failed to resume - invalid session", "")
 			// We tried to resume but the session was invalid.
 			// Delete the session and reconnect from scratch again.
 			_, err := bot.dbConn.Exec(ctx, `DELETE FROM discord_session`)
@@ -300,11 +264,8 @@ func (bot *botInstance) connect(ctx context.Context) error {
 		}
 	}
 
-	RecordBotEvent("Connected", "")
 	if shouldResume {
-		RecordBotEvent("Resuming with session ID", session.ID)
 		// Reconnect to the previous session
-		bot.resuming = true
 		err := bot.sendGatewayMessage(ctx, GatewayMessage{
 			Opcode: OpcodeResume,
 			Data: Resume{
@@ -579,20 +540,11 @@ func (bot *botInstance) processEventMsg(ctx context.Context, msg *GatewayMessage
 		panic(fmt.Sprintf("processEventMsg must only be used on Dispatch messages (opcode %d). Validate this before you call this function.", OpcodeDispatch))
 	}
 
-	if bot.resuming {
-		name := ""
-		if msg.EventName != nil {
-			name = *msg.EventName
-		}
-		RecordBotEvent("Got event while resuming", name)
-	}
 	switch *msg.EventName {
 	case "RESUMED":
 		// Nothing to do, but at least we can log something
 		logging.ExtractLogger(ctx).Info().Msg("Finished resuming gateway session")
 
-		bot.resuming = false
-		RecordBotEvent("Done resuming", "")
 		bot.createApplicationCommands(ctx)
 	case "MESSAGE_CREATE":
 		newMessage := *MessageFromMap(msg.Data, "")

src/discord/history.go

@@ -185,7 +185,6 @@ func Scrape(ctx context.Context, dbConn *pgxpool.Pool, channelID string, earlies
 				return true
 			}
 
-			msg.Backfilled = true
 			err := HandleIncomingMessage(ctx, dbConn, &msg, createSnippets)
 
 			if err != nil {

src/discord/message_handling.go

@@ -1,17 +1,13 @@
 package discord
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
-	"math/rand"
 	"net/http"
 	"net/url"
 	"regexp"
-	"strconv"
 	"strings"
 	"time"
 
@@ -23,15 +19,9 @@ import (
 	"git.handmade.network/hmn/hmn/src/models"
 	"git.handmade.network/hmn/hmn/src/oops"
 	"git.handmade.network/hmn/hmn/src/parsing"
-	"git.handmade.network/hmn/hmn/src/utils"
 	"github.com/google/uuid"
 )
 
-var autostoreChannels = []string{
-	config.Config.Discord.ShowcaseChannelID,
-	// TODO(asaf): Add jam channel
-}
-
 func HandleIncomingMessage(ctx context.Context, dbConn db.ConnOrTx, msg *Message, createSnippets bool) error {
 	deleted := false
 	var err error
@@ -46,10 +36,6 @@ func HandleIncomingMessage(ctx context.Context, dbConn db.ConnOrTx, msg *Message
 		deleted, err = CleanUpShowcase(ctx, dbConn, msg)
 	}
 
-	if !deleted && err == nil {
-		err = ShareToMatrix(ctx, msg)
-	}
-
 	if !deleted && err == nil {
 		err = MaybeInternMessage(ctx, dbConn, msg)
 	}
@@ -58,10 +44,6 @@ func HandleIncomingMessage(ctx context.Context, dbConn db.ConnOrTx, msg *Message
 		err = HandleInternedMessage(ctx, dbConn, msg, deleted, createSnippets)
 	}
 
-	if !deleted && err == nil {
-		err = FreyaMode(ctx, dbConn, msg)
-	}
-
 	return err
 }
 
@@ -74,7 +56,17 @@ func CleanUpShowcase(ctx context.Context, dbConn db.ConnOrTx, msg *Message) (boo
 			return deleted, nil
 		}
 
-		if !messageShouldBeStored(msg) {
+		hasGoodContent := true
+		if msg.OriginalHasFields("content") && !messageHasLinks(msg.Content) {
+			hasGoodContent = false
+		}
+
+		hasGoodAttachments := true
+		if msg.OriginalHasFields("attachments") && len(msg.Attachments) == 0 {
+			hasGoodAttachments = false
+		}
+
+		if !hasGoodContent && !hasGoodAttachments {
 			err := DeleteMessage(ctx, msg.ChannelID, msg.ID)
 			if err != nil {
 				return deleted, oops.New(err, "failed to delete message")
@@ -90,7 +82,7 @@ func CleanUpShowcase(ctx context.Context, dbConn db.ConnOrTx, msg *Message) (boo
 				err = SendMessages(ctx, dbConn, MessageToSend{
 					ChannelID: channel.ID,
 					Req: CreateMessageRequest{
-						Content: "Posts in #project-showcase are required to have either an image/video or a link, or start with `!til`. Discuss showcase content in #projects.",
+						Content: "Posts in #project-showcase are required to have either an image/video or a link. Discuss showcase content in #projects.",
 					},
 				})
 				if err != nil {
@@ -145,163 +137,8 @@ func CleanUpLibrary(ctx context.Context, dbConn db.ConnOrTx, msg *Message) (bool
 	return deleted, nil
 }
 
-func FreyaMode(ctx context.Context, dbConn db.ConnOrTx, msg *Message) error {
-	if msg.Author.IsBot {
-		return nil
-	}
-	if msg.ChannelID == config.Config.Discord.ShowcaseChannelID || msg.ChannelID == config.Config.Discord.LibraryChannelID {
-		return nil
-	}
-
-	twitteryUrls := []string{
-		"https://twitter.com",
-		"https://x.com",
-		"https://vxtwitter.com",
-		"https://fxtwitter.com",
-	}
-	isTwittery := false
-	for _, url := range twitteryUrls {
-		if strings.Contains(msg.Content, url) {
-			isTwittery = true
-		}
-	}
-	if !isTwittery {
-		return nil
-	}
-
-	// FREYA MODE ENGAGED
-	approvedTweets := []string{
-		"https://vxtwitter.com/FreyaHolmer/status/1757836988495847568",
-		"https://vxtwitter.com/FreyaHolmer/status/1752441092501361103",
-		"https://vxtwitter.com/FreyaHolmer/status/1753813557966217268",
-		"https://vxtwitter.com/FreyaHolmer/status/1746228932188295579",
-		"https://vxtwitter.com/FreyaHolmer/status/1732687685850894799",
-		"https://vxtwitter.com/FreyaHolmer/status/1761487879178736048",
-		"https://vxtwitter.com/FreyaHolmer/status/1733820461492863442",
-		"https://vxtwitter.com/FreyaHolmer/status/1732845451701871101",
-		"https://vxtwitter.com/FreyaHolmer/status/1765680355657359585",
-		"https://vxtwitter.com/FreyaHolmer/status/1784678195997852129",
-		"https://vxtwitter.com/FreyaHolmer/status/1741468609044508831",
-		"https://vxtwitter.com/FreyaHolmer/status/1759306434053870012",
-		"https://vxtwitter.com/FreyaHolmer/status/1754929898492162178",
-		"https://vxtwitter.com/FreyaHolmer/status/1782498313511534822",
-		"https://vxtwitter.com/FreyaHolmer/status/1623737764041695232",
-		"https://vxtwitter.com/FreyaHolmer/status/1718979996125925494",
-		"https://vxtwitter.com/FreyaHolmer/status/1675945798448607248",
-		"https://vxtwitter.com/FreyaHolmer/status/1662229911375953922",
-		"https://vxtwitter.com/FreyaHolmer/status/1652235944752185345",
-		"https://vxtwitter.com/FreyaHolmer/status/1386408507218427905",
-		"https://vxtwitter.com/FreyaHolmer/status/1436696408506212353",
-		"https://vxtwitter.com/FreyaHolmer/status/1444755552777670657",
-		"https://vxtwitter.com/FreyaHolmer/status/1232826293902888960",
-	}
-	tweet := approvedTweets[rand.Intn(len(approvedTweets))]
-	err := SendMessages(ctx, dbConn, MessageToSend{
-		ChannelID: msg.ChannelID,
-		Req: CreateMessageRequest{
-			Content: fmt.Sprintf("No. Only Freya is allowed to tweet. %s", tweet),
-		},
-	})
-	if err != nil {
-		return oops.New(err, "failed to send Freya tweet")
-	}
-
-	return nil
-}
-
-func ShareToMatrix(ctx context.Context, msg *Message) error {
-	if msg.Flags&MessageFlagCrossposted == 0 {
-		return nil
-	}
-	if config.Config.Matrix.Username == "" {
-		logging.ExtractLogger(ctx).Warn().Msg("No Matrix user provided; Discord announcement will not be shared")
-	}
-
-	fullMsg, err := GetChannelMessage(ctx, msg.ChannelID, msg.ID)
-	if err != nil {
-		return oops.New(err, "failed to get published message contents")
-	}
-
-	bodyMarkdown := CleanUpMarkdown(ctx, fullMsg.Content)
-	bodyHTML := parsing.ParseMarkdown(bodyMarkdown, parsing.DiscordMarkdown)
-
-	// Log in to Matrix (we don't bother to keep access tokens around)
-	var accessToken string
-	{
-		type MatrixLogin struct {
-			Type     string `json:"type"`
-			User     string `json:"user"`
-			Password string `json:"password"`
-		}
-		type MatrixLoginResponse struct {
-			AccessToken string `json:"access_token"`
-		}
-		body := MatrixLogin{
-			Type:     "m.login.password",
-			User:     config.Config.Matrix.Username,
-			Password: config.Config.Matrix.Password,
-		}
-		bodyBytes := utils.Must1(json.Marshal(body))
-		res, err := http.Post(
-			"https://matrix.handmadecities.com/_matrix/client/r0/login",
-			"application/json",
-			bytes.NewReader(bodyBytes),
-		)
-		if err != nil || res.StatusCode >= 300 {
-			return oops.New(err, "failed to log into Matrix")
-		}
-		defer res.Body.Close()
-		resBodyBytes := utils.Must1(io.ReadAll(res.Body))
-		var resBody MatrixLoginResponse
-		utils.Must(json.Unmarshal(resBodyBytes, &resBody))
-
-		accessToken = resBody.AccessToken
-	}
-
-	// Create message
-	{
-		type MessageEvent struct {
-			MsgType       string `json:"msgtype"`
-			Body          string `json:"body"`
-			Format        string `json:"format,omitempty"`
-			FormattedBody string `json:"formatted_body,omitempty"`
-		}
-		tid := "hmn" + strconv.Itoa(rand.Int())
-		body := MessageEvent{
-			MsgType:       "m.text",
-			Body:          bodyMarkdown,
-			Format:        "org.matrix.custom.html",
-			FormattedBody: bodyHTML,
-		}
-		bodyBytes := utils.Must1(json.Marshal(body))
-		req := utils.Must1(http.NewRequestWithContext(
-			ctx,
-			http.MethodPut,
-			fmt.Sprintf(
-				"%s/_matrix/client/v3/rooms/%s/send/m.room.message/%s",
-				config.Config.Matrix.BaseUrl,
-				config.Config.Matrix.AnnouncementsRoomID,
-				tid,
-			),
-			bytes.NewReader(bodyBytes),
-		))
-		req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", accessToken))
-		req.Header.Add("Content-Type", "application/json")
-		res, err := http.DefaultClient.Do(req)
-		if err != nil || res.StatusCode >= 300 {
-			return oops.New(err, "failed to send Matrix message")
-		}
-	}
-
-	logging.ExtractLogger(ctx).Info().
-		Str("contents", bodyMarkdown).
-		Msg("Published Discord announcement to Matrix")
-
-	return nil
-}
-
 func MaybeInternMessage(ctx context.Context, dbConn db.ConnOrTx, msg *Message) error {
-	if messageShouldBeStored(msg) {
+	if msg.ChannelID == config.Config.Discord.ShowcaseChannelID {
 		err := InternMessage(ctx, dbConn, msg)
 		if errors.Is(err, errNotEnoughInfo) {
 			logging.ExtractLogger(ctx).Warn().
@@ -353,8 +190,8 @@ func InternMessage(
 
 		_, err = dbConn.Exec(ctx,
 			`
-			INSERT INTO discord_message (id, channel_id, guild_id, url, user_id, sent_at, snippet_created, backfilled)
-			VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+			INSERT INTO discord_message (id, channel_id, guild_id, url, user_id, sent_at, snippet_created)
+			VALUES ($1, $2, $3, $4, $5, $6, $7)
 			`,
 			msg.ID,
 			msg.ChannelID,
@@ -363,7 +200,6 @@ func InternMessage(
 			msg.Author.ID,
 			msg.Time(),
 			false,
-			msg.Backfilled,
 		)
 		if err != nil {
 			return oops.New(err, "failed to save new discord message")
@@ -405,7 +241,7 @@ func FetchInternedMessage(ctx context.Context, dbConn db.ConnOrTx, msgId string)
 // 1. Saves/updates content
 // 2. Saves/updates snippet
 // 3. Deletes content/snippet
-func HandleInternedMessage(ctx context.Context, dbConn db.ConnOrTx, msg *Message, removeInternedMessage bool, createSnippet bool) error {
+func HandleInternedMessage(ctx context.Context, dbConn db.ConnOrTx, msg *Message, deleted bool, createSnippet bool) error {
 	tx, err := dbConn.Begin(ctx)
 	if err != nil {
 		return oops.New(err, "failed to start transaction")
@@ -416,11 +252,7 @@ func HandleInternedMessage(ctx context.Context, dbConn db.ConnOrTx, msg *Message
 	if err != nil && !errors.Is(err, db.NotFound) {
 		return err
 	} else if err == nil {
-		if !removeInternedMessage {
-			removeInternedMessage = !messageShouldBeStored(msg)
-		}
-
-		if !removeInternedMessage {
+		if !deleted {
 			err = SaveMessageContents(ctx, tx, interned, msg)
 			if err != nil {
 				return err
@@ -599,7 +431,7 @@ var discordDownloadClient = &http.Client{
 
 type DiscordResourceBadStatusCode error
 
-func DownloadDiscordResource(ctx context.Context, url string) ([]byte, string, error) {
+func downloadDiscordResource(ctx context.Context, url string) ([]byte, string, error) {
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
 		return nil, "", oops.New(err, "failed to make Discord download request")
@@ -659,7 +491,7 @@ func saveAttachment(
 		height = *attachment.Height
 	}
 
-	content, _, err := DownloadDiscordResource(ctx, attachment.Url)
+	content, _, err := downloadDiscordResource(ctx, attachment.Url)
 	if err != nil {
 		return nil, oops.New(err, "failed to download Discord attachment")
 	}
@@ -729,7 +561,7 @@ func saveEmbed(
 	}
 
 	maybeSaveImageish := func(i EmbedImageish, contentTypeCheck func(string) bool) (*uuid.UUID, error) {
-		content, contentType, err := DownloadDiscordResource(ctx, *i.Url)
+		content, contentType, err := downloadDiscordResource(ctx, *i.Url)
 		if err != nil {
 			var statusError DiscordResourceBadStatusCode
 			if errors.As(err, &statusError) {
@@ -853,7 +685,7 @@ func HandleSnippetForInternedMessage(ctx context.Context, dbConn db.ConnOrTx, in
 
 	if interned.MessageContent == nil {
 		// NOTE(asaf): Can't have a snippet without content
-		// NOTE(asaf): Messages that only have an attachment also have a content struct with an empty content string
+		// NOTE(asaf): Messages that only have an attachment also have blank content
 		// TODO(asaf): Do we need to delete existing snippets in this case??? Not entirely sure how to trigger this through discord
 		return nil
 	}
@@ -903,42 +735,43 @@ func HandleSnippetForInternedMessage(ctx context.Context, dbConn db.ConnOrTx, in
 		if shouldCreate {
 			// Get an asset ID or URL to make a snippet from
 			assetId, url, err := getSnippetAssetOrUrl(ctx, tx, &interned.Message)
+			if assetId != nil || url != nil {
+				contentMarkdown := interned.MessageContent.LastContent
+				contentHTML := parsing.ParseMarkdown(contentMarkdown, parsing.DiscordMarkdown)
 
-			contentMarkdown := interned.MessageContent.LastContent
-			contentHTML := parsing.ParseMarkdown(contentMarkdown, parsing.DiscordMarkdown)
+				_, err = tx.Exec(ctx,
+					`
+					INSERT INTO snippet (url, "when", description, _description_html, asset_id, discord_message_id, owner_id)
+					VALUES ($1, $2, $3, $4, $5, $6, $7)
+					`,
+					url,
+					interned.Message.SentAt,
+					contentMarkdown,
+					contentHTML,
+					assetId,
+					interned.Message.ID,
+					interned.HMNUser.ID,
+				)
+				if err != nil {
+					return oops.New(err, "failed to create snippet from attachment")
+				}
 
-			_, err = tx.Exec(ctx,
-				`
-				INSERT INTO snippet (url, "when", description, _description_html, asset_id, discord_message_id, owner_id)
-				VALUES ($1, $2, $3, $4, $5, $6, $7)
-				`,
-				url,
-				interned.Message.SentAt,
-				contentMarkdown,
-				contentHTML,
-				assetId,
-				interned.Message.ID,
-				interned.HMNUser.ID,
-			)
-			if err != nil {
-				return oops.New(err, "failed to create snippet from attachment")
-			}
+				existingSnippet, err = FetchSnippetForMessage(ctx, tx, interned.Message.ID)
+				if err != nil {
+					return oops.New(err, "failed to fetch newly-created snippet")
+				}
 
-			existingSnippet, err = FetchSnippetForMessage(ctx, tx, interned.Message.ID)
-			if err != nil {
-				return oops.New(err, "failed to fetch newly-created snippet")
-			}
-
-			_, err = tx.Exec(ctx,
-				`
-				UPDATE discord_message
-				SET snippet_created = TRUE
-				WHERE id = $1
-				`,
-				interned.Message.ID,
-			)
-			if err != nil {
-				return oops.New(err, "failed to mark message as having snippet")
+				_, err = tx.Exec(ctx,
+					`
+					UPDATE discord_message
+					SET snippet_created = TRUE
+					WHERE id = $1
+					`,
+					interned.Message.ID,
+				)
+				if err != nil {
+					return oops.New(err, "failed to mark message as having snippet")
+				}
 			}
 		}
 	}
@@ -1005,8 +838,7 @@ func HandleSnippetForInternedMessage(ctx context.Context, dbConn db.ConnOrTx, in
 }
 
 // TODO(asaf): I believe this will also match https://example.com?hello=1&whatever=5
-//
-//	Probably need to add word boundaries.
+//             Probably need to add word boundaries.
 var REDiscordTag = regexp.MustCompile(`&([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*)`)
 
 func getDiscordTags(content string) []string {
@@ -1080,36 +912,3 @@ func messageHasLinks(content string) bool {
 
 	return false
 }
-
-func messageShouldBeStored(msg *Message) bool {
-	if msg == nil {
-		return false
-	}
-
-	if strings.HasPrefix(strings.ToLower(strings.TrimSpace(msg.Content)), "!til") {
-		return true
-	}
-
-	autostore := false
-	for _, cid := range autostoreChannels {
-		if msg.ChannelID == cid {
-			autostore = true
-			break
-		}
-	}
-	if autostore {
-		hasGoodContent := true
-		if msg.OriginalHasFields("content") && !messageHasLinks(msg.Content) {
-			hasGoodContent = false
-		}
-
-		hasGoodAttachments := true
-		if msg.OriginalHasFields("attachments") && len(msg.Attachments) == 0 {
-			hasGoodAttachments = false
-		}
-
-		return hasGoodContent || hasGoodAttachments
-	}
-
-	return false
-}

src/discord/payloads.go

@@ -244,38 +244,20 @@ const (
 	MessageTypeGuildInviteReminder  MessageType = 22
 )
 
-type MessageFlags int
-
-const (
-	MessageFlagCrossposted MessageFlags = 1 << iota
-	MessageFlagIsCrosspost
-	MessageFlagSuppressEmbeds
-	MessageFlagSourceMessageDeleted
-	MessageFlagUrgent
-	MessageFlagHasThread
-	MessageFlagEphemeral
-	MessageFlagLoading
-	MessageFlagFailedToMentionSomeRolesInThread
-	MessageFlagSuppressNotifications
-	MessageFlagIsVoiceMessage
-)
-
 // https://discord.com/developers/docs/resources/channel#message-object
 type Message struct {
-	ID        string       `json:"id"`
-	ChannelID string       `json:"channel_id"`
-	GuildID   *string      `json:"guild_id"`
-	Content   string       `json:"content"`
-	Author    *User        `json:"author"` // note that this may not be an actual valid user (see the docs)
-	Timestamp string       `json:"timestamp"`
-	Type      MessageType  `json:"type"`
-	Flags     MessageFlags `json:"flags"`
+	ID        string      `json:"id"`
+	ChannelID string      `json:"channel_id"`
+	GuildID   *string     `json:"guild_id"`
+	Content   string      `json:"content"`
+	Author    *User       `json:"author"` // note that this may not be an actual valid user (see the docs)
+	Timestamp string      `json:"timestamp"`
+	Type      MessageType `json:"type"`
 
 	Attachments []Attachment `json:"attachments"`
 	Embeds      []Embed      `json:"embeds"`
 
 	originalMap map[string]interface{}
-	Backfilled  bool
 }
 
 func (m *Message) JumpURL() string {
@@ -335,7 +317,6 @@ func MessageFromMap(m interface{}, k string) *Message {
 		Author:    UserFromMap(m, "author"),
 		Timestamp: maybeString(mmap, "timestamp"),
 		Type:      MessageType(maybeInt(mmap, "type")),
-		Flags:     MessageFlags(maybeInt(mmap, "flags")),
 
 		originalMap: mmap,
 	}
@@ -365,7 +346,6 @@ type User struct {
 	Avatar        *string `json:"avatar"`
 	IsBot         bool    `json:"bot"`
 	Locale        string  `json:"locale"`
-	Email         string  `json:"email"`
 }
 
 func UserFromMap(m interface{}, k string) *User {
@@ -407,9 +387,8 @@ func GuildFromMap(m interface{}, k string) *Guild {
 
 // https://discord.com/developers/docs/resources/guild#guild-member-object
 type GuildMember struct {
-	User   *User   `json:"user"`
-	Nick   *string `json:"nick"`
-	Avatar *string `json:"avatar"`
+	User *User   `json:"user"`
+	Nick *string `json:"nick"`
 	// more fields not yet handled here
 }
 
@@ -430,9 +409,8 @@ func GuildMemberFromMap(m interface{}, k string) *GuildMember {
 	}
 
 	gm := &GuildMember{
-		User:   UserFromMap(m, "user"),
-		Nick:   maybeStringP(mmap, "nick"),
-		Avatar: maybeStringP(mmap, "avatar"),
+		User: UserFromMap(m, "user"),
+		Nick: maybeStringP(mmap, "nick"),
 	}
 
 	return gm
@@ -1022,11 +1000,3 @@ func maybeBoolP(m map[string]interface{}, k string) *bool {
 	boolval := val.(bool)
 	return &boolval
 }
-
-func maybeArray(m map[string]any, k string) []any {
-	val, ok := m[k]
-	if !ok || val == nil {
-		return nil
-	}
-	return val.([]any)
-}

src/discord/ratelimiting.go

@@ -110,7 +110,7 @@ func createLimiter(headers rateLimitHeaders, routeName string) {
 
 	buckets.Store(routeName, headers.Bucket)
 	ilimiter, loaded := rateLimiters.LoadOrStore(headers.Bucket, &restRateLimiter{
-		requests: make(chan struct{}, 200), // presumably this is big enough to handle bursts
+		requests: make(chan struct{}, 100), // presumably this is big enough to handle bursts
 		refills:  make(chan rateLimiterRefill),
 	})
 	if !loaded {
@@ -124,9 +124,7 @@ func createLimiter(headers rateLimitHeaders, routeName string) {
 			select {
 			case limiter.requests <- struct{}{}:
 			default:
-				log.Warn().
-					Int("remaining", headers.Remaining).
-					Msg("rate limiting channel was too small; you should increase the default capacity")
+				log.Warn().Msg("rate limiting channel was too small; you should increase the default capacity")
 				break prefillloop
 			}
 		}
@@ -160,9 +158,7 @@ func createLimiter(headers rateLimitHeaders, routeName string) {
 					select {
 					case limiter.requests <- struct{}{}:
 					default:
-						log.Warn().
-							Int("maxRequests", refill.maxRequests).
-							Msg("rate limiting channel was too small; you should increase the default capacity")
+						log.Warn().Msg("rate limiting channel was too small; you should increase the default capacity")
 						break refillloop
 					}
 				}

src/discord/rest.go

@@ -652,17 +652,11 @@ func EditOriginalInteractionResponse(ctx context.Context, interactionToken strin
 	return &msg, nil
 }
 
-func GetAuthorizeUrl(state string, includeEmail bool) string {
-	scope := "identify"
-	if includeEmail {
-		scope = "identify email"
-	}
-
+func GetAuthorizeUrl(state string) string {
 	params := make(url.Values)
 	params.Set("response_type", "code")
 	params.Set("client_id", config.Config.Discord.OAuthClientID)
-	params.Set("scope", scope)
-	params.Set("prompt", "none") // immediately redirect back to HMN if already authorized
+	params.Set("scope", "identify")
 	params.Set("state", state)
 	params.Set("redirect_uri", hmnurl.BuildDiscordOAuthCallback())
 	return fmt.Sprintf("%s?%s", buildUrl("/oauth2/authorize"), params.Encode())

src/email/email.go

@@ -48,47 +48,7 @@ func SendRegistrationEmail(
 	perf.EndBlock()
 
 	perf.StartBlock("EMAIL", "Sending email")
-	err = sendMail(toAddress, toName, "[Handmade Network] Registration confirmation", contents)
-	if err != nil {
-		return oops.New(err, "Failed to send email")
-	}
-	perf.EndBlock()
-
-	perf.EndBlock()
-
-	return nil
-}
-
-type ExistingAccountEmailData struct {
-	Name        string
-	Username    string
-	HomepageUrl string
-	LoginUrl    string
-}
-
-func SendExistingAccountEmail(
-	toAddress string,
-	toName string,
-	username string,
-	destination string,
-	perf *perf.RequestPerf,
-) error {
-	perf.StartBlock("EMAIL", "Existing account email")
-
-	perf.StartBlock("EMAIL", "Rendering template")
-	contents, err := renderTemplate("email_account_existing.html", ExistingAccountEmailData{
-		Name:        toName,
-		Username:    username,
-		HomepageUrl: hmnurl.BuildHomepage(),
-		LoginUrl:    hmnurl.BuildLoginPage(destination),
-	})
-	if err != nil {
-		return err
-	}
-	perf.EndBlock()
-
-	perf.StartBlock("EMAIL", "Sending email")
-	err = sendMail(toAddress, toName, "[Handmade Network] You already have an account!", contents)
+	err = sendMail(toAddress, toName, "[handmade.network] Registration confirmation", contents)
 	if err != nil {
 		return oops.New(err, "Failed to send email")
 	}
@@ -120,7 +80,7 @@ func SendPasswordReset(toAddress string, toName string, username string, resetTo
 	perf.EndBlock()
 
 	perf.StartBlock("EMAIL", "Sending email")
-	err = sendMail(toAddress, toName, "[Handmade Network] Your password reset request", contents)
+	err = sendMail(toAddress, toName, "[handmade.network] Your password reset request", contents)
 	if err != nil {
 		return oops.New(err, "Failed to send email")
 	}
@@ -131,41 +91,6 @@ func SendPasswordReset(toAddress string, toName string, username string, resetTo
 	return nil
 }
 
-type TimeMachineEmailData struct {
-	ProfileUrl      string
-	Username        string
-	UserEmail       string
-	DiscordUsername string
-	MediaUrls       []string
-	DeviceInfo      string
-	Description     string
-}
-
-func SendTimeMachineEmail(profileUrl, username, userEmail, discordUsername string, mediaUrls []string, deviceInfo, description string, perf *perf.RequestPerf) error {
-	perf.StartBlock("EMAIL", "Time machine email")
-	defer perf.EndBlock()
-
-	contents, err := renderTemplate("email_time_machine.html", TimeMachineEmailData{
-		ProfileUrl:      profileUrl,
-		Username:        username,
-		UserEmail:       userEmail,
-		DiscordUsername: discordUsername,
-		MediaUrls:       mediaUrls,
-		DeviceInfo:      deviceInfo,
-		Description:     description,
-	})
-	if err != nil {
-		return err
-	}
-
-	err = sendMail("team@handmade.network", "HMN Team", "[Time Machine] New submission", contents)
-	if err != nil {
-		return oops.New(err, "Failed to send email")
-	}
-
-	return nil
-}
-
 var EmailRegex = regexp.MustCompile(`^[^:\p{Cc} ]+@[^:\p{Cc} ]+\.[^:\p{Cc} ]+$`)
 
 func IsEmail(address string) bool {
@@ -174,7 +99,10 @@ func IsEmail(address string) bool {
 
 func renderTemplate(name string, data interface{}) (string, error) {
 	var buffer bytes.Buffer
-	template := templates.GetTemplate(name)
+	template, hasTemplate := templates.Templates[name]
+	if !hasTemplate {
+		return "", oops.New(nil, "Template not found: %s", name)
+	}
 	err := template.Execute(&buffer, data)
 	if err != nil {
 		return "", oops.New(err, "Failed to render template for email")

src/hmndata/jams.go

@@ -17,9 +17,8 @@ type Event struct {
 
 type Jam struct {
 	Event
-	Name    string
-	Slug    string
-	UrlSlug string
+	Name string
+	Slug string
 }
 
 var WRJ2021 = Jam{
@@ -27,9 +26,8 @@ var WRJ2021 = Jam{
 		StartTime: time.Date(2021, 9, 27, 0, 0, 0, 0, time.UTC),
 		EndTime:   time.Date(2021, 10, 4, 0, 0, 0, 0, time.UTC),
 	},
-	Name:    "Wheel Reinvention Jam 2021",
-	Slug:    "WRJ2021",
-	UrlSlug: "2021",
+	Name: "Wheel Reinvention Jam 2021",
+	Slug: "WRJ2021",
 }
 
 var WRJ2022 = Jam{
@@ -37,9 +35,8 @@ var WRJ2022 = Jam{
 		StartTime: time.Date(2022, 8, 15, 0, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
 		EndTime:   time.Date(2022, 8, 22, 8, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
 	},
-	Name:    "Wheel Reinvention Jam 2022",
-	Slug:    "WRJ2022",
-	UrlSlug: "2022",
+	Name: "Wheel Reinvention Jam 2022",
+	Slug: "WRJ2022",
 }
 
 var VJ2023 = Jam{
@@ -47,32 +44,10 @@ var VJ2023 = Jam{
 		StartTime: time.Date(2023, 4, 14, 0, 0, 0, 0, time.UTC),
 		EndTime:   time.Date(2023, 4, 17, 0, 0, 0, 0, time.UTC),
 	},
-	Name:    "Visibility Jam 2023",
-	Slug:    "VJ2023",
-	UrlSlug: "visibility-2023",
+	Name: "Visibility Jam 2023",
+	Slug: "VJ2023",
 }
 
-var WRJ2023 = Jam{
-	Event: Event{
-		StartTime: time.Date(2023, 9, 25, 10, 0, 0, 0, utils.Must1(time.LoadLocation("Europe/London"))),
-		EndTime:   time.Date(2023, 10, 1, 20, 0, 0, 0, utils.Must1(time.LoadLocation("Europe/London"))),
-	},
-	Name:    "Wheel Reinvention Jam 2023",
-	Slug:    "WRJ2023",
-	UrlSlug: "2023",
-}
-
-var LJ2024 = Jam{
-	Event: Event{
-		StartTime: time.Date(2024, 3, 15, 17, 0, 0, 0, time.UTC),
-		EndTime:   time.Date(2024, 3, 25, 0, 0, 0, 0, time.UTC),
-	},
-	Name:    "Learning Jam 2024",
-	Slug:    "LJ2024",
-	UrlSlug: "learning-2024",
-}
-
-// Conferences
 var HMS2022 = Event{
 	StartTime: time.Date(2022, 11, 16, 0, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
 	EndTime:   time.Date(2022, 11, 18, 0, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
@@ -88,17 +63,7 @@ var HMBoston2023 = Event{
 	EndTime:   time.Date(2023, 8, 4, 0, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
 }
 
-var HMS2024 = Event{
-	StartTime: time.Date(2024, 11, 20, 0, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
-	EndTime:   time.Date(2024, 11, 22, 0, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
-}
-
-var HMBoston2024 = Event{
-	StartTime: time.Date(2024, 8, 9, 0, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
-	EndTime:   time.Date(2024, 8, 10, 0, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))),
-}
-
-var AllJams = []Jam{WRJ2021, WRJ2022, VJ2023, WRJ2023, LJ2024}
+var AllJams = []Jam{WRJ2021, WRJ2022}
 
 func CurrentJam() *Jam {
 	now := time.Now()
@@ -110,17 +75,6 @@ func CurrentJam() *Jam {
 	return nil
 }
 
-func PreviousJam() *Jam {
-	now := time.Now()
-	var mostRecent *Jam
-	for i, jam := range AllJams {
-		if jam.EndTime.Before(now) {
-			mostRecent = &AllJams[i]
-		}
-	}
-	return mostRecent
-}
-
 func JamBySlug(slug string) Jam {
 	for _, jam := range AllJams {
 		if jam.Slug == slug {

src/hmnurl/hmnurl_test.go

@@ -70,10 +70,6 @@ func TestLoginPage(t *testing.T) {
 	AssertRegexMatch(t, BuildLoginPage(""), RegexLoginPage, nil)
 }
 
-func TestLoginWithDiscord(t *testing.T) {
-	AssertRegexMatch(t, BuildLoginWithDiscord(""), RegexLoginWithDiscord, nil)
-}
-
 func TestLogoutAction(t *testing.T) {
 	AssertRegexMatch(t, BuildLogoutAction(""), RegexLogoutAction, nil)
 }
@@ -99,9 +95,6 @@ func TestPasswordReset(t *testing.T) {
 func TestStaticPages(t *testing.T) {
 	AssertRegexMatch(t, BuildManifesto(), RegexManifesto, nil)
 	AssertRegexMatch(t, BuildAbout(), RegexAbout, nil)
-	AssertRegexMatch(t, BuildFoundation(), RegexFoundation, nil)
-	AssertRegexMatch(t, BuildStaffRole("test"), RegexStaffRole, nil)
-	AssertRegexMatch(t, BuildStaffRolesIndex(), RegexStaffRolesIndex, nil)
 	AssertRegexMatch(t, BuildCommunicationGuidelines(), RegexCommunicationGuidelines, nil)
 	AssertRegexMatch(t, BuildContactPage(), RegexContactPage, nil)
 	AssertRegexMatch(t, BuildMonthlyUpdatePolicy(), RegexMonthlyUpdatePolicy, nil)
@@ -142,10 +135,9 @@ func TestFeed(t *testing.T) {
 }
 
 func TestProjectIndex(t *testing.T) {
-	AssertRegexMatch(t, BuildProjectIndex(1, ""), RegexProjectIndex, nil)
-	AssertRegexMatch(t, BuildProjectIndex(1, "test"), RegexProjectIndex, map[string]string{"category": "test"})
-	AssertRegexMatch(t, BuildProjectIndex(2, "test"), RegexProjectIndex, map[string]string{"page": "2", "category": "test"})
-	assert.Panics(t, func() { BuildProjectIndex(0, "") })
+	AssertRegexMatch(t, BuildProjectIndex(1), RegexProjectIndex, nil)
+	AssertRegexMatch(t, BuildProjectIndex(2), RegexProjectIndex, map[string]string{"page": "2"})
+	assert.Panics(t, func() { BuildProjectIndex(0) })
 }
 
 func TestProjectNew(t *testing.T) {
@@ -377,10 +369,6 @@ func TestS3Asset(t *testing.T) {
 	AssertRegexMatchFull(t, BuildS3Asset("hello"), RegexS3Asset, map[string]string{"key": "hello"})
 }
 
-func TestJamsIndex(t *testing.T) {
-	AssertRegexMatch(t, BuildJamsIndex(), RegexJamsIndex, nil)
-}
-
 func TestJamIndex(t *testing.T) {
 	AssertRegexMatch(t, BuildJamIndex(), RegexJamIndex, nil)
 	AssertSubdomain(t, BuildJamIndex(), "")
@@ -401,72 +389,6 @@ func TestJamFeed2022(t *testing.T) {
 	AssertSubdomain(t, BuildJamFeed2022(), "")
 }
 
-func TestJamIndex2023_Visibility(t *testing.T) {
-	AssertRegexMatch(t, BuildJamIndex2023_Visibility(), RegexJamIndex2023_Visibility, nil)
-	AssertSubdomain(t, BuildJamIndex2023_Visibility(), "")
-}
-
-func TestJamFeed2023_Visibility(t *testing.T) {
-	AssertRegexMatch(t, BuildJamFeed2023_Visibility(), RegexJamFeed2023_Visibility, nil)
-	AssertSubdomain(t, BuildJamFeed2023_Visibility(), "")
-}
-
-func TestJamRecap2023_Visibility(t *testing.T) {
-	AssertRegexMatch(t, BuildJamRecap2023_Visibility(), RegexJamRecap2023_Visibility, nil)
-	AssertSubdomain(t, BuildJamRecap2023_Visibility(), "")
-}
-
-func TestJamIndex2023(t *testing.T) {
-	AssertRegexMatch(t, BuildJamIndex2023(), RegexJamIndex2023, nil)
-	AssertSubdomain(t, BuildJamIndex2023(), "")
-}
-
-func TestJamFeed2023(t *testing.T) {
-	AssertRegexMatch(t, BuildJamFeed2023(), RegexJamFeed2023, nil)
-	AssertSubdomain(t, BuildJamFeed2023(), "")
-}
-
-func TestJamIndex2024_Learning(t *testing.T) {
-	AssertRegexMatch(t, BuildJamIndex2024_Learning(), RegexJamIndex2024_Learning, nil)
-	AssertSubdomain(t, BuildJamIndex2024_Learning(), "")
-}
-
-func TestJamFeed2024_Learning(t *testing.T) {
-	AssertRegexMatch(t, BuildJamFeed2024_Learning(), RegexJamFeed2024_Learning, nil)
-	AssertSubdomain(t, BuildJamFeed2024_Learning(), "")
-}
-
-func TestTimeMachine(t *testing.T) {
-	AssertRegexMatch(t, BuildTimeMachine(), RegexTimeMachine, nil)
-	AssertSubdomain(t, BuildTimeMachine(), "")
-}
-
-func TestTimeMachineSubmissions(t *testing.T) {
-	AssertRegexMatch(t, BuildTimeMachineSubmissions(), RegexTimeMachineSubmissions, nil)
-	AssertRegexMatch(t, BuildTimeMachineSubmission(123), RegexTimeMachineSubmissions, nil)
-	AssertSubdomain(t, BuildTimeMachineSubmissions(), "")
-}
-
-func TestTimeMachineAtomFeed(t *testing.T) {
-	AssertRegexMatch(t, BuildTimeMachineAtomFeed(), RegexTimeMachineAtomFeed, nil)
-	AssertSubdomain(t, BuildTimeMachineAtomFeed(), "")
-}
-
-func TestTimeMachineForm(t *testing.T) {
-	AssertRegexMatch(t, BuildTimeMachineForm(), RegexTimeMachineForm, nil)
-	AssertSubdomain(t, BuildTimeMachineForm(), "")
-}
-
-func TestTimeMachineFormDone(t *testing.T) {
-	AssertRegexMatch(t, BuildTimeMachineFormDone(), RegexTimeMachineFormDone, nil)
-	AssertSubdomain(t, BuildTimeMachineFormDone(), "")
-}
-
-func TestNewsletterSignup(t *testing.T) {
-	AssertRegexMatch(t, BuildAPINewsletterSignup(), RegexNewsletterSignup, nil)
-	AssertSubdomain(t, BuildAPINewsletterSignup(), "")
-}
-
 func TestProjectNewJam(t *testing.T) {
 	AssertRegexMatch(t, BuildProjectNewJam(), RegexProjectNew, nil)
 	AssertSubdomain(t, BuildProjectNewJam(), "")

src/hmnurl/urls.go

@@ -49,13 +49,6 @@ func BuildWhenIsIt() string {
 	return Url("/whenisit", nil)
 }
 
-var RegexJamsIndex = regexp.MustCompile("^/jams$")
-
-func BuildJamsIndex() string {
-	defer CatchPanic()
-	return Url("/jams", nil)
-}
-
 var RegexJamIndex = regexp.MustCompile("^/jam$")
 
 func BuildJamIndex() string {
@@ -77,27 +70,6 @@ func BuildJamIndex2022() string {
 	return Url("/jam/2022", nil)
 }
 
-var RegexJamFeed2022 = regexp.MustCompile("^/jam/2022/feed$")
-
-func BuildJamFeed2022() string {
-	defer CatchPanic()
-	return Url("/jam/2022/feed", nil)
-}
-
-var RegexJamIndex2023 = regexp.MustCompile("^/jam/2023$")
-
-func BuildJamIndex2023() string {
-	defer CatchPanic()
-	return Url("/jam/2023", nil)
-}
-
-var RegexJamFeed2023 = regexp.MustCompile("^/jam/2023/feed$")
-
-func BuildJamFeed2023() string {
-	defer CatchPanic()
-	return Url("/jam/2023/feed", nil)
-}
-
 var RegexJamIndex2023_Visibility = regexp.MustCompile("^/jam/visibility-2023$")
 
 func BuildJamIndex2023_Visibility() string {
@@ -112,98 +84,11 @@ func BuildJamFeed2023_Visibility() string {
 	return Url("/jam/visibility-2023/feed", nil)
 }
 
-var RegexJamRecap2023_Visibility = regexp.MustCompile("^/jam/visibility-2023/recap$")
+var RegexJamFeed2022 = regexp.MustCompile("^/jam/2022/feed$")
 
-func BuildJamRecap2023_Visibility() string {
+func BuildJamFeed2022() string {
 	defer CatchPanic()
-	return Url("/jam/visibility-2023/recap", nil)
-}
-
-var RegexJamIndex2024_Learning = regexp.MustCompile("^/jam/learning-2024$")
-
-func BuildJamIndex2024_Learning() string {
-	defer CatchPanic()
-	return Url("/jam/learning-2024", nil)
-}
-
-var RegexJamFeed2024_Learning = regexp.MustCompile("^/jam/learning-2024/feed$")
-
-func BuildJamFeed2024_Learning() string {
-	defer CatchPanic()
-	return Url("/jam/learning-2024/feed", nil)
-}
-
-var RegexJamGuidelines2024_Learning = regexp.MustCompile("^/jam/learning-2024/guidelines$")
-
-func BuildJamGuidelines2024_Learning() string {
-	defer CatchPanic()
-	return Url("/jam/learning-2024/guidelines", nil)
-}
-
-var RegexJamSaveTheDate = regexp.MustCompile("^/jam/upcoming$")
-
-func BuildJamSaveTheDate() string {
-	defer CatchPanic()
-	return Url("/jam/upcoming", nil)
-}
-
-func BuildJamIndexAny(slug string) string {
-	defer CatchPanic()
-	return Url(fmt.Sprintf("/jam/%s", slug), nil)
-}
-
-var RegexTimeMachine = regexp.MustCompile("^/timemachine$")
-
-func BuildTimeMachine() string {
-	defer CatchPanic()
-	return Url("/timemachine", nil)
-}
-
-var RegexTimeMachineSubmissions = regexp.MustCompile("^/timemachine/submissions$")
-
-func BuildTimeMachineSubmissions() string {
-	defer CatchPanic()
-	return Url("/timemachine/submissions", nil)
-}
-
-func BuildTimeMachineSubmission(id int) string {
-	defer CatchPanic()
-	return UrlWithFragment("/timemachine/submissions", nil, strconv.Itoa(id))
-}
-
-var RegexTimeMachineAtomFeed = regexp.MustCompile("^/timemachine/submissions/atom$")
-
-func BuildTimeMachineAtomFeed() string {
-	defer CatchPanic()
-	return Url("/timemachine/submissions/atom", nil)
-}
-
-var RegexTimeMachineForm = regexp.MustCompile("^/timemachine/submit$")
-
-func BuildTimeMachineForm() string {
-	defer CatchPanic()
-	return Url("/timemachine/submit", nil)
-}
-
-var RegexTimeMachineFormDone = regexp.MustCompile("^/timemachine/thanks$")
-
-func BuildTimeMachineFormDone() string {
-	defer CatchPanic()
-	return Url("/timemachine/thanks", nil)
-}
-
-var RegexCalendarIndex = regexp.MustCompile("^/calendar$")
-
-func BuildCalendarIndex() string {
-	defer CatchPanic()
-	return Url("/calendar", nil)
-}
-
-var RegexCalendarICal = regexp.MustCompile("^/Handmade Network.ical$")
-
-func BuildCalendarICal() string {
-	defer CatchPanic()
-	return Url("/Handmade Network.ical", nil)
+	return Url("/jam/2022/feed", nil)
 }
 
 // QUESTION(ben): Can we change these routes?
@@ -219,18 +104,7 @@ var RegexLoginPage = regexp.MustCompile("^/login$")
 
 func BuildLoginPage(redirectTo string) string {
 	defer CatchPanic()
-	var q []Q
-	if redirectTo != "" {
-		q = append(q, Q{Name: "redirect", Value: redirectTo})
-	}
-	return Url("/login", q)
-}
-
-var RegexLoginWithDiscord = regexp.MustCompile("^/login-with-discord$")
-
-func BuildLoginWithDiscord(redirectTo string) string {
-	defer CatchPanic()
-	return Url("/login-with-discord", []Q{{Name: "redirect", Value: redirectTo}})
+	return Url("/login", []Q{{Name: "redirect", Value: redirectTo}})
 }
 
 var RegexLogoutAction = regexp.MustCompile("^/logout$")
@@ -485,21 +359,17 @@ func BuildAtomFeedForShowcase() string {
 * Projects
  */
 
-var RegexProjectIndex = regexp.MustCompile(`^/projects(/(?P<category>[a-z0-9-]+)(/(?P<page>\d+))?)?$`)
+var RegexProjectIndex = regexp.MustCompile("^/projects(/(?P<page>.+)?)?$")
 
-func BuildProjectIndex(page int, category string) string {
+func BuildProjectIndex(page int) string {
 	defer CatchPanic()
 	if page < 1 {
 		panic(oops.New(nil, "page must be >= 1"))
 	}
-	catpath := ""
-	if category != "" {
-		catpath = "/" + category
-	}
 	if page == 1 {
-		return Url(fmt.Sprintf("/projects%s", catpath), nil)
+		return Url("/projects", nil)
 	} else {
-		return Url(fmt.Sprintf("/projects%s/%d", catpath, page), nil)
+		return Url(fmt.Sprintf("/projects/%d", page), nil)
 	}
 }
 
@@ -929,12 +799,6 @@ func BuildDiscordShowcaseBacklog() string {
 	return Url("/discord_showcase_backlog", nil)
 }
 
-var RegexDiscordBotDebugPage = regexp.MustCompile("^/discord_bot_debug$")
-
-func BuildDiscordBotDebugPage() string {
-	return Url("/discord_bot_debug", nil)
-}
-
 /*
 * API
  */
@@ -945,12 +809,6 @@ func BuildAPICheckUsername() string {
 	return Url("/api/check_username", nil)
 }
 
-var RegexAPINewsletterSignup = regexp.MustCompile("^/api/newsletter_signup$")
-
-func BuildAPINewsletterSignup() string {
-	return Url("/api/newsletter_signup", nil)
-}
-
 /*
 * Twitch stuff
  */

src/migration/migrations/2023-05-04T024712Z_AddPendingSignups.go

@@ -1,53 +0,0 @@
-package migrations
-
-import (
-	"context"
-	"time"
-
-	"git.handmade.network/hmn/hmn/src/migration/types"
-	"github.com/jackc/pgx/v5"
-)
-
-func init() {
-	registerMigration(AddPendingSignups{})
-}
-
-type AddPendingSignups struct{}
-
-func (m AddPendingSignups) Version() types.MigrationVersion {
-	return types.MigrationVersion(time.Date(2023, 5, 4, 2, 47, 12, 0, time.UTC))
-}
-
-func (m AddPendingSignups) Name() string {
-	return "AddPendingSignups"
-}
-
-func (m AddPendingSignups) Description() string {
-	return "Adds the pending login table"
-}
-
-func (m AddPendingSignups) Up(ctx context.Context, tx pgx.Tx) error {
-	_, err := tx.Exec(ctx,
-		`
-		CREATE TABLE pending_login (
-			id VARCHAR(40) NOT NULL PRIMARY KEY,
-			expires_at TIMESTAMP WITH TIME ZONE NOT NULL,
-			destination_url VARCHAR(999) NOT NULL
-		)
-		`,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m AddPendingSignups) Down(ctx context.Context, tx pgx.Tx) error {
-	_, err := tx.Exec(ctx, `DROP TABLE pending_login`)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

src/migration/migrations/2023-05-10T235209Z_AddThumbnailToAsset.go

@@ -1,47 +0,0 @@
-package migrations
-
-import (
-	"context"
-	"time"
-
-	"git.handmade.network/hmn/hmn/src/migration/types"
-	"github.com/jackc/pgx/v5"
-)
-
-func init() {
-	registerMigration(AddThumbnailToAsset{})
-}
-
-type AddThumbnailToAsset struct{}
-
-func (m AddThumbnailToAsset) Version() types.MigrationVersion {
-	return types.MigrationVersion(time.Date(2023, 5, 10, 23, 52, 9, 0, time.UTC))
-}
-
-func (m AddThumbnailToAsset) Name() string {
-	return "AddThumbnailToAsset"
-}
-
-func (m AddThumbnailToAsset) Description() string {
-	return "Adds thumbnail S3 key to assets"
-}
-
-func (m AddThumbnailToAsset) Up(ctx context.Context, tx pgx.Tx) error {
-	_, err := tx.Exec(ctx,
-		`
-		ALTER TABLE asset
-		ADD COLUMN thumbnail_s3_key VARCHAR(2000);
-		`,
-	)
-	return err
-}
-
-func (m AddThumbnailToAsset) Down(ctx context.Context, tx pgx.Tx) error {
-	_, err := tx.Exec(ctx,
-		`
-		ALTER TABLE asset
-		DROP COLUMN thumbnail_s3_key;
-		`,
-	)
-	return err
-}

src/migration/migrations/2024-03-28T184107Z_AddBackfillToDiscordMessage.go

@@ -1,47 +0,0 @@
-package migrations
-
-import (
-	"context"
-	"time"
-
-	"git.handmade.network/hmn/hmn/src/migration/types"
-	"github.com/jackc/pgx/v5"
-)
-
-func init() {
-	registerMigration(AddBackfillToDiscordMessage{})
-}
-
-type AddBackfillToDiscordMessage struct{}
-
-func (m AddBackfillToDiscordMessage) Version() types.MigrationVersion {
-	return types.MigrationVersion(time.Date(2024, 3, 28, 18, 41, 7, 0, time.UTC))
-}
-
-func (m AddBackfillToDiscordMessage) Name() string {
-	return "AddBackfillToDiscordMessage"
-}
-
-func (m AddBackfillToDiscordMessage) Description() string {
-	return "Add a backfill flag to discord messages"
-}
-
-func (m AddBackfillToDiscordMessage) Up(ctx context.Context, tx pgx.Tx) error {
-	_, err := tx.Exec(ctx,
-		`
-		ALTER TABLE discord_message
-		ADD COLUMN backfilled BOOLEAN NOT NULL default FALSE;
-		`,
-	)
-	return err
-}
-
-func (m AddBackfillToDiscordMessage) Down(ctx context.Context, tx pgx.Tx) error {
-	_, err := tx.Exec(ctx,
-		`
-		ALTER TABLE discord_message
-		DROP COLUMN backfilled;
-		`,
-	)
-	return err
-}

src/migration/migrations/2024-05-07T013432Z_newsletter.go

@@ -1,47 +0,0 @@
-package migrations
-
-import (
-	"context"
-	"time"
-
-	"git.handmade.network/hmn/hmn/src/migration/types"
-	"github.com/jackc/pgx/v5"
-)
-
-func init() {
-	registerMigration(newsletter{})
-}
-
-type newsletter struct{}
-
-func (m newsletter) Version() types.MigrationVersion {
-	return types.MigrationVersion(time.Date(2024, 5, 7, 1, 34, 32, 0, time.UTC))
-}
-
-func (m newsletter) Name() string {
-	return "newsletter"
-}
-
-func (m newsletter) Description() string {
-	return "Adds the newsletter signup"
-}
-
-func (m newsletter) Up(ctx context.Context, tx pgx.Tx) error {
-	_, err := tx.Exec(ctx,
-		`
-		CREATE TABLE newsletter_emails (
-			email VARCHAR(255) NOT NULL PRIMARY KEY
-		);
-		`,
-	)
-	return err
-}
-
-func (m newsletter) Down(ctx context.Context, tx pgx.Tx) error {
-	_, err := tx.Exec(ctx,
-		`
-		DROP TABLE newsletter_emails;
-		`,
-	)
-	return err
-}

src/migration/seed.go

@@ -189,7 +189,7 @@ func seedUser(ctx context.Context, conn db.ConnOrTx, input models.User) *models.
 			$6, $7, $8, $9,
 			TRUE,
 			$10,
-			'2017-01-01T00:00:00Z', '192.168.2.1', NULL
+			'2017-01-01T00:00:00Z', '192.168.2.1', null
 		)
 		RETURNING $columns
 		`,

src/models/asset.go

@@ -8,12 +8,11 @@ type Asset struct {
 	ID         uuid.UUID `db:"id"`
 	UploaderID *int      `db:"uploader_id"`
 
-	S3Key          string `db:"s3_key"`
-	ThumbnailS3Key string `db:"thumbnail_s3_key"`
-	Filename       string `db:"filename"`
-	Size           int    `db:"size"`
-	MimeType       string `db:"mime_type"`
-	Sha1Sum        string `db:"sha1sum"`
-	Width          int    `db:"width"`
-	Height         int    `db:"height"`
+	S3Key    string `db:"s3_key"`
+	Filename string `db:"filename"`
+	Size     int    `db:"size"`
+	MimeType string `db:"mime_type"`
+	Sha1Sum  string `db:"sha1sum"`
+	Width    int    `db:"width"`
+	Height   int    `db:"height"`
 }

src/models/user.go

@@ -71,9 +71,3 @@ func (u *User) CanSeeUnpublishedEducationContent() bool {
 func (u *User) CanAuthorEducation() bool {
 	return u.IsStaff || u.EducationRole == EduRoleAuthor
 }
-
-type PendingLogin struct {
-	ID             string    `db:"id"`
-	ExpiresAt      time.Time `db:"expires_at"`
-	DestinationUrl string    `db:"destination_url"`
-}

src/rawdata/scss/_core.scss

@@ -167,6 +167,14 @@ article code {
   margin-right: auto;
 }
 
+.flex-shrink-0 {
+  flex-shrink: 0;
+}
+
+.flex-grow-1 {
+  flex-grow: 1;
+}
+
 .flex-fair {
   flex-basis: 1px;
   flex-grow: 1;
@@ -364,22 +372,6 @@ article code {
 .g4 { gap: $spacing-large; }
 .g5 { gap: $spacing-extra-large; }
 
-.grid {
-  display: grid;
-}
-
-.grid-1 {
-  grid-template-columns: 1fr;
-}
-
-.grid-2 {
-  grid-template-columns: 1fr 1fr;
-}
-
-.aspect-ratio--2x1 {
-  padding-bottom: 50%;
-}
-
 .hide-if-empty:empty {
   display: none !important;
 }
@@ -396,19 +388,10 @@ article code {
   .cg3-ns { column-gap: $spacing-medium; }
   .cg4-ns { column-gap: $spacing-large; }
   .cg5-ns { column-gap: $spacing-extra-large; }
-  .grid-1-ns { grid-template-columns: 1fr; }
-  .grid-2-ns { grid-template-columns: 1fr 1fr; }
 
   .bg--dim-ns {
     @include usevar(background-color, dim-background);
   }
-
-  .g0-ns { gap: $spacing-none; }
-  .g1-ns { gap: $spacing-extra-small; }
-  .g2-ns { gap: $spacing-small; }
-  .g3-ns { gap: $spacing-medium; }
-  .g4-ns { gap: $spacing-large; }
-  .g5-ns { gap: $spacing-extra-large; }
 }
 
 @media #{$breakpoint-medium} {
@@ -422,19 +405,10 @@ article code {
   .cg3-m { column-gap: $spacing-medium; }
   .cg4-m { column-gap: $spacing-large; }
   .cg5-m { column-gap: $spacing-extra-large; }
-  .grid-1-m { grid-template-columns: 1fr; }
-  .grid-2-m { grid-template-columns: 1fr 1fr; }
 
   .bg--dim-m {
     @include usevar(background-color, dim-background);
   }
-
-  .g0-m { gap: $spacing-none; }
-  .g1-m { gap: $spacing-extra-small; }
-  .g2-m { gap: $spacing-small; }
-  .g3-m { gap: $spacing-medium; }
-  .g4-m { gap: $spacing-large; }
-  .g5-m { gap: $spacing-extra-large; }
 }
 
 @media #{$breakpoint-large} {
@@ -448,19 +422,10 @@ article code {
   .cg3-l { column-gap: $spacing-medium; }
   .cg4-l { column-gap: $spacing-large; }
   .cg5-l { column-gap: $spacing-extra-large; }
-  .grid-1-l { grid-template-columns: 1fr; }
-  .grid-2-l { grid-template-columns: 1fr 1fr; }
 
   .bg--dim-l {
     @include usevar(background-color, dim-background);
   }
-
-  .g0-l { gap: $spacing-none; }
-  .g1-l { gap: $spacing-extra-small; }
-  .g2-l { gap: $spacing-small; }
-  .g3-l { gap: $spacing-medium; }
-  .g4-l { gap: $spacing-large; }
-  .g5-l { gap: $spacing-extra-large; }
 }
 
 .not-first:first-child {

src/rawdata/scss/_header.scss

@@ -130,21 +130,33 @@ header {
     @include usevar(background-color, login-popup-background);
     @include usevar(color, fg-font-color);
     
+    @extend .pa3;
+    
+    border-width: 1px;
+    border-style: dashed;
+    @extend .b--dimmest;
+    
     visibility: hidden;
     position: absolute;
     z-index: 12;
+    margin-top: 10px;
+    right: 0px;
+    top: 20px;
+    width: 290px;
+    max-height: 0px;
     overflow: hidden;
-    right: 0;
-    top: 100%;
-    width: 100%;
+    opacity: 0;
+    
+    transition: all 0.2s;
     
     &.open {
+      max-height: 170px;
+      opacity: 1;
       visibility: visible;
     }
-
-    @media #{$breakpoint-not-small} {
-      top: 2.2rem;
-      width: 17rem;
+    
+    label {
+      padding-right:10px;
     }
   }
 }

src/templates/mapping.go

@@ -8,7 +8,6 @@ import (
 	"strconv"
 	"strings"
 
-	"git.handmade.network/hmn/hmn/src/calendar"
 	"git.handmade.network/hmn/hmn/src/hmndata"
 	"git.handmade.network/hmn/hmn/src/hmnurl"
 	"git.handmade.network/hmn/hmn/src/models"
@@ -103,9 +102,6 @@ func ProjectToTemplate(
 func ProjectAndStuffToTemplate(p *hmndata.ProjectAndStuff, url string, theme string) Project {
 	res := ProjectToTemplate(&p.Project, url)
 	res.Logo = ProjectLogoUrl(&p.Project, p.LogoLightAsset, p.LogoDarkAsset, theme)
-	for _, o := range p.Owners {
-		res.Owners = append(res.Owners, UserToTemplate(o, theme))
-	}
 	return res
 }
 
@@ -223,11 +219,6 @@ func UserToTemplate(u *models.User, currentTheme string) User {
 	}
 }
 
-var UnknownUser = User{
-	Name:      "Unknown User",
-	AvatarUrl: UserAvatarUrl(nil, ""),
-}
-
 // An online site/service for which we recognize the link
 type LinkService struct {
 	Name     string
@@ -531,16 +522,6 @@ func EducationArticleToTemplate(a *models.EduArticle) EduArticle {
 	return res
 }
 
-func CalendarEventToTemplate(ev *calendar.CalendarEvent) CalendarEvent {
-	return CalendarEvent{
-		Name:      ev.Name,
-		Desc:      ev.Desc,
-		StartTime: ev.StartTime.UTC(),
-		EndTime:   ev.EndTime.UTC(),
-		CalName:   ev.CalName,
-	}
-}
-
 func maybeString(s *string) string {
 	if s == nil {
 		return ""

src/templates/src/auth_login.html

@@ -37,18 +37,6 @@
 			<div class="tc pa3">
 				Need an account? <a href="{{ .RegisterUrl }}">Sign up.</a>
 			</div>
-
-			<div class="mt3 tc">
-				<div class="b mb1">Third-party login</div>
-				<div class="flex flex-column g1">
-					<a href="{{ .LoginWithDiscordUrl }}" class="db br2 overflow-hidden flex" title="Log in with Discord">
-						<img
-							src="{{ static "discord-login.svg" }}"
-							alt="Log in with Discord"
-						>
-					</a>
-				</div>
-			</div>
 		</form>
 	</div>
 </div>

src/templates/src/calendar_index.html

@@ -1,92 +0,0 @@
-{{ template "base.html" . }}
-
-{{ define "content" }}
-<div class="ph3 ph0-ns">
-    <h2>Future events</h2>
-	<div class="cal_toggles mb2 flex flex-row g2">
-		{{ range .Calendars }}
-			<label class="db br3 pv1 ph2 pointer b--gray ba" for="{{ . }}">
-				<input id="{{ . }}" autocomplete="off" type="checkbox" value="{{ . }}" checked />
-				<span>{{ . }}</span>
-			</label>
-		{{ end }}
-	</div>
-	<div class="">
-		<a class="ical_link" href="{{ .BaseICalUrl }}">Copy iCal Url</a>
-	</div>
-	<div class="flex flex-column g2">
-		{{ range .Events }}
-			<div data-calname="{{ .CalName }}" class="cal_event timeline-item pa3 br3">
-				<div>{{ timehtmlcontent .StartTime }}</div>
-				<div>
-					<strong class="f4 c--theme">{{ .Name }}</strong>
-				</div>
-				{{ with .Desc }}
-					<div class="mb2">{{ . }}</div>
-				{{ end }}
-				{{ with .CalName }}
-					<div class="dib br2 ba b--gray ph1 f7">{{ . }}</div>
-				{{ end }}
-			</div>
-		{{ end }}
-	</div>
-</div>
-<script>
-	let events = document.querySelectorAll(".cal_event");
-	let toggles = document.querySelectorAll(".cal_toggles input");
-	let icalLink = document.querySelector(".ical_link");
-	let baseICalUrl = icalLink.href;
-
-	function refreshEvents() {
-		let cals = {};
-		for (let i = 0; i < toggles.length; ++i) {
-			cals[toggles[i].id] = toggles[i].checked;
-		}
-
-		for (let i = 0; i < events.length; ++i) {
-			let ev = events[i];
-			let calName = ev.getAttribute("data-calname");
-			if (cals[calName]) {
-				ev.style.display = "block";
-			} else {
-				ev.style.display = "none";
-			}
-		}
-
-		let icalFilter = [];
-		let hasAll = true;
-		for (let i = 0; i < toggles.length; ++i) {
-			if (toggles[i].checked) {
-				icalFilter.push(toggles[i].id);
-			} else {
-				hasAll = false;
-			}
-		}
-
-		icalLink.disabled = false;
-		if (hasAll) {
-			icalLink.href = baseICalUrl;
-		} else if (icalFilter.length == 0) {
-			icalLink.removeAttribute("href");
-		} else {
-			icalFilter.sort();
-			let url = new URL(baseICalUrl);
-			let params = new URLSearchParams();
-			for (let i = 0; i < icalFilter.length; ++i) {
-				params.append(icalFilter[i], "true");
-			}
-			url.search = params.toString();
-			icalLink.href = url.toString();
-		}
-	}
-
-	for (let i = 0; i < toggles.length; ++i) {
-		toggles[i].addEventListener("input", refreshEvents);
-	}
-
-	icalLink.addEventListener("click", function(ev) {
-		ev.preventDefault();
-		navigator.clipboard.writeText(icalLink.href);
-	});
-</script>
-{{ end }}

src/templates/src/conferences.html

@@ -13,13 +13,12 @@
 	</div>
 
 	<div>
-		<a href="https://handmadecities.com/">
-			<h2>Handmade Cities</h2>
+		<a href="https://handmade-seattle.com/">
+			<h2>Handmade Seattle</h2>
 		</a>
 		<div class="{{ $bannerclass }}" style="background-image: url('{{ static "hms/banner_tall.jpg" }}')"></div>
-		<p>The Handmade Cities conferences are spiritual successors to HandmadeCon. Handmade Seattle is the flagship conference, a celebration of Handmade software and the Handmade community. Handmade Boston is a smaller conference featuring masterclass sessions that dive deep into technical details.</p>
-		<p>The Handmade Cities conferences are run by Abner Coimbre, founder of Handmade Network. Abner's conferences are completely independent and always free of corporate sponsorships. Both conferences are hybrid, with online and in-person tracks, so you can participate no matter where you are in the world.</p>
-		<p>Tickets can be purchased at <a href="https://handmadecities.com/">the conference website</a>.</p>
+		<p>Handmade Seattle, the spiritual successor to HandmadeCon, was started in 2019 by Abner Coimbre, the founder of Handmade Network. From the start, Handmade Seattle has been an independent conference, free from corporate sponsorships. The conferences are hybrid online/physical, so you can participate no matter where in the world you live.</p>
+		<p>Tickets can be purchased at <a href="https://handmade-seattle.com/">the conference website</a>.</p>
 		<p><a href="https://guide.handmade-seattle.com/c/">Talks and demos</a> can be viewed on the conference's website.</p>
 	</div>
 </div>

src/templates/src/discord_bot_debug.html

@@ -1,22 +0,0 @@
-{{ template "base.html" . }}
-
-{{ define "content" }}
-	<table>
-	<thead>
-		<tr>
-			<td>Timestamp</td>
-			<td>Name</td>
-			<td>Extras</td>
-		</tr>
-	</thead>
-	<tbody>
-		{{ range .BotEvents }}
-			<tr>
-				<td>{{ rfc3339 .Timestamp }}</td>
-				<td>{{ .Name }}</td>
-				<td>{{ .Extra }}</td>
-			</tr>
-		{{ end }}
-	</tbody>
-	</table>
-{{ end }}

src/templates/src/email_account_existing.html

@@ -1,16 +0,0 @@
-<p>
-    Hello {{ .Name }} - you already have a <a href="{{ .HomepageUrl }}">Handmade Network</a> account. Welcome back!
-</p>
-<p>
-    Your username is <b>{{ .Username }}</b>. To sign in, please visit the following link and try signing in with your existing username:
-</p>
-<p>
-    <a href="{{ .LoginUrl }}">{{ .LoginUrl }}</a>
-</p>
-<p>Thanks,<br />
-The Handmade Network staff.</p>
-
-<hr />
-<p style="font-size:small; -webkit-text-size-adjust:none; color: #666">
-You are receiving this email because someone tried creating a new account with your email address at <a href="{{ .HomepageUrl }}">handmade.network</a>. If that wasn't you, kindly ignore this email.
-</p>

src/templates/src/email_registration.html

@@ -5,7 +5,7 @@
     To complete the registration process, please use the following link:
 </p>
 <p>
-    <a href="{{ .CompleteRegistrationUrl }}">{{ .CompleteRegistrationUrl }}</a>
+    <a href="{{ .CompleteRegistrationUrl }}">{{ .CompleteRegistrationUrl }}</a>.
 </p>
 <p>Thanks,<br />
 The Handmade Network staff.</p>

src/templates/src/email_time_machine.html

@@ -1,11 +0,0 @@
-<p>Submission by <b><a href="{{ .ProfileUrl }}">{{ .Username }}</a></b> ({{ .UserEmail }}) {{ if .DiscordUsername }} On Discord: {{ .DiscordUsername }} {{ end }}</p>
-<p>Submitted urls:<p>
-<ul>
-    {{ range .MediaUrls }}
-        <li><a href="{{ . }}">{{ . }}</a></li>
-    {{ end }}
-</ul>
-Device info:<br />
-<pre>{{ .DeviceInfo }}</pre>
-Description:<br />
-<pre>{{ .Description }}</pre>