chunking away at it

internal/db/model/account.go

@@ -23,6 +23,7 @@
 package model
 
 import (
+	"crypto/rsa"
 	"net/url"
 	"time"
 )
@@ -82,6 +83,8 @@ type Account struct {
 	SubscriptionExpiresAt time.Time `pg:"type:timestamp"`
 	// Does this account identify itself as a bot?
 	Bot bool
+	// What reason was given for signing up when this account was created?
+	Reason string
 
 	/*
 		PRIVACY SETTINGS
@@ -123,9 +126,9 @@ type Account struct {
 
 	Secret string
 	// Privatekey for validating activitypub requests, will obviously only be defined for local accounts
-	PrivateKey string
+	PrivateKey *rsa.PrivateKey
 	// Publickey for encoding activitypub requests, will be defined for both local and remote accounts
-	PublicKey string
+	PublicKey *rsa.PublicKey
 
 	/*
 		ADMIN FIELDS

internal/db/model/domainblock.go

@@ -35,13 +35,13 @@ type DomainBlock struct {
 	// Account ID of the creator of this block
 	CreatedByAccountID string `pg:",notnull"`
 	// TODO: define this
-	Severity           int
+	Severity int
 	// Reject media from this domain?
-	RejectMedia        bool
+	RejectMedia bool
 	// Reject reports from this domain?
-	RejectReports      bool
+	RejectReports bool
 	// Private comment on this block, viewable to admins
-	PrivateComment     string
+	PrivateComment string
 	// Public comment on this block, viewable (optionally) by everyone
-	PublicComment      string
+	PublicComment string
 }