@@ -5,12 +5,12 @@ use std::{
|
||||
sync::{Arc, Mutex},
|
||||
};
|
||||
|
||||
use conduwuit::{Server, debug, defer, error, log, log::is_systemd_mode};
|
||||
use futures::future::{AbortHandle, Abortable};
|
||||
use ruma::events::room::message::RoomMessageEventContent;
|
||||
use rustyline_async::{Readline, ReadlineError, ReadlineEvent};
|
||||
use termimad::MadSkin;
|
||||
use tokio::task::JoinHandle;
|
||||
use tuwunel_core::{Server, debug, defer, error, log, log::is_systemd_mode};
|
||||
|
||||
use crate::{Dep, admin};
|
||||
|
||||
@@ -96,7 +96,7 @@ impl Console {
|
||||
debug!("session starting");
|
||||
|
||||
self.output
|
||||
.print_inline(&format!("**conduwuit {}** admin console\n", conduwuit::version()));
|
||||
.print_inline(&format!("**conduwuit {}** admin console\n", tuwunel_core::version()));
|
||||
self.output
|
||||
.print_text("\"help\" for help, ^D to exit the console, ^\\ to stop the server\n");
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use conduwuit::{Result, pdu::PduBuilder};
|
||||
use futures::FutureExt;
|
||||
use ruma::{
|
||||
RoomId, RoomVersionId,
|
||||
@@ -17,6 +16,7 @@ use ruma::{
|
||||
topic::RoomTopicEventContent,
|
||||
},
|
||||
};
|
||||
use tuwunel_core::{Result, pdu::PduBuilder};
|
||||
|
||||
use crate::Services;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use conduwuit::{Err, Result, debug, debug_info, error, implement, info};
|
||||
use ruma::events::room::message::RoomMessageEventContent;
|
||||
use tokio::time::{Duration, sleep};
|
||||
use tuwunel_core::{Err, Result, debug, debug_info, error, implement, info};
|
||||
|
||||
pub(super) const SIGNAL: &str = "SIGUSR2";
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use conduwuit::{Err, Result, debug_info, debug_warn, error, implement, matrix::pdu::PduBuilder};
|
||||
use ruma::{
|
||||
RoomId, UserId,
|
||||
events::{
|
||||
@@ -13,6 +12,9 @@ use ruma::{
|
||||
tag::{TagEvent, TagEventContent, TagInfo},
|
||||
},
|
||||
};
|
||||
use tuwunel_core::{
|
||||
Err, Result, debug_info, debug_warn, error, implement, matrix::pdu::PduBuilder,
|
||||
};
|
||||
|
||||
/// Invite the user to the conduwuit admin room.
|
||||
///
|
||||
|
||||
@@ -10,9 +10,6 @@ use std::{
|
||||
};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use conduwuit::{
|
||||
Error, PduEvent, Result, Server, debug, err, error, error::default_log, pdu::PduBuilder,
|
||||
};
|
||||
pub use create::create_admin_room;
|
||||
use futures::{FutureExt, TryFutureExt};
|
||||
use loole::{Receiver, Sender};
|
||||
@@ -21,6 +18,9 @@ use ruma::{
|
||||
events::room::message::{Relation, RoomMessageEventContent},
|
||||
};
|
||||
use tokio::sync::RwLock;
|
||||
use tuwunel_core::{
|
||||
Error, PduEvent, Result, Server, debug, err, error, error::default_log, pdu::PduBuilder,
|
||||
};
|
||||
|
||||
use crate::{Dep, account_data, globals, rooms, rooms::state::RoomMutexGuard};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user