Remove the updates service.

Signed-off-by: Jason Volk <jason@zemos.net>

conduwuit-example.toml

@@ -112,16 +112,6 @@
 #
 #new_user_displayname_suffix = "🏳️‍⚧️"
 
-# If enabled, conduwuit will send a simple GET request periodically to
-# `https://pupbrain.dev/check-for-updates/stable` for any new
-# announcements made. Despite the name, this is not an update check
-# endpoint, it is simply an announcement check endpoint.
-#
-# This is disabled by default as this is rarely used except for security
-# updates or major updates.
-#
-#allow_check_for_updates = false
-
 # Set this to any float value to multiply conduwuit's in-memory LRU caches
 # with such as "auth_chain_cache_capacity".
 #

src/admin/query/globals.rs

@@ -11,8 +11,6 @@ pub(crate) enum GlobalsCommand {
 
 	CurrentCount,
 
-	LastCheckForUpdatesId,
-
 	/// - This returns an empty `Ok(BTreeMap<..>)` when there are no keys found
 	///   for the server.
 	SigningKeysFor {
@@ -39,13 +37,6 @@ pub(super) async fn process(subcommand: GlobalsCommand, context: &Context<'_>) -
 
 			write!(context, "Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```")
 		},
-		| GlobalsCommand::LastCheckForUpdatesId => {
-			let timer = tokio::time::Instant::now();
-			let results = services.updates.last_check_for_updates_id().await;
-			let query_time = timer.elapsed();
-
-			write!(context, "Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```")
-		},
 		| GlobalsCommand::SigningKeysFor { origin } => {
 			let timer = tokio::time::Instant::now();
 			let results = services.server_keys.verify_keys_for(&origin).await;

src/core/config/mod.rs

@@ -160,16 +160,6 @@ pub struct Config {
 	#[serde(default = "default_new_user_displayname_suffix")]
 	pub new_user_displayname_suffix: String,
 
-	/// If enabled, conduwuit will send a simple GET request periodically to
-	/// `https://pupbrain.dev/check-for-updates/stable` for any new
-	/// announcements made. Despite the name, this is not an update check
-	/// endpoint, it is simply an announcement check endpoint.
-	///
-	/// This is disabled by default as this is rarely used except for security
-	/// updates or major updates.
-	#[serde(default, alias = "allow_announcements_check")]
-	pub allow_check_for_updates: bool,
-
 	/// Set this to any float value to multiply conduwuit's in-memory LRU caches
 	/// with such as "auth_chain_cache_capacity".
 	///

src/service/globals/mod.rs

@@ -127,8 +127,6 @@ impl Service {
 		&self.server.config.new_user_displayname_suffix
 	}
 
-	pub fn allow_check_for_updates(&self) -> bool { self.server.config.allow_check_for_updates }
-
 	pub fn trusted_servers(&self) -> &[OwnedServerName] { &self.server.config.trusted_servers }
 
 	pub fn turn_password(&self) -> &String { &self.server.config.turn_password }

src/service/mod.rs

@@ -25,7 +25,6 @@ pub mod server_keys;
 pub mod sync;
 pub mod transaction_ids;
 pub mod uiaa;
-pub mod updates;
 pub mod users;
 
 extern crate conduwuit_core as conduwuit;

src/service/services.rs

@@ -14,7 +14,7 @@ use crate::{
 	manager::Manager,
 	media, presence, pusher, resolver, rooms, sending, server_keys, service,
 	service::{Args, Map, Service},
-	sync, transaction_ids, uiaa, updates, users,
+	sync, transaction_ids, uiaa, users,
 };
 
 pub struct Services {
@@ -37,7 +37,6 @@ pub struct Services {
 	pub sync: Arc<sync::Service>,
 	pub transaction_ids: Arc<transaction_ids::Service>,
 	pub uiaa: Arc<uiaa::Service>,
-	pub updates: Arc<updates::Service>,
 	pub users: Arc<users::Service>,
 
 	manager: Mutex<Option<Arc<Manager>>>,
@@ -104,7 +103,6 @@ impl Services {
 			sync: build!(sync::Service),
 			transaction_ids: build!(transaction_ids::Service),
 			uiaa: build!(uiaa::Service),
-			updates: build!(updates::Service),
 			users: build!(users::Service),
 
 			manager: Mutex::new(None),

src/service/updates/mod.rs

@@ -1,142 +0,0 @@
-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 serde::Deserialize;
-use tokio::{
-	sync::Notify,
-	time::{MissedTickBehavior, interval},
-};
-
-use crate::{Dep, admin, client, globals};
-
-pub struct Service {
-	interval: Duration,
-	interrupt: Notify,
-	db: Arc<Map>,
-	services: Services,
-}
-
-struct Services {
-	admin: Dep<admin::Service>,
-	client: Dep<client::Service>,
-	globals: Dep<globals::Service>,
-	server: Arc<Server>,
-}
-
-#[derive(Debug, Deserialize)]
-struct CheckForUpdatesResponse {
-	updates: Vec<CheckForUpdatesResponseEntry>,
-}
-
-#[derive(Debug, Deserialize)]
-struct CheckForUpdatesResponseEntry {
-	id: u64,
-	date: String,
-	message: String,
-}
-
-const CHECK_FOR_UPDATES_URL: &str = "https://pupbrain.dev/check-for-updates/stable";
-const CHECK_FOR_UPDATES_INTERVAL: u64 = 7200; // 2 hours
-const LAST_CHECK_FOR_UPDATES_COUNT: &[u8; 1] = b"u";
-
-#[async_trait]
-impl crate::Service for Service {
-	fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
-		Ok(Arc::new(Self {
-			interval: Duration::from_secs(CHECK_FOR_UPDATES_INTERVAL),
-			interrupt: Notify::new(),
-			db: args.db["global"].clone(),
-			services: Services {
-				globals: args.depend::<globals::Service>("globals"),
-				admin: args.depend::<admin::Service>("admin"),
-				client: args.depend::<client::Service>("client"),
-				server: args.server.clone(),
-			},
-		}))
-	}
-
-	#[tracing::instrument(skip_all, name = "updates", level = "debug")]
-	async fn worker(self: Arc<Self>) -> Result<()> {
-		if !self.services.globals.allow_check_for_updates() {
-			debug!("Disabling update check");
-			return Ok(());
-		}
-
-		let mut i = interval(self.interval);
-		i.set_missed_tick_behavior(MissedTickBehavior::Delay);
-		i.reset_after(self.interval);
-		loop {
-			tokio::select! {
-				() = self.interrupt.notified() => break,
-				_ = i.tick() => (),
-			}
-
-			if let Err(e) = self.check().await {
-				warn!(%e, "Failed to check for updates");
-			}
-		}
-
-		Ok(())
-	}
-
-	fn interrupt(&self) { self.interrupt.notify_waiters(); }
-
-	fn name(&self) -> &str { crate::service::make_name(std::module_path!()) }
-}
-
-impl Service {
-	#[tracing::instrument(skip_all)]
-	async fn check(&self) -> Result<()> {
-		debug_assert!(self.services.server.running(), "server must not be shutting down");
-
-		let response = self
-			.services
-			.client
-			.default
-			.get(CHECK_FOR_UPDATES_URL)
-			.send()
-			.await?
-			.text()
-			.await?;
-
-		let response = serde_json::from_str::<CheckForUpdatesResponse>(&response)?;
-		for update in &response.updates {
-			if update.id > self.last_check_for_updates_id().await {
-				self.handle(update).await;
-				self.update_check_for_updates_id(update.id);
-			}
-		}
-
-		Ok(())
-	}
-
-	#[tracing::instrument(skip_all)]
-	async fn handle(&self, update: &CheckForUpdatesResponseEntry) {
-		info!("{} {:#}", update.date, update.message);
-		self.services
-			.admin
-			.send_message(RoomMessageEventContent::text_markdown(format!(
-				"### the following is a message from the conduwuit puppy\n\nit was sent on \
-				 `{}`:\n\n@room: {}",
-				update.date, update.message
-			)))
-			.await
-			.ok();
-	}
-
-	#[inline]
-	pub fn update_check_for_updates_id(&self, id: u64) {
-		self.db.raw_put(LAST_CHECK_FOR_UPDATES_COUNT, id);
-	}
-
-	pub async fn last_check_for_updates_id(&self) -> u64 {
-		self.db
-			.get(LAST_CHECK_FOR_UPDATES_COUNT)
-			.await
-			.deserialized()
-			.unwrap_or(0_u64)
-	}
-}