Fix up missing avatars

src/discord/message_handling.go

@@ -227,7 +227,6 @@ func FetchInternedMessage(ctx context.Context, dbConn db.ConnOrTx, msgId string)
 			LEFT JOIN discord_message_content AS content ON content.message_id = message.id
 			LEFT JOIN discord_user AS duser ON duser.userid = message.user_id
 			LEFT JOIN hmn_user AS hmnuser ON hmnuser.id = duser.hmn_user_id
-			LEFT JOIN asset AS hmnuser_avatar ON hmnuser_avatar.id = hmnuser.avatar_asset_id
 		WHERE message.id = $1
 		`,
 		msgId,

src/hmndata/threads_and_posts_helper.go

@@ -141,6 +141,8 @@ func FetchThreads(
 
 	type resultRow struct {
 		ThreadAndStuff
+		FirstPostAuthorAvatar *models.Asset `db:"first_author_avatar"`
+		LastPostAuthorAvatar  *models.Asset `db:"last_author_avatar"`
 		ThreadLastReadTime    *time.Time    `db:"tlri.lastread"`
 		ForumLastReadTime     *time.Time    `db:"slri.lastread"`
 	}
@@ -152,6 +154,13 @@ func FetchThreads(
 
 	result := make([]ThreadAndStuff, len(rows))
 	for i, row := range rows {
+		if row.FirstPostAuthor != nil {
+			row.FirstPostAuthor.AvatarAsset = row.FirstPostAuthorAvatar
+		}
+		if row.LastPostAuthor != nil {
+			row.LastPostAuthor.AvatarAsset = row.LastPostAuthorAvatar
+		}
+
 		hasRead := false
 		if currentUser != nil && currentUser.MarkedAllReadAt.After(row.LastPost.PostDate) {
 			hasRead = true
@@ -320,6 +329,9 @@ func FetchPosts(
 
 	type resultRow struct {
 		PostAndStuff
+		AuthorAvatar       *models.Asset `db:"author_avatar"`
+		EditorAvatar       *models.Asset `db:"editor_avatar"`
+		ReplyAuthorAvatar  *models.Asset `db:"reply_author_avatar"`
 		ThreadLastReadTime *time.Time    `db:"tlri.lastread"`
 		ForumLastReadTime  *time.Time    `db:"slri.lastread"`
 	}
@@ -410,6 +422,16 @@ func FetchPosts(
 
 	result := make([]PostAndStuff, len(rows))
 	for i, row := range rows {
+		if row.Author != nil {
+			row.Author.AvatarAsset = row.AuthorAvatar
+		}
+		if row.Editor != nil {
+			row.Editor.AvatarAsset = row.EditorAvatar
+		}
+		if row.ReplyAuthor != nil {
+			row.ReplyAuthor.AvatarAsset = row.ReplyAuthorAvatar
+		}
+
 		hasRead := false
 		if currentUser != nil && currentUser.MarkedAllReadAt.After(row.Post.PostDate) {
 			hasRead = true