chore: Delete archived element web deployment

.forgejo/workflows/element.yml

@@ -1,132 +0,0 @@
-name: Deploy Element Web
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - ".forgejo/workflows/element.yml"
-  push:
-    branches:
-      - main
-    paths:
-      - ".forgejo/workflows/element.yml"
-
-concurrency:
-  group: "element-${{ github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  build-and-deploy:
-    name: 🏗️ Build and Deploy
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 📦 Setup Node.js
-        uses: https://github.com/actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7
-        with:
-          node-version: "22"
-
-      - name: 🔨 Clone, setup, and build Element Web
-        run: |
-          echo "Cloning Element Web..."
-          git clone https://github.com/maunium/element-web
-          cd element-web
-          git checkout develop
-          git pull
-
-          echo "Cloning matrix-js-sdk..."
-          git clone https://github.com/matrix-org/matrix-js-sdk.git
-
-          echo "Installing Yarn..."
-          npm install -g yarn
-
-          echo "Installing dependencies..."
-          yarn install
-
-          echo "Preparing build environment..."
-          mkdir -p .home
-
-          echo "Cleaning up specific node_modules paths..."
-          rm -rf node_modules/@types/eslint-scope/ matrix-*-sdk/node_modules/@types/eslint-scope || echo "Cleanup paths not found, continuing."
-
-          echo "Getting matrix-js-sdk commit hash..."
-          cd matrix-js-sdk
-          jsver=$(git rev-parse HEAD)
-          jsver=${jsver:0:12}
-          cd ..
-          echo "matrix-js-sdk version hash: $jsver"
-
-          echo "Getting element-web commit hash..."
-          ver=$(git rev-parse HEAD)
-          ver=${ver:0:12}
-          echo "element-web version hash: $ver"
-
-          chmod +x ./build-sh
-
-          export VERSION="$ver-js-$jsver"
-          echo "Building Element Web version: $VERSION"
-          ./build-sh
-
-          echo "Checking for build output..."
-          ls -la webapp/
-
-      - name: ⚙️ Create config.json
-        run: |
-          cat <<EOF > ./element-web/webapp/config.json
-          {
-            "default_server_name": "continuwuity.org",
-            "default_server_config": {
-              "m.homeserver": {
-                "base_url": "https://matrix.continuwuity.org"
-              }
-            },
-            "default_country_code": "GB",
-            "default_theme": "dark",
-            "mobile_guide_toast": false,
-            "show_labs_settings": true,
-            "room_directory": [
-              "continuwuity.org",
-              "matrixrooms.info"
-            ],
-            "settings_defaults": {
-              "UIFeature.urlPreviews": true,
-              "UIFeature.feedback": false,
-              "UIFeature.voip": false,
-              "UIFeature.shareQrCode": false,
-              "UIFeature.shareSocial": false,
-              "UIFeature.locationSharing": false,
-              "enableSyntaxHighlightLanguageDetection": true
-            },
-            "features": {
-              "feature_pinning": true,
-              "feature_custom_themes": true
-            }
-          }
-          EOF
-          echo "Created ./element-web/webapp/config.json"
-          cat ./element-web/webapp/config.json
-
-      - name: 📤 Upload Artifact
-        uses: forgejo/upload-artifact@v4
-        with:
-          name: element-web
-          path: ./element-web/webapp/
-          retention-days: 14
-
-      - name: 🛠️ Install Wrangler
-        run: npm install --save-dev wrangler@latest
-
-      - name: 🚀 Deploy to Cloudflare Pages
-        if: vars.CLOUDFLARE_PROJECT_NAME != ''
-        id: deploy
-        uses: https://github.com/cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4
-        with:
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          command: >-
-            pages deploy ./element-web/webapp
-            --branch="${{ github.ref == 'refs/heads/main' && 'main' || github.head_ref || github.ref_name }}"
-            --commit-dirty=true
-            --project-name="${{ vars.CLOUDFLARE_PROJECT_NAME }}-element"

.pre-commit-config.yaml

@@ -51,7 +51,7 @@ repos:
     hooks:
       - id: cargo-clippy
         name: cargo clippy
-        entry: cargo clippy --
+        entry: cargo clippy -- -D warnings
         language: system
         pass_filenames: false
         types: [rust]

changelog.d/2083.bugfix.md

@@ -1 +0,0 @@
-Fixed simplified sliding sync reporting the number of live timeline events. Contributed by @eleboucher.

changelog.d/2115.bugfix.md

@@ -1 +0,0 @@
-Events arriving after one of their children has already been backfilled are no longer used as forward extremities. Contributed by @eleboucher.

conduwuit-example.toml

@@ -1991,9 +1991,11 @@
 #stream_amplification = 1024
 
 # Number of sender task workers; determines sender parallelism. Default is
-# core count. Override by setting a different value.
+# '0' which means the value is determined internally, likely matching the
+# number of tokio worker-threads or number of cores, etc. Override by
+# setting a non-zero value.
 #
-#sender_workers = core count
+#sender_workers = 0
 
 # Enables listener sockets; can be set to false to disable listening. This
 # option is intended for developer/diagnostic purposes only.

qodana.yaml

@@ -1,46 +0,0 @@
-#-------------------------------------------------------------------------------#
-#               Qodana analysis is configured by qodana.yaml file               #
-#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
-#-------------------------------------------------------------------------------#
-
-#################################################################################
-#              WARNING: Do not store sensitive information in this file,        #
-#               as its contents will be included in the Qodana report.          #
-#################################################################################
-version: "1.0"
-
-#Specify inspection profile for code analysis
-profile:
-  name: qodana.starter
-
-#Enable inspections
-#include:
-#  - name: <SomeEnabledInspectionId>
-
-#Disable inspections
-#exclude:
-#  - name: <SomeDisabledInspectionId>
-#    paths:
-#      - <path/where/not/run/inspection>
-
-#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
-#bootstrap: sh ./prepare-qodana.sh
-
-#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
-#plugins:
-#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
-
-# Quality gate. Will fail the CI/CD pipeline if any condition is not met
-# severityThresholds - configures maximum thresholds for different problem severities
-# testCoverageThresholds - configures minimum code coverage on a whole project and newly added code
-# Code Coverage is available in Ultimate and Ultimate Plus plans
-#failureConditions:
-#  severityThresholds:
-#    any: 15
-#    critical: 5
-#  testCoverageThresholds:
-#    fresh: 70
-#    total: 50
-
-#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
-linter: jetbrains/qodana-<linter>:2026.2

src/api/client/sync/v5.rs

@@ -70,20 +70,6 @@
 /// Default and maximum number of sticky events returned per response.
 const DEFAULT_STICKY_LIMIT: usize = 100;
 
-fn num_live_events<'a>(
-	counts: impl DoubleEndedIterator<Item = &'a PduCount>,
-	globalsince: u64,
-) -> usize {
-	if globalsince == 0 {
-		return 0;
-	}
-
-	counts
-		.rev()
-		.take_while(|count| matches!(count, PduCount::Normal(count) if *count > globalsince))
-		.count()
-}
-
 struct SyncCollection {
 	response: sync_events::v5::Response,
 	known_room_updates: KnownRoomUpdates,
@@ -328,7 +314,6 @@ async fn collect_sync_response(
 	response.rooms = process_rooms(
 		services,
 		sender_user,
-		globalsince,
 		next_batch,
 		all_invited_rooms.clone(),
 		all_knocked_rooms.clone(),
@@ -712,7 +697,6 @@ fn matches_room_type(
 async fn process_rooms<'a, Rooms>(
 	services: &Services,
 	sender_user: &UserId,
-	globalsince: u64,
 	next_batch: u64,
 	all_invited_rooms: Rooms,
 	all_knocked_rooms: Rooms,
@@ -915,16 +899,17 @@ async fn process_rooms<'a, Rooms>(
 		let required_state =
 			collect_required_state(services, room_id, required_state_request).await;
 
-		let timeline_pdus: Vec<_> = timeline_pdus
+		let room_events: Vec<_> = timeline_pdus
 			.iter()
 			.stream()
 			.filter_map(|item| ignored_filter(services, item.clone(), sender_user))
+			.map(at!(1))
+			.map(Event::into_format)
 			.collect()
 			.await;
-		let num_live = num_live_events(timeline_pdus.iter().map(|(count, _)| count), globalsince);
 		timeline_event_ids.extend(timeline_pdus.iter().map(|(_, pdu)| pdu.event_id.clone()));
 
-		for (_, pdu) in &timeline_pdus {
+		for (_, pdu) in timeline_pdus {
 			let ts = pdu.origin_server_ts;
 			if DEFAULT_BUMP_TYPES.binary_search(&pdu.kind).is_ok()
 				&& timestamp.is_none_or(|time| time <= ts)
@@ -932,11 +917,6 @@ async fn process_rooms<'a, Rooms>(
 				timestamp = Some(ts);
 			}
 		}
-		let room_events = timeline_pdus
-			.into_iter()
-			.map(at!(1))
-			.map(Event::into_format)
-			.collect();
 
 		// Heroes
 		let heroes: Vec<_> = services
@@ -1056,7 +1036,7 @@ async fn process_rooms<'a, Rooms>(
 						.try_into()
 						.unwrap_or_else(|_| uint!(0)),
 				),
-				num_live: Some(ruma_from_usize(num_live)),
+				num_live: None, // Count events in timeline greater than global sync counter
 				bump_stamp: timestamp,
 				heroes: Some(heroes),
 			}),
@@ -1792,25 +1772,4 @@ fn to_device_without_events_is_empty() {
 
 		assert!(response_is_empty(&response));
 	}
-
-	#[test]
-	fn num_live_events_counts_the_new_normal_suffix() {
-		let counts = [
-			PduCount::Backfilled(-2),
-			PduCount::Normal(8),
-			PduCount::Normal(11),
-			PduCount::Normal(12),
-		];
-
-		assert_eq!(num_live_events(counts.iter(), 0), 0);
-		assert_eq!(num_live_events(counts.iter(), 10), 2);
-		assert_eq!(num_live_events(counts.iter(), 12), 0);
-	}
-
-	#[test]
-	fn num_live_events_stops_at_history() {
-		let counts = [PduCount::Normal(11), PduCount::Normal(9), PduCount::Normal(12)];
-
-		assert_eq!(num_live_events(counts.iter(), 10), 1);
-	}
 }

src/core/config/mod.rs

@@ -2324,10 +2324,12 @@ pub struct Config {
 	pub stream_amplification: usize,
 
 	/// Number of sender task workers; determines sender parallelism. Default is
-	/// core count. Override by setting a different value.
+	/// '0' which means the value is determined internally, likely matching the
+	/// number of tokio worker-threads or number of cores, etc. Override by
+	/// setting a non-zero value.
 	///
-	/// default: core count
-	#[serde(default = "default_sender_workers")]
+	/// default: 0
+	#[serde(default)]
 	pub sender_workers: usize,
 
 	/// Enables listener sockets; can be set to false to disable listening. This
@@ -2896,47 +2898,45 @@ fn default_database_backups_to_keep() -> i16 { 1 }
 
 fn default_db_write_buffer_capacity_mb() -> f64 { 48.0 + parallelism_scaled_f64(4.0) }
 
-fn default_db_cache_capacity_mb() -> f64 { 512.0 + parallelism_scaled_f64(512.0) }
+fn default_db_cache_capacity_mb() -> f64 { 128.0 + parallelism_scaled_f64(64.0) }
 
-fn default_pdu_cache_capacity() -> u32 { parallelism_scaled_u32(50_000).saturating_add(100_000) }
+fn default_pdu_cache_capacity() -> u32 { parallelism_scaled_u32(10_000).saturating_add(100_000) }
 
 fn default_cache_capacity_modifier() -> f64 { 1.0 }
 
 fn default_auth_chain_cache_capacity() -> u32 {
-	parallelism_scaled_u32(50_000).saturating_add(100_000)
+	parallelism_scaled_u32(10_000).saturating_add(100_000)
 }
 
 fn default_shorteventid_cache_capacity() -> u32 {
-	parallelism_scaled_u32(100_000).saturating_add(100_000)
+	parallelism_scaled_u32(50_000).saturating_add(100_000)
 }
 
 fn default_eventidshort_cache_capacity() -> u32 {
-	parallelism_scaled_u32(50_000).saturating_add(100_000)
+	parallelism_scaled_u32(25_000).saturating_add(100_000)
 }
 
 fn default_eventid_pdu_cache_capacity() -> u32 {
-	parallelism_scaled_u32(50_000).saturating_add(100_000)
+	parallelism_scaled_u32(25_000).saturating_add(100_000)
 }
 
 fn default_shortstatekey_cache_capacity() -> u32 {
-	parallelism_scaled_u32(100_000).saturating_add(100_000)
+	parallelism_scaled_u32(10_000).saturating_add(100_000)
 }
 
 fn default_statekeyshort_cache_capacity() -> u32 {
-	parallelism_scaled_u32(50_000).saturating_add(100_000)
+	parallelism_scaled_u32(10_000).saturating_add(100_000)
 }
 
 fn default_servernameevent_data_cache_capacity() -> u32 {
-	parallelism_scaled_u32(100_000).saturating_add(100_000)
+	parallelism_scaled_u32(100_000).saturating_add(500_000)
 }
 
-fn default_stateinfo_cache_capacity() -> u32 { parallelism_scaled_u32(500).clamp(100, 12000) }
+fn default_stateinfo_cache_capacity() -> u32 { parallelism_scaled_u32(100) }
 
-fn default_roomid_spacehierarchy_cache_capacity() -> u32 {
-	parallelism_scaled_u32(500).clamp(100, 12000)
-}
+fn default_roomid_spacehierarchy_cache_capacity() -> u32 { parallelism_scaled_u32(1000) }
 
-fn default_dns_cache_entries() -> u32 { 327_680 }
+fn default_dns_cache_entries() -> u32 { 32768 }
 
 fn default_dns_min_ttl() -> u64 { 60 * 180 }
 
@@ -3146,26 +3146,15 @@ fn default_admin_log_capture() -> String {
 
 fn default_admin_room_tag() -> String { "m.server_notice".to_owned() }
 
-#[must_use]
 #[allow(clippy::as_conversions, clippy::cast_precision_loss)]
-pub fn parallelism_scaled_f64(val: f64) -> f64 { val * (sys::available_parallelism() as f64) }
+fn parallelism_scaled_f64(val: f64) -> f64 { val * (sys::available_parallelism() as f64) }
 
-#[must_use]
-#[allow(clippy::as_conversions, clippy::cast_possible_truncation)]
-pub fn parallelism_scaled_u32(val: u32) -> u32 {
-	val.saturating_mul(sys::available_parallelism() as u32)
+fn parallelism_scaled_u32(val: u32) -> u32 {
+	let val = val.try_into().expect("failed to cast u32 to usize");
+	parallelism_scaled(val).try_into().unwrap_or(u32::MAX)
 }
 
-#[must_use]
-#[allow(clippy::as_conversions, clippy::cast_possible_truncation, clippy::cast_possible_wrap)]
-pub fn parallelism_scaled_i32(val: i32) -> i32 {
-	val.saturating_mul(sys::available_parallelism() as i32)
-}
-
-#[must_use]
-pub fn parallelism_scaled(val: usize) -> usize {
-	val.saturating_mul(sys::available_parallelism())
-}
+fn parallelism_scaled(val: usize) -> usize { val.saturating_mul(sys::available_parallelism()) }
 
 fn default_trusted_server_batch_size() -> usize { 256 }
 
@@ -3185,8 +3174,6 @@ fn default_stream_width_scale() -> f32 { 1.0 }
 
 fn default_stream_amplification() -> usize { 1024 }
 
-fn default_sender_workers() -> usize { parallelism_scaled(1) }
-
 fn default_client_receive_timeout() -> u64 { 75 }
 
 fn default_client_request_timeout() -> u64 { 180 }

src/core/utils/hash/sha256.rs

@@ -5,7 +5,6 @@
 /// Sha256 hash (input gather joined by 0xFF bytes)
 #[must_use]
 #[tracing::instrument(skip(inputs), level = "trace")]
-#[allow(clippy::unnecessary_fallible_conversions)]
 pub fn delimited<'a, T, I>(mut inputs: I) -> DigestOut
 where
 	I: Iterator<Item = T> + 'a,
@@ -26,7 +25,6 @@ pub fn delimited<'a, T, I>(mut inputs: I) -> DigestOut
 /// Sha256 hash (input gather)
 #[must_use]
 #[tracing::instrument(skip(inputs), level = "trace")]
-#[allow(clippy::unnecessary_fallible_conversions)]
 pub fn concat<'a, T, I>(inputs: I) -> DigestOut
 where
 	I: Iterator<Item = T> + 'a,
@@ -45,7 +43,6 @@ pub fn concat<'a, T, I>(inputs: I) -> DigestOut
 #[inline]
 #[must_use]
 #[tracing::instrument(skip(input), level = "trace")]
-#[allow(clippy::unnecessary_fallible_conversions)]
 pub fn hash<T>(input: T) -> DigestOut
 where
 	T: AsRef<[u8]>,

src/database/engine/cf_opts.rs

@@ -29,7 +29,7 @@ fn descriptor_cf_options(
 	set_table_options(&mut opts, &desc, cache)?;
 
 	opts.set_min_write_buffer_number(1);
-	opts.set_max_write_buffer_number(3);
+	opts.set_max_write_buffer_number(2);
 	opts.set_write_buffer_size(desc.write_size);
 
 	opts.set_target_file_size_base(desc.file_size);

src/router/request.rs

@@ -8,7 +8,7 @@
 	extract::State,
 	response::{IntoResponse, Response},
 };
-use conduwuit::{Result, debug_warn, err, error, info, trace};
+use conduwuit::{Result, debug, debug_error, debug_warn, err, error, trace};
 use conduwuit_service::Services;
 use futures::FutureExt;
 use http::{Method, StatusCode, Uri};
@@ -102,11 +102,11 @@ fn handle_result(method: &Method, uri: &Uri, result: Response) -> Result<Respons
 	let reason = status.canonical_reason().unwrap_or("Unknown Reason");
 
 	if status.is_server_error() {
-		info!(%method, %uri, "{code} {reason}");
+		error!(%method, %uri, "{code} {reason}");
 	} else if status.is_client_error() {
-		info!(%method, %uri, "{code} {reason}");
+		debug_error!(%method, %uri, "{code} {reason}");
 	} else if status.is_redirection() {
-		trace!(%method, %uri, "{code} {reason}");
+		debug!(%method, %uri, "{code} {reason}");
 	} else {
 		trace!(%method, %uri, "{code} {reason}");
 	}

src/service/rooms/event_handler/fetch_and_handle_outliers.rs

@@ -154,9 +154,9 @@ pub async fn get_missing_events(
 				.stream()
 				.fold(0_u8, |i, event_id| async move {
 					if self.services.timeline.pdu_exists(event_id).await {
-						i
-					} else {
 						i.expected_add(1)
+					} else {
+						i
 					}
 				})
 				.await;

src/service/rooms/timeline/append.rs

@@ -194,24 +194,7 @@ async fn progress_state_and_extremities(
 			})
 			.collect::<Vec<_>>()
 			.await;
-
-		// An event with a child is not a leaf, but a room with no extremities cannot be
-		// written to, so it is added anyway when nothing else remains.
-		let has_child = self
-			.services
-			.pdu_metadata
-			.is_event_referenced(&incoming_pdu.room_id_or_hash(), incoming_pdu.event_id())
-			.await;
-		if !has_child || forward_extremities.is_empty() {
-			if has_child {
-				debug_warn!(
-					"Adding {} as an extremity despite its child, the room has no other leaves",
-					incoming_pdu.event_id()
-				);
-			}
-			forward_extremities.push(incoming_pdu.event_id().to_owned());
-		}
-
+		forward_extremities.push(incoming_pdu.event_id().to_owned());
 		debug!(
 			"Retained {} extremities checked against {} prev_events",
 			forward_extremities.len(),

src/service/rooms/timeline/backfill.rs

@@ -213,12 +213,6 @@ pub async fn backfill_pdu(&self, origin: &ServerName, pdu: Box<RawJsonValue>) ->
 
 		drop(insert_lock);
 
-		// Backfilled events skip append_pdu, so this is the only place their
-		// prev_events can be marked as referenced. See issue #2115.
-		self.services
-			.pdu_metadata
-			.mark_as_referenced(&room_id, pdu.prev_events().map(AsRef::as_ref));
-
 		if pdu.kind == TimelineEventType::RoomMessage {
 			let content: ExtractBody = pdu.get_content()?;
 			if let Some(body) = content.body {