refactor: move types crate into blahd-types subpackage

This commit is contained in:
oxalica 2024-09-10 03:47:41 -04:00
parent 0a0a4aefa9
commit 0ac841e6fa
13 changed files with 43 additions and 47 deletions

View file

@ -27,7 +27,7 @@ tracing = "0.1"
tracing-subscriber = "0.3"
url = { version = "2.5.2", features = ["serde"] }
blah = { path = "..", features = ["rusqlite"] }
blah-types = { path = "../blah-types", features = ["rusqlite"] }
[dev-dependencies]
rand = "0.8.5"

View file

@ -8,7 +8,7 @@ use std::task::{Context, Poll};
use anyhow::{bail, Context as _, Result};
use axum::extract::ws::{Message, WebSocket};
use blah::types::{AuthPayload, ChatItem, WithSig};
use blah_types::{AuthPayload, ChatItem, WithSig};
use futures_util::future::Either;
use futures_util::stream::SplitSink;
use futures_util::{stream_select, SinkExt as _, Stream, StreamExt};

View file

@ -3,7 +3,7 @@
/// FIXME: Currently we assume no more than one request in a single millisecond.
use std::time::SystemTime;
use blah::types::Id;
use blah_types::Id;
pub trait IdExt {
fn gen() -> Self;

View file

@ -10,7 +10,7 @@ use axum::response::{IntoResponse, Response};
use axum::routing::{get, post};
use axum::{Json, Router};
use axum_extra::extract::WithRejection as R;
use blah::types::{
use blah_types::{
ChatItem, ChatPayload, CreateRoomPayload, Id, MemberPermission, RoomAdminOp, RoomAdminPayload,
RoomAttrs, ServerPermission, Signee, UserKey, WithItemId, WithSig,
};

View file

@ -6,7 +6,7 @@ use axum::extract::{FromRef, FromRequest, FromRequestParts, Request};
use axum::http::{header, request, StatusCode};
use axum::response::{IntoResponse, Response};
use axum::{async_trait, Json};
use blah::types::{AuthPayload, UserKey, WithSig};
use blah_types::{AuthPayload, UserKey, WithSig};
use serde::de::DeserializeOwned;
use serde::{Deserialize, Serialize};

View file

@ -5,7 +5,7 @@ use std::future::IntoFuture;
use std::sync::{Arc, LazyLock};
use anyhow::Result;
use blah::types::{
use blah_types::{
get_timestamp, AuthPayload, CreateRoomPayload, Id, MemberPermission, RoomAdminOp,
RoomAdminPayload, RoomAttrs, RoomMember, RoomMemberList, ServerPermission, UserKey, WithSig,
};