Channels: Include last message id on text channels.
API: Return members when fetching messages. Misc: Remove defunct DISABLE_REGISTRATION variable.
This commit is contained in:
@@ -98,11 +98,20 @@ pub async fn req(user: User, target: Ref, options: Form<Options>) -> Result<Json
|
||||
|
||||
ids.remove(&user.id);
|
||||
let user_ids = ids.into_iter().collect();
|
||||
let users = user.fetch_multiple_users(user_ids).await?;
|
||||
|
||||
Ok(json!({
|
||||
"messages": messages,
|
||||
"users": user.fetch_multiple_users(user_ids).await?
|
||||
}))
|
||||
if let Channel::TextChannel { server, .. } = target {
|
||||
Ok(json!({
|
||||
"messages": messages,
|
||||
"users": users,
|
||||
"members": Server::fetch_members(&server).await?
|
||||
}))
|
||||
} else {
|
||||
Ok(json!({
|
||||
"messages": messages,
|
||||
"users": users,
|
||||
}))
|
||||
}
|
||||
} else {
|
||||
Ok(json!(messages))
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use crate::util::variables::{
|
||||
APP_URL, AUTUMN_URL, DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY,
|
||||
APP_URL, AUTUMN_URL, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY,
|
||||
JANUARY_URL, USE_AUTUMN, USE_EMAIL, USE_HCAPTCHA, USE_JANUARY, USE_VOSO, VAPID_PUBLIC_KEY,
|
||||
VOSO_URL, VOSO_WS_HOST,
|
||||
};
|
||||
@@ -12,7 +12,6 @@ pub async fn root() -> JsonValue {
|
||||
json!({
|
||||
"revolt": crate::version::VERSION,
|
||||
"features": {
|
||||
"registration": !*DISABLE_REGISTRATION,
|
||||
"captcha": {
|
||||
"enabled": *USE_HCAPTCHA,
|
||||
"key": HCAPTCHA_SITEKEY.to_string()
|
||||
|
||||
@@ -60,6 +60,7 @@ pub async fn req(user: User, target: Ref, info: Json<Data>) -> Result<JsonValue>
|
||||
name: info.name,
|
||||
description: info.description,
|
||||
icon: None,
|
||||
last_message: None
|
||||
};
|
||||
|
||||
channel.clone().publish().await?;
|
||||
|
||||
@@ -64,6 +64,7 @@ pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
|
||||
name: "general".to_string(),
|
||||
description: None,
|
||||
icon: None,
|
||||
last_message: None
|
||||
}
|
||||
.publish()
|
||||
.await?;
|
||||
|
||||
Reference in New Issue
Block a user