chore: Release

Cargo.lock

@@ -771,7 +771,7 @@ dependencies = [
 
 [[package]]
 name = "conduwuit"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "clap",
  "conduwuit_admin",
@@ -800,7 +800,7 @@ dependencies = [
 
 [[package]]
 name = "conduwuit_admin"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "clap",
  "conduwuit_api",
@@ -821,7 +821,7 @@ dependencies = [
 
 [[package]]
 name = "conduwuit_api"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -853,14 +853,14 @@ dependencies = [
 
 [[package]]
 name = "conduwuit_build_metadata"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "built 0.8.0",
 ]
 
 [[package]]
 name = "conduwuit_core"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "argon2",
  "arrayvec",
@@ -919,7 +919,7 @@ dependencies = [
 
 [[package]]
 name = "conduwuit_database"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "async-channel",
  "conduwuit_core",
@@ -937,7 +937,7 @@ dependencies = [
 
 [[package]]
 name = "conduwuit_macros"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -947,7 +947,7 @@ dependencies = [
 
 [[package]]
 name = "conduwuit_router"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "axum",
  "axum-client-ip",
@@ -981,7 +981,7 @@ dependencies = [
 
 [[package]]
 name = "conduwuit_service"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -1018,7 +1018,7 @@ dependencies = [
 
 [[package]]
 name = "conduwuit_web"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 dependencies = [
  "askama",
  "axum",

Cargo.toml

@@ -21,7 +21,7 @@ license = "Apache-2.0"
 readme = "README.md"
 repository = "https://forgejo.ellis.link/continuwuation/continuwuity"
 rust-version = "1.86.0"
-version = "0.5.0-rc.5"
+version = "0.5.0-rc.6"
 
 [workspace.metadata.crane]
 name = "conduwuit"

docs/static/announcements.schema.json

@@ -3,7 +3,7 @@
     "$id": "https://continwuity.org/schema/announcements.schema.json",
     "type": "object",
     "properties": {
-      "updates": {
+      "announcements": {
         "type": "array",
         "items": {
           "type": "object",
@@ -16,6 +16,10 @@
             },
             "date": {
               "type": "string"
+            },
+            "mention_room": {
+              "type": "boolean",
+              "description": "Whether to mention the room (@room) when posting this announcement"
             }
           },
           "required": [
@@ -26,6 +30,6 @@
       }
     },
     "required": [
-      "updates"
+      "announcements"
     ]
   }

src/api/client/room/event.rs

@@ -1,7 +1,7 @@
 use axum::extract::State;
-use conduwuit::{Err, Event, PduEvent, Result, err};
+use conduwuit::{Err, Event, Result, err};
 use futures::{FutureExt, TryFutureExt, future::try_join};
-use ruma::api::client::{error::ErrorKind, room::get_room_event};
+use ruma::api::client::room::get_room_event;
 
 use crate::{Ruma, client::is_ignored_pdu};
 
@@ -14,7 +14,6 @@ pub(crate) async fn get_room_event_route(
 ) -> Result<get_room_event::v3::Response> {
 	let event_id = &body.event_id;
 	let room_id = &body.room_id;
-	let sender_user = body.sender_user();
 
 	let event = services
 		.rooms
@@ -34,52 +33,6 @@ pub(crate) async fn get_room_event_route(
 		return Err!(Request(Forbidden("You don't have permission to view this event.")));
 	}
 
-	let include_unredacted_content = body
-		.include_unredacted_content // User's file has this field name
-		.unwrap_or(false);
-
-	if include_unredacted_content && event.is_redacted() {
-		let is_server_admin = services
-			.users
-			.is_admin(sender_user)
-			.map(|is_admin| Ok(is_admin));
-		let can_redact_privilege = services
-			.rooms
-			.state_accessor
-			.user_can_redact(event_id, sender_user, room_id, false) // federation=false for local check
-			;
-		let (is_server_admin, can_redact_privilege) =
-			try_join(is_server_admin, can_redact_privilege).await?;
-
-		if !is_server_admin && !can_redact_privilege {
-			return Err!(Request(Forbidden(
-				"You don't have permission to view redacted content.",
-			)));
-		}
-
-		let pdu_id = match services.rooms.timeline.get_pdu_id(event_id).await {
-			| Ok(id) => id,
-			| Err(e) => {
-				return Err(e);
-			},
-		};
-		let original_content = services
-			.rooms
-			.timeline
-			.get_original_pdu_content(&pdu_id)
-			.await?;
-		if let Some(original_content) = original_content {
-			// If the original content is available, we can return it.
-			// event.content = to_raw_value(&original_content)?;
-			event = PduEvent::from_id_val(event_id, original_content)?;
-		} else {
-			return Err(conduwuit::Error::BadRequest(
-				ErrorKind::UnredactedContentDeleted { content_keep_ms: None },
-				"The original unredacted content is not in the database.",
-			));
-		}
-	}
-
 	debug_assert!(
 		event.event_id() == event_id && event.room_id() == room_id,
 		"Fetched PDU must match requested"

src/api/client/unversioned.rs

@@ -40,7 +40,6 @@ pub(crate) async fn get_supported_versions_route(
 			"v1.11".to_owned(),
 		],
 		unstable_features: BTreeMap::from_iter([
-			("fi.mau.msc2815".to_owned(), true),
 			("org.matrix.e2e_cross_signing".to_owned(), true),
 			("org.matrix.msc2285.stable".to_owned(), true), /* private read receipts (https://github.com/matrix-org/matrix-spec-proposals/pull/2285) */
 			("uk.half-shot.msc2666.query_mutual_rooms".to_owned(), true), /* query mutual rooms (https://github.com/matrix-org/matrix-spec-proposals/pull/2666) */

src/database/maps.rs

@@ -121,15 +121,6 @@ pub(super) static MAPS: &[Descriptor] = &[
 		index_size: 512,
 		..descriptor::SEQUENTIAL
 	},
-	Descriptor {
-		name: "pduid_originalcontent",
-		cache_disp: CacheDisp::SharedWith("pduid_pdu"),
-		key_size_hint: Some(16),
-		val_size_hint: Some(1520),
-		block_size: 2048,
-		index_size: 512,
-		..descriptor::RANDOM
-	},
 	Descriptor {
 		name: "publicroomids",
 		..descriptor::RANDOM_SMALL

src/service/announcements/mod.rs

@@ -20,7 +20,7 @@ use std::{sync::Arc, time::Duration};
 use async_trait::async_trait;
 use conduwuit::{Result, Server, debug, info, warn};
 use database::{Deserialized, Map};
-use ruma::events::room::message::RoomMessageEventContent;
+use ruma::events::{Mentions, room::message::RoomMessageEventContent};
 use serde::Deserialize;
 use tokio::{
 	sync::Notify,
@@ -53,6 +53,8 @@ struct CheckForAnnouncementsResponseEntry {
 	id: u64,
 	date: Option<String>,
 	message: String,
+	#[serde(default, skip_serializing_if = "bool::not")]
+	mention_room: bool,
 }
 
 const CHECK_FOR_ANNOUNCEMENTS_URL: &str =
@@ -139,19 +141,20 @@ impl Service {
 		} else {
 			info!("[announcements] {:#}", announcement.message);
 		}
+		let mut message = RoomMessageEventContent::text_markdown(format!(
+			"### New announcement{}\n\n{}",
+			announcement
+				.date
+				.as_ref()
+				.map_or_else(String::new, |date| format!(" - `{date}`")),
+			announcement.message
+		));
 
-		self.services
-			.admin
-			.send_message(RoomMessageEventContent::text_markdown(format!(
-				"### New announcement{}\n\n{}",
-				announcement
-					.date
-					.as_ref()
-					.map_or_else(String::new, |date| format!(" - `{date}`")),
-				announcement.message
-			)))
-			.await
-			.ok();
+		if announcement.mention_room {
+			message = message.add_mentions(Mentions::with_room_mention());
+		}
+
+		self.services.admin.send_message(message).await.ok();
 	}
 
 	#[inline]

src/service/rooms/timeline/data.rs

@@ -19,8 +19,6 @@ pub(super) struct Data {
 	pduid_pdu: Arc<Map>,
 	userroomid_highlightcount: Arc<Map>,
 	userroomid_notificationcount: Arc<Map>,
-	/// Stores the original content of redacted PDUs.
-	pduid_originalcontent: Arc<Map>,
 	pub(super) db: Arc<Database>,
 	services: Services,
 }
@@ -40,7 +38,6 @@ impl Data {
 			pduid_pdu: db["pduid_pdu"].clone(),
 			userroomid_highlightcount: db["userroomid_highlightcount"].clone(),
 			userroomid_notificationcount: db["userroomid_notificationcount"].clone(),
-			pduid_originalcontent: db["pduid_originalcontent"].clone(), // Initialize new table
 			db: args.db.clone(),
 			services: Services {
 				short: args.depend::<rooms::short::Service>("rooms::short"),
@@ -180,24 +177,6 @@ impl Data {
 		self.pduid_pdu.get(pdu_id).await.deserialized()
 	}
 
-	/// Stores the original content of a PDU that is about to be redacted.
-	pub(super) async fn store_redacted_pdu_content(
-		&self,
-		pdu_id: &RawPduId,
-		pdu_json: &CanonicalJsonObject,
-	) -> Result<()> {
-		self.pduid_originalcontent.raw_put(pdu_id, Json(pdu_json));
-		Ok(())
-	}
-
-	/// Returns the original content of a redacted PDU.
-	pub(super) async fn get_original_pdu_content(
-		&self,
-		pdu_id: &RawPduId,
-	) -> Result<Option<CanonicalJsonObject>> {
-		self.pduid_originalcontent.get(pdu_id).await.deserialized()
-	}
-
 	pub(super) async fn append_pdu(
 		&self,
 		pdu_id: &RawPduId,

src/service/rooms/timeline/mod.rs

@@ -260,25 +260,6 @@ impl Service {
 		self.db.replace_pdu(pdu_id, pdu_json, pdu).await
 	}
 
-	/// Stores the content of a to-be redacted pdu.
-	#[tracing::instrument(skip(self), level = "debug")]
-	pub async fn store_redacted_pdu_content(
-		&self,
-		pdu_id: &RawPduId,
-		pdu_json: &CanonicalJsonObject,
-	) -> Result<()> {
-		self.db.store_redacted_pdu_content(pdu_id, pdu_json).await
-	}
-
-	/// Returns the original content of a redacted PDU.
-	#[tracing::instrument(skip(self), level = "debug")]
-	pub async fn get_original_pdu_content(
-		&self,
-		pdu_id: &RawPduId,
-	) -> Result<Option<CanonicalJsonObject>> {
-		self.db.get_original_pdu_content(pdu_id).await
-	}
-
 	/// Creates a new persisted data unit and adds it to a room.
 	///
 	/// By this point the incoming event should be fully authenticated, no auth
@@ -491,7 +472,7 @@ impl Service {
 								.user_can_redact(redact_id, &pdu.sender, &pdu.room_id, false)
 								.await?
 							{
-								self.redact_pdu(redact_id, pdu, shortroomid, true).await?;
+								self.redact_pdu(redact_id, pdu, shortroomid).await?;
 							}
 						}
 					},
@@ -504,7 +485,7 @@ impl Service {
 								.user_can_redact(redact_id, &pdu.sender, &pdu.room_id, false)
 								.await?
 							{
-								self.redact_pdu(redact_id, pdu, shortroomid, true).await?;
+								self.redact_pdu(redact_id, pdu, shortroomid).await?;
 							}
 						}
 					},
@@ -1052,7 +1033,6 @@ impl Service {
 		event_id: &EventId,
 		reason: &PduEvent,
 		shortroomid: ShortRoomId,
-		keep_original_content: bool,
 	) -> Result {
 		// TODO: Don't reserialize, keep original json
 		let Ok(pdu_id) = self.get_pdu_id(event_id).await else {
@@ -1074,19 +1054,6 @@ impl Service {
 
 		let room_version_id = self.services.state.get_room_version(&pdu.room_id).await?;
 
-		if keep_original_content && !pdu.is_redacted() {
-			let original_pdu_json = utils::to_canonical_object(&pdu).map_err(|e| {
-				err!(Database(error!(
-					?event_id,
-					?e,
-					"Failed to convert PDU to canonical JSON for original content storage"
-				)))
-			})?;
-			self.db
-				.store_redacted_pdu_content(&pdu_id, &original_pdu_json)
-				.await?;
-		}
-
 		pdu.redact(&room_version_id, reason)?;
 
 		let obj = utils::to_canonical_object(&pdu).map_err(|e| {