jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 21:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Channels: Include last message id on text channels.

Browse Source 
API: Return members when fetching messages.
Misc: Remove defunct DISABLE_REGISTRATION variable.
This commit is contained in:
Paul
2021-06-11 16:22:35 +01:00
parent f0d1ab390b
commit 0f18a6781d
8 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/database/entities/server.rs
View File

@@ -3,6 +3,7 @@ use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
use futures::StreamExt;
use mongodb::bson::doc;
use mongodb::bson::from_document;
use mongodb::bson::to_document;
use mongodb::bson::Document;
use mongodb::options::FindOptions;
@@ -148,7 +149,7 @@ impl Server {
})?;
// Delete all channels, members, bans and invites.
for with in ["channels", "invites"] {
for with in &["channels", "invites"] {
get_collection(with)
.delete_many(
doc! {
@@ -163,7 +164,7 @@ impl Server {
})?;
}
for with in ["server_members", "server_bans"] {
for with in &["server_members", "server_bans"] {
get_collection(with)
.delete_many(
doc! {
@@ -207,6 +208,27 @@ impl Server {
Ok(())
}
pub async fn fetch_members(id: &str) -> Result<Vec<Member>> {
Ok(get_collection("server_members")
.find(
doc! {
"_id.server": 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>>())
}
pub async fn fetch_member_ids(id: &str) -> Result<Vec<String>> {
Ok(get_collection("server_members")
.find(