forked from jmug/stoatchat
Fix embeds not re-generating properly on edit.
Include own memberships in Ready payload.
This commit is contained in:
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
export version=0.5.1-alpha.19
|
export version=0.5.1-alpha.20
|
||||||
echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
|
echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
|
||||||
|
|||||||
@@ -228,6 +228,30 @@ impl User {
|
|||||||
Ok(users)
|
Ok(users)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Utility function to get all of a user's memberships.
|
||||||
|
pub async fn fetch_memberships(id: &str) -> Result<Vec<Member>> {
|
||||||
|
Ok(get_collection("server_members")
|
||||||
|
.find(
|
||||||
|
doc! {
|
||||||
|
"_id.user": id
|
||||||
|
},
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.map_err(|_| Error::DatabaseError {
|
||||||
|
operation: "find",
|
||||||
|
with: "server_members",
|
||||||
|
})?
|
||||||
|
.filter_map(async move |s| s.ok())
|
||||||
|
.collect::<Vec<Document>>()
|
||||||
|
.await
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|x| {
|
||||||
|
from_document(x).ok()
|
||||||
|
})
|
||||||
|
.collect::<Vec<Member>>())
|
||||||
|
}
|
||||||
|
|
||||||
/// Utility function to get all the server IDs the user is in.
|
/// Utility function to get all the server IDs the user is in.
|
||||||
pub async fn fetch_server_ids(id: &str) -> Result<Vec<String>> {
|
pub async fn fetch_server_ids(id: &str) -> Result<Vec<String>> {
|
||||||
Ok(get_collection("server_members")
|
Ok(get_collection("server_members")
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ pub enum ClientboundNotification {
|
|||||||
users: Vec<User>,
|
users: Vec<User>,
|
||||||
servers: Vec<Server>,
|
servers: Vec<Server>,
|
||||||
channels: Vec<Channel>,
|
channels: Vec<Channel>,
|
||||||
|
members: Vec<Member>
|
||||||
},
|
},
|
||||||
|
|
||||||
Message(Message),
|
Message(Message),
|
||||||
|
|||||||
@@ -19,7 +19,11 @@ pub async fn generate_ready(mut user: User) -> Result<ClientboundNotification> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
let server_ids = User::fetch_server_ids(&user.id).await?;
|
let members = User::fetch_memberships(&user.id).await?;
|
||||||
|
let server_ids: Vec<String> = members.iter()
|
||||||
|
.map(|x| x.id.server.clone())
|
||||||
|
.collect();
|
||||||
|
|
||||||
let mut cursor = get_collection("servers")
|
let mut cursor = get_collection("servers")
|
||||||
.find(
|
.find(
|
||||||
doc! {
|
doc! {
|
||||||
@@ -114,5 +118,6 @@ pub async fn generate_ready(mut user: User) -> Result<ClientboundNotification> {
|
|||||||
users,
|
users,
|
||||||
servers,
|
servers,
|
||||||
channels,
|
channels,
|
||||||
|
members
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<
|
|||||||
Err(Error::MissingPermission)?
|
Err(Error::MissingPermission)?
|
||||||
}
|
}
|
||||||
|
|
||||||
let message = msg.fetch_message(&channel).await?;
|
let mut message = msg.fetch_message(&channel).await?;
|
||||||
if message.author != user.id {
|
if message.author != user.id {
|
||||||
Err(Error::CannotEditMessage)?
|
Err(Error::CannotEditMessage)?
|
||||||
}
|
}
|
||||||
@@ -40,6 +40,7 @@ pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<
|
|||||||
"edited": Bson::DateTime(edited)
|
"edited": Bson::DateTime(edited)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
message.content = Content::Text(edit.content.clone());
|
||||||
let mut update = json!({ "content": edit.content, "edited": DateTime(edited) });
|
let mut update = json!({ "content": edit.content, "edited": DateTime(edited) });
|
||||||
|
|
||||||
if let Some(embeds) = &message.embeds {
|
if let Some(embeds) = &message.embeds {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
pub const VERSION: &str = "0.5.1-alpha.19";
|
pub const VERSION: &str = "0.5.1-alpha.20";
|
||||||
|
|||||||
Reference in New Issue
Block a user