summaryrefslogtreecommitdiff
path: root/src/message
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2025-03-23 15:58:33 -0400
committerOwen Jacobson <owen@grimoire.ca>2025-03-23 16:25:22 -0400
commit2420f1e75d54a5f209b0267715f078a369d81eb1 (patch)
tree20edd531a3f2f765a23fef8e7a508c91bc7dc294 /src/message
parent7e15690d54ff849596401b43d163df9353062850 (diff)
Rename the `login` module to `user`.
Diffstat (limited to 'src/message')
-rw-r--r--src/message/app.rs10
-rw-r--r--src/message/repo.rs16
-rw-r--r--src/message/routes/message/mod.rs2
-rw-r--r--src/message/routes/message/test.rs4
-rw-r--r--src/message/snapshot.rs4
5 files changed, 18 insertions, 18 deletions
diff --git a/src/message/app.rs b/src/message/app.rs
index 6f8f3d4..3c74628 100644
--- a/src/message/app.rs
+++ b/src/message/app.rs
@@ -8,8 +8,8 @@ use crate::{
clock::DateTime,
db::NotFound as _,
event::{Broadcaster, Event, Sequence, repo::Provider as _},
- login::Login,
name,
+ user::User,
};
pub struct Messages<'a> {
@@ -25,7 +25,7 @@ impl<'a> Messages<'a> {
pub async fn send(
&self,
channel: &channel::Id,
- sender: &Login,
+ sender: &User,
sent_at: &DateTime,
body: &Body,
) -> Result<Message, SendError> {
@@ -47,7 +47,7 @@ impl<'a> Messages<'a> {
pub async fn delete(
&self,
- deleted_by: &Login,
+ deleted_by: &User,
message: &Id,
deleted_at: &DateTime,
) -> Result<(), DeleteError> {
@@ -146,8 +146,8 @@ impl From<channel::repo::LoadError> for SendError {
pub enum DeleteError {
#[error("message {0} not found")]
NotFound(Id),
- #[error("login {} not the message's sender", .0.id)]
- NotSender(Login),
+ #[error("user {} not the message's sender", .0.id)]
+ NotSender(User),
#[error("message {0} deleted")]
Deleted(Id),
#[error(transparent)]
diff --git a/src/message/repo.rs b/src/message/repo.rs
index 8a0a72c..9a4f72f 100644
--- a/src/message/repo.rs
+++ b/src/message/repo.rs
@@ -5,7 +5,7 @@ use crate::{
channel,
clock::DateTime,
event::{Instant, Sequence},
- login::{self, Login},
+ user::{self, User},
};
pub trait Provider {
@@ -24,7 +24,7 @@ impl Messages<'_> {
pub async fn create(
&mut self,
channel: &channel::History,
- sender: &Login,
+ sender: &User,
sent: &Instant,
body: &Body,
) -> Result<History, sqlx::Error> {
@@ -39,7 +39,7 @@ impl Messages<'_> {
returning
id as "id: Id",
channel as "channel: channel::Id",
- sender as "sender: login::Id",
+ sender as "sender: user::Id",
sent_at as "sent_at: DateTime",
sent_sequence as "sent_sequence: Sequence",
body as "body: Body"
@@ -75,7 +75,7 @@ impl Messages<'_> {
r#"
select
message.channel as "channel: channel::Id",
- message.sender as "sender: login::Id",
+ message.sender as "sender: user::Id",
id as "id: Id",
message.body as "body: Body",
message.sent_at as "sent_at: DateTime",
@@ -112,7 +112,7 @@ impl Messages<'_> {
r#"
select
message.channel as "channel: channel::Id",
- message.sender as "sender: login::Id",
+ message.sender as "sender: user::Id",
message.id as "id: Id",
message.body as "body: Body",
message.sent_at as "sent_at: DateTime",
@@ -149,7 +149,7 @@ impl Messages<'_> {
r#"
select
message.channel as "channel: channel::Id",
- message.sender as "sender: login::Id",
+ message.sender as "sender: user::Id",
id as "id: Id",
message.body as "body: Body",
message.sent_at as "sent_at: DateTime",
@@ -254,7 +254,7 @@ impl Messages<'_> {
select
id as "id: Id",
message.channel as "channel: channel::Id",
- message.sender as "sender: login::Id",
+ message.sender as "sender: user::Id",
message.sent_at as "sent_at: DateTime",
message.sent_sequence as "sent_sequence: Sequence",
message.body as "body: Body",
@@ -291,7 +291,7 @@ impl Messages<'_> {
select
id as "id: Id",
message.channel as "channel: channel::Id",
- message.sender as "sender: login::Id",
+ message.sender as "sender: user::Id",
message.sent_at as "sent_at: DateTime",
message.sent_sequence as "sent_sequence: Sequence",
message.body as "body: Body",
diff --git a/src/message/routes/message/mod.rs b/src/message/routes/message/mod.rs
index e92f556..4abd445 100644
--- a/src/message/routes/message/mod.rs
+++ b/src/message/routes/message/mod.rs
@@ -23,7 +23,7 @@ pub mod delete {
identity: Identity,
) -> Result<Response, Error> {
app.messages()
- .delete(&identity.login, &message, &deleted_at)
+ .delete(&identity.user, &message, &deleted_at)
.await?;
Ok(Response { id: message })
diff --git a/src/message/routes/message/test.rs b/src/message/routes/message/test.rs
index 5178ab5..1abd91c 100644
--- a/src/message/routes/message/test.rs
+++ b/src/message/routes/message/test.rs
@@ -10,7 +10,7 @@ pub async fn delete_message() {
let app = fixtures::scratch_app().await;
let sender = fixtures::identity::create(&app, &fixtures::now()).await;
let channel = fixtures::channel::create(&app, &fixtures::now()).await;
- let message = fixtures::message::send(&app, &channel, &sender.login, &fixtures::now()).await;
+ let message = fixtures::message::send(&app, &channel, &sender.user, &fixtures::now()).await;
// Send the request
@@ -179,6 +179,6 @@ pub async fn delete_not_sender() {
// Verify the response
assert!(
- matches!(error, app::DeleteError::NotSender(error_sender) if deleter.login == error_sender)
+ matches!(error, app::DeleteError::NotSender(error_sender) if deleter.user == error_sender)
);
}
diff --git a/src/message/snapshot.rs b/src/message/snapshot.rs
index d924ea1..ac067f7 100644
--- a/src/message/snapshot.rs
+++ b/src/message/snapshot.rs
@@ -2,14 +2,14 @@ use super::{
Body, Id,
event::{Event, Sent},
};
-use crate::{channel, clock::DateTime, event::Instant, login};
+use crate::{channel, clock::DateTime, event::Instant, user};
#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
pub struct Message {
#[serde(flatten)]
pub sent: Instant,
pub channel: channel::Id,
- pub sender: login::Id,
+ pub sender: user::Id,
pub id: Id,
pub body: Body,
#[serde(skip_serializing_if = "Option::is_none")]