fix: misc cleanup

ferri-main/src/types/ap.rs

@@ -0,0 +1,223 @@
+use super::*;
+use serde::{Deserialize, Serialize};
+use url::Url;
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub enum ActivityType {
+    Reject,
+    Create,
+    Note,
+    Delete,
+    Undo,
+    Accept,
+    Announce,
+    Person,
+    Like,
+    Follow,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MinimalActivity {
+    #[serde(flatten)]
+    pub obj: Object,
+
+    #[serde(rename = "type")]
+    pub ty: ActivityType,
+}
+
+pub type DeleteActivity = BasicActivity;
+pub type LikeActivity = BasicActivity;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct BasicActivity {
+    #[serde(flatten)]
+    pub obj: Object,
+
+    pub object: String,
+    pub actor: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct CreateActivity {
+    #[serde(flatten)]
+    pub obj: Object,
+
+    #[serde(rename = "type")]
+    pub ty: ActivityType,
+
+    pub object: Post,
+    pub actor: String,
+    pub to: Vec<String>,
+    pub cc: Vec<String>,
+
+    #[serde(rename = "published")]
+    pub ts: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct FollowActivity {
+    #[serde(flatten)]
+    pub obj: Object,
+
+    #[serde(rename = "type")]
+    pub ty: ActivityType,
+
+    pub object: String,
+    pub actor: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct AcceptActivity {
+    #[serde(flatten)]
+    pub obj: Object,
+    
+    #[serde(rename = "type")]
+    pub ty: ActivityType,
+
+    pub object: String,
+    pub actor: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct BoostActivity {
+    #[serde(flatten)]
+    pub obj: Object,
+
+    #[serde(rename = "type")]
+    pub ty: ActivityType,
+
+    pub actor: String,
+    pub published: String,
+    pub to: Vec<String>,
+    pub cc: Vec<String>,
+    pub object: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum PostAttachmentType {
+    Document
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct PostAttachment {
+    #[serde(rename = "type")]
+    pub ty: PostAttachmentType,
+    
+    pub media_type: String,
+    pub url: String,
+    #[serde(deserialize_with = "deserialize_null_default")]
+    pub name: String,
+    
+    pub summary: Option<String>,
+    #[serde(default)]
+    pub sensitive: bool
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Post {
+    #[serde(flatten)]
+    pub obj: Object,
+
+    #[serde(rename = "type")]
+    pub ty: ActivityType,
+
+    #[serde(rename = "published")]
+    pub ts: String,
+    pub content: String,
+    pub to: Vec<String>,
+    pub cc: Vec<String>,
+
+    pub attachment: Vec<PostAttachment>,
+
+    #[serde(rename = "attributedTo")]
+    pub attributed_to: Option<String>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct Actor {
+    #[serde(flatten)]
+    pub obj: Object,
+
+    pub inbox: String,
+    pub outbox: String,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub enum IconType {
+    Image
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct PersonIcon {
+    #[serde(rename = "type")]
+    pub ty: IconType,
+    pub url: String,
+
+    #[serde(default)]
+    pub summary: String,
+    #[serde(default)]
+    pub width: i64,
+    #[serde(default)]
+    pub height: i64
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct Person {
+    #[serde(flatten)]
+    pub obj: Object,
+
+    #[serde(rename = "type")]
+    pub ty: ActivityType,
+
+    pub following: String,
+    pub followers: String,
+
+    pub summary: String,
+    pub inbox: String,
+    pub outbox: String,
+
+    pub preferred_username: String,
+    pub name: String,
+
+    pub public_key: Option<UserKey>,
+
+    pub icon: Option<PersonIcon>
+}
+
+pub struct RemoteInfo {
+    pub is_remote: bool,
+    pub web_url: String,
+    pub acct: String
+}
+
+impl Person {
+    pub fn remote_info(&self) -> RemoteInfo {
+        let url = Url::parse(&self.obj.id.0).unwrap();
+        let host = url.host_str().unwrap();
+
+        let (acct, remote) = if host != "ferri.amy.mov" {
+            (format!("{}@{}", self.preferred_username, host), true)
+        } else {
+            (self.preferred_username.clone(), false)
+        };
+
+        let url = format!("https://ferri.amy.mov/{}", acct);
+
+        RemoteInfo {
+            acct: acct.to_string(),
+            web_url: url,
+            is_remote: remote,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct UserKey {
+    pub id: String,
+    pub owner: String,
+
+    #[serde(rename = "publicKeyPem")]
+    pub public_key: String,
+}

ferri-main/src/types/api.rs

@@ -0,0 +1,231 @@
+use super::*;
+use serde::{Deserialize, Serialize};
+
+// API will not really use actors so treat them as DB actors
+// until we require specificity
+pub type Actor = db::Actor;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct CredentialApplication {
+    pub name: String,
+    pub scopes: String,
+    pub redirect_uris: Vec<String>,
+    pub client_id: String,
+    pub client_secret: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+pub struct WebfingerLink {
+    pub rel: String,
+    #[serde(rename = "type")]
+    pub ty: Option<String>,
+    pub href: Option<String>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+pub struct WebfingerHit {
+    pub subject: String,
+    pub aliases: Vec<String>,
+    pub links: Vec<WebfingerLink>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct StatusAttachment {
+    pub id: ObjectUuid,
+    #[serde(rename = "type")]
+    pub ty: String,
+    
+    pub url: String,
+    pub description: String
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct Status {
+    pub id: ObjectUuid,
+    pub created_at: String,
+    pub in_reply_to_id: Option<ObjectUri>,
+    pub in_reply_to_account_id: Option<ObjectUri>,
+    pub sensitive: bool,
+    pub spoiler_text: String,
+    pub visibility: String,
+    pub language: String,
+    pub uri: ObjectUri,
+    pub url: String,
+    pub replies_count: i64,
+    pub reblogs_count: i64,
+    pub favourites_count: i64,
+    pub favourited: bool,
+    pub reblogged: bool,
+    pub muted: bool,
+    pub bookmarked: bool,
+    pub content: String,
+    pub reblog: Option<Box<Status>>,
+    pub application: Option<()>,
+    pub account: Account,
+    pub media_attachments: Vec<StatusAttachment>,
+    pub mentions: Vec<Option<()>>,
+    pub tags: Vec<Option<()>>,
+    pub emojis: Vec<Option<()>>,
+    pub card: Option<()>,
+    pub poll: Option<()>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct Account {
+    pub id: ObjectUuid,
+    pub username: String,
+    pub acct: String,
+    pub display_name: String,
+
+    pub locked: bool,
+    pub bot: bool,
+
+    pub created_at: String,
+    pub attribution_domains: Vec<String>,
+
+    pub note: String,
+    pub url: String,
+
+    pub avatar: String,
+    pub avatar_static: String,
+    pub header: String,
+    pub header_static: String,
+
+    pub followers_count: i64,
+    pub following_count: i64,
+    pub statuses_count: i64,
+    pub last_status_at: Option<String>,
+
+    pub emojis: Vec<Emoji>,
+    pub fields: Vec<CustomField>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct Emoji {
+    pub shortcode: String,
+    pub url: String,
+    pub static_url: String,
+    pub visible_in_picker: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct CustomField {
+    pub name: String,
+    pub value: String,
+    pub verified_at: Option<String>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Instance {
+    pub domain: String,
+    pub title: String,
+    pub version: String,
+    pub source_url: String,
+    pub description: String,
+    pub thumbnail: Thumbnail,
+    pub icon: Vec<Icon>,
+    pub languages: Vec<String>,
+    pub configuration: Configuration,
+    pub registrations: Registrations,
+    pub contact: Contact,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Configuration {
+    pub urls: Urls,
+    pub accounts: Accounts,
+    pub statuses: Statuses,
+    pub media_attachments: MediaAttachments,
+    pub polls: Polls,
+    pub translation: Translation,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Accounts {
+    pub max_featured_tags: i64,
+    pub max_pinned_statuses: i64,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct MediaAttachments {
+    pub supported_mime_types: Vec<String>,
+    pub description_limit: i64,
+    pub image_size_limit: i64,
+    pub image_matrix_limit: i64,
+    pub video_size_limit: i64,
+    pub video_frame_rate_limit: i64,
+    pub video_matrix_limit: i64,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Polls {
+    pub max_options: i64,
+    pub max_characters_per_option: i64,
+    pub min_expiration: i64,
+    pub max_expiration: i64,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Statuses {
+    pub max_characters: i64,
+    pub max_media_attachments: i64,
+    pub characters_reserved_per_url: i64,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Translation {
+    pub enabled: bool,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Urls {
+    pub streaming: String,
+    pub about: String,
+    pub privacy_policy: String,
+    pub terms_of_service: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Contact {
+    pub email: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Field {
+    pub name: String,
+    pub value: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Icon {
+    pub src: String,
+    pub size: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Registrations {
+    pub enabled: bool,
+    pub approval_required: bool,
+    pub reason_required: bool,
+    pub message: Option<String>,
+    pub min_age: i64,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Thumbnail {
+    pub url: String,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Preferences {
+    #[serde(rename = "posting:default:visibility")]
+    pub posting_default_visibility: String,
+    #[serde(rename = "posting:default:sensitive")]
+    pub posting_default_sensitive: bool,
+    #[serde(rename = "posting:default:language")]
+    pub posting_default_language: Option<String>,
+    #[serde(rename = "reading:expand:media")]
+    pub reading_expand_media: String,
+    #[serde(rename = "reading:expand:spoilers")]
+    pub reading_expand_spoilers: bool,
+}

ferri-main/src/types/db.rs

@@ -0,0 +1,59 @@
+use super::*;
+use chrono::{DateTime, Utc};
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct Follow {
+    pub id: ObjectUri,
+    pub follower: ObjectUri,
+    pub followed: ObjectUri,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct Actor {
+    pub id: ObjectUri,
+    pub inbox: String,
+    pub outbox: String,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct UserPosts {
+    // User may have no posts
+    pub last_post_at: Option<DateTime<Utc>>,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct User {
+    pub id: ObjectUuid,
+    pub actor: Actor,
+    pub username: String,
+    pub display_name: String,
+    pub acct: String,
+    pub remote: bool,
+    pub url: String,
+    pub created_at: DateTime<Utc>,
+    pub icon_url: String,
+
+    pub posts: UserPosts,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct Attachment {
+    pub id: ObjectUuid,
+    pub post_id: ObjectUuid,
+    pub url: String,
+    pub media_type: Option<String>,
+    pub sensitive: bool,
+    pub alt: Option<String>
+}
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct Post {
+    pub id: ObjectUuid,
+    pub uri: ObjectUri,
+    pub user: User,
+    pub content: String,
+    pub created_at: DateTime<Utc>,
+    pub boosted_post: Option<Box<Post>>,
+    pub attachments: Vec<Attachment>
+}
+

ferri-main/src/types/mod.rs

@@ -7,6 +7,10 @@ pub mod convert;
 pub mod get;
 pub mod make;
 
+pub mod db;
+pub mod ap;
+pub mod api;
+
 fn deserialize_null_default<'de, D, T>(deserializer: D) -> Result<T, D::Error>
 where
     T: Default + Deserialize<'de>,
@@ -67,540 +71,3 @@ pub struct Object {
     pub context: ObjectContext,
     pub id: ObjectUri,
 }
-
-pub mod db {
-    use super::*;
-    use chrono::{DateTime, Utc};
-
-    #[derive(Debug, Eq, PartialEq, Clone)]
-    pub struct Follow {
-        pub id: ObjectUri,
-        pub follower: ObjectUri,
-        pub followed: ObjectUri,
-    }
-
-    #[derive(Debug, Eq, PartialEq, Clone)]
-    pub struct Actor {
-        pub id: ObjectUri,
-        pub inbox: String,
-        pub outbox: String,
-    }
-
-    #[derive(Debug, Eq, PartialEq, Clone)]
-    pub struct UserPosts {
-        // User may have no posts
-        pub last_post_at: Option<DateTime<Utc>>,
-    }
-
-    #[derive(Debug, Eq, PartialEq, Clone)]
-    pub struct User {
-        pub id: ObjectUuid,
-        pub actor: Actor,
-        pub username: String,
-        pub display_name: String,
-        pub acct: String,
-        pub remote: bool,
-        pub url: String,
-        pub created_at: DateTime<Utc>,
-        pub icon_url: String,
-
-        pub posts: UserPosts,
-    }
-
-    #[derive(Debug, Eq, PartialEq, Clone)]
-    pub struct Attachment {
-        pub id: ObjectUuid,
-        pub post_id: ObjectUuid,
-        pub url: String,
-        pub media_type: Option<String>,
-        pub sensitive: bool,
-        pub alt: Option<String>
-    }
-
-    #[derive(Debug, Eq, PartialEq, Clone)]
-    pub struct Post {
-        pub id: ObjectUuid,
-        pub uri: ObjectUri,
-        pub user: User,
-        pub content: String,
-        pub created_at: DateTime<Utc>,
-        pub boosted_post: Option<Box<Post>>,
-        pub attachments: Vec<Attachment>
-    }
-}
-
-pub mod ap {
-    use super::*;
-    use serde::{Deserialize, Serialize};
-    use url::Url;
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub enum ActivityType {
-        Reject,
-        Create,
-        Note,
-        Delete,
-        Undo,
-        Accept,
-        Announce,
-        Person,
-        Like,
-        Follow,
-    }
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub struct MinimalActivity {
-        #[serde(flatten)]
-        pub obj: Object,
-
-        #[serde(rename = "type")]
-        pub ty: ActivityType,
-    }
-
-    pub type DeleteActivity = BasicActivity;
-    pub type LikeActivity = BasicActivity;
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub struct BasicActivity {
-        #[serde(flatten)]
-        pub obj: Object,
-
-        pub object: String,
-        pub actor: String,
-    }
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub struct CreateActivity {
-        #[serde(flatten)]
-        pub obj: Object,
-
-        #[serde(rename = "type")]
-        pub ty: ActivityType,
-
-        pub object: Post,
-        pub actor: String,
-        pub to: Vec<String>,
-        pub cc: Vec<String>,
-
-        #[serde(rename = "published")]
-        pub ts: String,
-    }
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub struct FollowActivity {
-        #[serde(flatten)]
-        pub obj: Object,
-
-        #[serde(rename = "type")]
-        pub ty: ActivityType,
-
-        pub object: String,
-        pub actor: String,
-    }
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub struct AcceptActivity {
-        #[serde(flatten)]
-        pub obj: Object,
-        
-        #[serde(rename = "type")]
-        pub ty: ActivityType,
-
-        pub object: String,
-        pub actor: String,
-    }
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub struct BoostActivity {
-        #[serde(flatten)]
-        pub obj: Object,
-
-        #[serde(rename = "type")]
-        pub ty: ActivityType,
-
-        pub actor: String,
-        pub published: String,
-        pub to: Vec<String>,
-        pub cc: Vec<String>,
-        pub object: String,
-    }
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub enum PostAttachmentType {
-        Document
-    }
-
-    #[derive(Serialize, Deserialize, Debug)]
-    #[serde(rename_all = "camelCase")]
-    pub struct PostAttachment {
-        #[serde(rename = "type")]
-        pub ty: PostAttachmentType,
-        
-        pub media_type: String,
-        pub url: String,
-        #[serde(deserialize_with = "deserialize_null_default")]
-        pub name: String,
-        
-        pub summary: Option<String>,
-        #[serde(default)]
-        pub sensitive: bool
-    }
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub struct Post {
-        #[serde(flatten)]
-        pub obj: Object,
-
-        #[serde(rename = "type")]
-        pub ty: ActivityType,
-
-        #[serde(rename = "published")]
-        pub ts: String,
-        pub content: String,
-        pub to: Vec<String>,
-        pub cc: Vec<String>,
-
-        pub attachment: Vec<PostAttachment>,
-
-        #[serde(rename = "attributedTo")]
-        pub attributed_to: Option<String>,
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub struct Actor {
-        #[serde(flatten)]
-        pub obj: Object,
-
-        pub inbox: String,
-        pub outbox: String,
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub enum IconType {
-        Image
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub struct PersonIcon {
-        #[serde(rename = "type")]
-        pub ty: IconType,
-        pub url: String,
-
-        #[serde(default)]
-        pub summary: String,
-        #[serde(default)]
-        pub width: i64,
-        #[serde(default)]
-        pub height: i64
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    #[serde(rename_all = "camelCase")]
-    pub struct Person {
-        #[serde(flatten)]
-        pub obj: Object,
-
-        #[serde(rename = "type")]
-        pub ty: ActivityType,
-
-        pub following: String,
-        pub followers: String,
-
-        pub summary: String,
-        pub inbox: String,
-        pub outbox: String,
-
-        pub preferred_username: String,
-        pub name: String,
-
-        pub public_key: Option<UserKey>,
-
-        pub icon: Option<PersonIcon>
-    }
-
-    pub struct RemoteInfo {
-        pub is_remote: bool,
-        pub web_url: String,
-        pub acct: String
-    }
-
-    impl Person {
-        pub fn remote_info(&self) -> RemoteInfo {
-            let url = Url::parse(&self.obj.id.0).unwrap();
-            let host = url.host_str().unwrap();
-
-            let (acct, remote) = if host != "ferri.amy.mov" {
-                (format!("{}@{}", self.preferred_username, host), true)
-            } else {
-                (self.preferred_username.clone(), false)
-            };
-
-            let url = format!("https://ferri.amy.mov/{}", acct);
-
-            RemoteInfo {
-                acct: acct.to_string(),
-                web_url: url,
-                is_remote: remote,
-            }
-        }
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub struct UserKey {
-        pub id: String,
-        pub owner: String,
-
-        #[serde(rename = "publicKeyPem")]
-        pub public_key: String,
-    }
-}
-
-pub mod api {
-    use super::*;
-    use serde::{Deserialize, Serialize};
-
-    // API will not really use actors so treat them as DB actors
-    // until we require specificity
-    pub type Actor = db::Actor;
-
-    #[derive(Serialize, Deserialize, Debug)]
-    pub struct CredentialApplication {
-        pub name: String,
-        pub scopes: String,
-        pub redirect_uris: Vec<String>,
-        pub client_id: String,
-        pub client_secret: String,
-    }
-
-    #[derive(Deserialize, Serialize, Debug)]
-    pub struct WebfingerLink {
-        pub rel: String,
-        #[serde(rename = "type")]
-        pub ty: Option<String>,
-        pub href: Option<String>,
-    }
-
-    #[derive(Deserialize, Serialize, Debug)]
-    pub struct WebfingerHit {
-        pub subject: String,
-        pub aliases: Vec<String>,
-        pub links: Vec<WebfingerLink>,
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub struct StatusAttachment {
-        pub id: ObjectUuid,
-        #[serde(rename = "type")]
-        pub ty: String,
-        
-        pub url: String,
-        pub description: String
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub struct Status {
-        pub id: ObjectUuid,
-        pub created_at: String,
-        pub in_reply_to_id: Option<ObjectUri>,
-        pub in_reply_to_account_id: Option<ObjectUri>,
-        pub sensitive: bool,
-        pub spoiler_text: String,
-        pub visibility: String,
-        pub language: String,
-        pub uri: ObjectUri,
-        pub url: String,
-        pub replies_count: i64,
-        pub reblogs_count: i64,
-        pub favourites_count: i64,
-        pub favourited: bool,
-        pub reblogged: bool,
-        pub muted: bool,
-        pub bookmarked: bool,
-        pub content: String,
-        pub reblog: Option<Box<Status>>,
-        pub application: Option<()>,
-        pub account: Account,
-        pub media_attachments: Vec<StatusAttachment>,
-        pub mentions: Vec<Option<()>>,
-        pub tags: Vec<Option<()>>,
-        pub emojis: Vec<Option<()>>,
-        pub card: Option<()>,
-        pub poll: Option<()>,
-    }
-        
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub struct Account {
-        pub id: ObjectUuid,
-        pub username: String,
-        pub acct: String,
-        pub display_name: String,
-
-        pub locked: bool,
-        pub bot: bool,
-
-        pub created_at: String,
-        pub attribution_domains: Vec<String>,
-
-        pub note: String,
-        pub url: String,
-
-        pub avatar: String,
-        pub avatar_static: String,
-        pub header: String,
-        pub header_static: String,
-
-        pub followers_count: i64,
-        pub following_count: i64,
-        pub statuses_count: i64,
-        pub last_status_at: Option<String>,
-
-        pub emojis: Vec<Emoji>,
-        pub fields: Vec<CustomField>,
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub struct Emoji {
-        pub shortcode: String,
-        pub url: String,
-        pub static_url: String,
-        pub visible_in_picker: bool,
-    }
-
-    #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-    pub struct CustomField {
-        pub name: String,
-        pub value: String,
-        pub verified_at: Option<String>,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Instance {
-        pub domain: String,
-        pub title: String,
-        pub version: String,
-        pub source_url: String,
-        pub description: String,
-        pub thumbnail: Thumbnail,
-        pub icon: Vec<Icon>,
-        pub languages: Vec<String>,
-        pub configuration: Configuration,
-        pub registrations: Registrations,
-        pub contact: Contact,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Configuration {
-        pub urls: Urls,
-        pub accounts: Accounts,
-        pub statuses: Statuses,
-        pub media_attachments: MediaAttachments,
-        pub polls: Polls,
-        pub translation: Translation,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Accounts {
-        pub max_featured_tags: i64,
-        pub max_pinned_statuses: i64,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct MediaAttachments {
-        pub supported_mime_types: Vec<String>,
-        pub description_limit: i64,
-        pub image_size_limit: i64,
-        pub image_matrix_limit: i64,
-        pub video_size_limit: i64,
-        pub video_frame_rate_limit: i64,
-        pub video_matrix_limit: i64,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Polls {
-        pub max_options: i64,
-        pub max_characters_per_option: i64,
-        pub min_expiration: i64,
-        pub max_expiration: i64,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Statuses {
-        pub max_characters: i64,
-        pub max_media_attachments: i64,
-        pub characters_reserved_per_url: i64,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Translation {
-        pub enabled: bool,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Urls {
-        pub streaming: String,
-        pub about: String,
-        pub privacy_policy: String,
-        pub terms_of_service: String,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Contact {
-        pub email: String,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Field {
-        pub name: String,
-        pub value: String,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Icon {
-        pub src: String,
-        pub size: String,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Registrations {
-        pub enabled: bool,
-        pub approval_required: bool,
-        pub reason_required: bool,
-        pub message: Option<String>,
-        pub min_age: i64,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Thumbnail {
-        pub url: String,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn ap_actor_to_db() {
-        let domain = "https://example.com";
-
-        let ap = ap::Actor {
-            obj: Object {
-                context: as_context(),
-                id: ObjectUri(format!("{}/users/sample", domain)),
-            },
-            inbox: format!("{}/users/sample/inbox", domain),
-            outbox: format!("{}/users/sample/outbox", domain),
-        };
-
-        let db: db::Actor = ap.into();
-
-        assert_eq!(
-            db,
-            db::Actor {
-                id: ObjectUri("https://example.com/users/sample".to_string()),
-                inbox: "https://example.com/users/sample/inbox".to_string(),
-                outbox: "https://example.com/users/sample/outbox".to_string(),
-            }
-        );
-    }
-}