From 34719e7d0163f81a70a426b8d906a25eb87ae783 Mon Sep 17 00:00:00 2001 From: Julia Lange Date: Wed, 2 Jul 2025 10:41:05 -0700 Subject: [PATCH] Atproto, remove/disable lexicon module This is temporary. Since I'm using my own types implementation the autocreated lexicons don't work. Currently deciding the best way to move forward. --- atproto/src/lexicons/mod.rs | 4 +- atproto/src/lexicons/my.rs | 3 - atproto/src/lexicons/my/spoor.rs | 4 -- atproto/src/lexicons/my/spoor/log.rs | 16 ----- .../lexicons/{my/spoor => myspoor}/content.rs | 0 .../{my/spoor => myspoor}/content/external.rs | 0 .../{my/spoor => myspoor}/content/media.rs | 0 .../{my/spoor => myspoor}/content/title.rs | 0 atproto/src/lexicons/myspoor/log.rs | 11 ++++ .../{my/spoor => myspoor}/log/activity.rs | 0 .../{my/spoor => myspoor}/log/session.rs | 0 atproto/src/lexicons/myspoor/mod.rs | 2 + atproto/src/lexicons/record.rs | 65 ------------------- atproto/src/lib.rs | 2 +- 14 files changed, 15 insertions(+), 92 deletions(-) delete mode 100644 atproto/src/lexicons/my.rs delete mode 100644 atproto/src/lexicons/my/spoor.rs delete mode 100644 atproto/src/lexicons/my/spoor/log.rs rename atproto/src/lexicons/{my/spoor => myspoor}/content.rs (100%) rename atproto/src/lexicons/{my/spoor => myspoor}/content/external.rs (100%) rename atproto/src/lexicons/{my/spoor => myspoor}/content/media.rs (100%) rename atproto/src/lexicons/{my/spoor => myspoor}/content/title.rs (100%) create mode 100644 atproto/src/lexicons/myspoor/log.rs rename atproto/src/lexicons/{my/spoor => myspoor}/log/activity.rs (100%) rename atproto/src/lexicons/{my/spoor => myspoor}/log/session.rs (100%) create mode 100644 atproto/src/lexicons/myspoor/mod.rs delete mode 100644 atproto/src/lexicons/record.rs diff --git a/atproto/src/lexicons/mod.rs b/atproto/src/lexicons/mod.rs index 8107df0..96aefa7 100644 --- a/atproto/src/lexicons/mod.rs +++ b/atproto/src/lexicons/mod.rs @@ -1,3 +1 @@ -// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT. -pub mod record; -pub mod my; +pub mod myspoor; diff --git a/atproto/src/lexicons/my.rs b/atproto/src/lexicons/my.rs deleted file mode 100644 index ac9c6bd..0000000 --- a/atproto/src/lexicons/my.rs +++ /dev/null @@ -1,3 +0,0 @@ -// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT. -//!Definitions for the `my` namespace. -pub mod spoor; diff --git a/atproto/src/lexicons/my/spoor.rs b/atproto/src/lexicons/my/spoor.rs deleted file mode 100644 index 172fa6a..0000000 --- a/atproto/src/lexicons/my/spoor.rs +++ /dev/null @@ -1,4 +0,0 @@ -// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT. -//!Definitions for the `my.spoor` namespace. -pub mod content; -pub mod log; diff --git a/atproto/src/lexicons/my/spoor/log.rs b/atproto/src/lexicons/my/spoor/log.rs deleted file mode 100644 index 87f699e..0000000 --- a/atproto/src/lexicons/my/spoor/log.rs +++ /dev/null @@ -1,16 +0,0 @@ -// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT. -//!Definitions for the `my.spoor.log` namespace. -pub mod activity; -pub mod session; -#[derive(Debug)] -pub struct Activity; -impl atrium_api::types::Collection for Activity { - const NSID: &'static str = "my.spoor.log.activity"; - type Record = activity::Record; -} -#[derive(Debug)] -pub struct Session; -impl atrium_api::types::Collection for Session { - const NSID: &'static str = "my.spoor.log.session"; - type Record = session::Record; -} diff --git a/atproto/src/lexicons/my/spoor/content.rs b/atproto/src/lexicons/myspoor/content.rs similarity index 100% rename from atproto/src/lexicons/my/spoor/content.rs rename to atproto/src/lexicons/myspoor/content.rs diff --git a/atproto/src/lexicons/my/spoor/content/external.rs b/atproto/src/lexicons/myspoor/content/external.rs similarity index 100% rename from atproto/src/lexicons/my/spoor/content/external.rs rename to atproto/src/lexicons/myspoor/content/external.rs diff --git a/atproto/src/lexicons/my/spoor/content/media.rs b/atproto/src/lexicons/myspoor/content/media.rs similarity index 100% rename from atproto/src/lexicons/my/spoor/content/media.rs rename to atproto/src/lexicons/myspoor/content/media.rs diff --git a/atproto/src/lexicons/my/spoor/content/title.rs b/atproto/src/lexicons/myspoor/content/title.rs similarity index 100% rename from atproto/src/lexicons/my/spoor/content/title.rs rename to atproto/src/lexicons/myspoor/content/title.rs diff --git a/atproto/src/lexicons/myspoor/log.rs b/atproto/src/lexicons/myspoor/log.rs new file mode 100644 index 0000000..9a008a8 --- /dev/null +++ b/atproto/src/lexicons/myspoor/log.rs @@ -0,0 +1,11 @@ +use serde::Deserialize; +use crate::types::{BoundString, StrongRef, Uri, Did, Datetime}; + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct Session { + pub content: StrongRef, + pub label: Option>, + pub other_participants: Option>, + pub created_at: Datetime, +} diff --git a/atproto/src/lexicons/my/spoor/log/activity.rs b/atproto/src/lexicons/myspoor/log/activity.rs similarity index 100% rename from atproto/src/lexicons/my/spoor/log/activity.rs rename to atproto/src/lexicons/myspoor/log/activity.rs diff --git a/atproto/src/lexicons/my/spoor/log/session.rs b/atproto/src/lexicons/myspoor/log/session.rs similarity index 100% rename from atproto/src/lexicons/my/spoor/log/session.rs rename to atproto/src/lexicons/myspoor/log/session.rs diff --git a/atproto/src/lexicons/myspoor/mod.rs b/atproto/src/lexicons/myspoor/mod.rs new file mode 100644 index 0000000..f2d6b27 --- /dev/null +++ b/atproto/src/lexicons/myspoor/mod.rs @@ -0,0 +1,2 @@ +pub mod content; +pub mod log; diff --git a/atproto/src/lexicons/record.rs b/atproto/src/lexicons/record.rs deleted file mode 100644 index 290d286..0000000 --- a/atproto/src/lexicons/record.rs +++ /dev/null @@ -1,65 +0,0 @@ -// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT. -//!A collection of known record types. -#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)] -#[serde(tag = "$type")] -pub enum KnownRecord { - #[serde(rename = "my.spoor.content.external")] - LexiconsMySpoorContentExternal( - Box, - ), - #[serde(rename = "my.spoor.content.media")] - LexiconsMySpoorContentMedia(Box), - #[serde(rename = "my.spoor.log.activity")] - LexiconsMySpoorLogActivity(Box), - #[serde(rename = "my.spoor.log.session")] - LexiconsMySpoorLogSession(Box), -} -impl From for KnownRecord { - fn from(record: crate::lexicons::my::spoor::content::external::Record) -> Self { - KnownRecord::LexiconsMySpoorContentExternal(Box::new(record)) - } -} -impl From for KnownRecord { - fn from( - record_data: crate::lexicons::my::spoor::content::external::RecordData, - ) -> Self { - KnownRecord::LexiconsMySpoorContentExternal(Box::new(record_data.into())) - } -} -impl From for KnownRecord { - fn from(record: crate::lexicons::my::spoor::content::media::Record) -> Self { - KnownRecord::LexiconsMySpoorContentMedia(Box::new(record)) - } -} -impl From for KnownRecord { - fn from( - record_data: crate::lexicons::my::spoor::content::media::RecordData, - ) -> Self { - KnownRecord::LexiconsMySpoorContentMedia(Box::new(record_data.into())) - } -} -impl From for KnownRecord { - fn from(record: crate::lexicons::my::spoor::log::activity::Record) -> Self { - KnownRecord::LexiconsMySpoorLogActivity(Box::new(record)) - } -} -impl From for KnownRecord { - fn from(record_data: crate::lexicons::my::spoor::log::activity::RecordData) -> Self { - KnownRecord::LexiconsMySpoorLogActivity(Box::new(record_data.into())) - } -} -impl From for KnownRecord { - fn from(record: crate::lexicons::my::spoor::log::session::Record) -> Self { - KnownRecord::LexiconsMySpoorLogSession(Box::new(record)) - } -} -impl From for KnownRecord { - fn from(record_data: crate::lexicons::my::spoor::log::session::RecordData) -> Self { - KnownRecord::LexiconsMySpoorLogSession(Box::new(record_data.into())) - } -} -impl Into for KnownRecord { - fn into(self) -> atrium_api::types::Unknown { - atrium_api::types::TryIntoUnknown::try_into_unknown(&self).unwrap() - } -} diff --git a/atproto/src/lib.rs b/atproto/src/lib.rs index 30a53e7..021b86c 100644 --- a/atproto/src/lib.rs +++ b/atproto/src/lib.rs @@ -1,4 +1,4 @@ -pub mod lexicons; +// pub mod lexicons; pub mod types; pub mod error; #[cfg(feature = "sqlx-support")]