Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

change 'delete' to 'remove' everywhere to be consistent (#2834)

Browse Source
This commit is contained in:
Aiden McClelland
2025-02-20 17:14:04 -07:00
committed by GitHub
parent d63341ea06
commit 40d194672b
8 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/startos/src/bins/startd.rs
View File

@@ -150,7 +150,6 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
.build()
.expect("failed to initialize runtime");
rt.block_on(async {
let addrs = crate::net::utils::all_socket_addrs_for(80).await?;
let mut server = WebServer::new(Acceptor::bind_upgradable(
SelfContainedNetworkInterfaceListener::bind(80),
));

2
core/startos/src/net/acme.rs
View File

@@ -187,7 +187,7 @@ pub fn acme<C: Context>() -> ParentHandler<C> {
from_fn_async(remove)
.with_metadata("sync_db", Value::Bool(true))
.no_display()
.with_about("Setup ACME certificate acquisition")
.with_about("Remove ACME certificate acquisition configuration")
.with_call_remote::<CliContext>(),
)
}

4
core/startos/src/net/web_server.rs
View File

@@ -265,7 +265,9 @@ impl<A: Accept + Send + Sync + 'static> WebServer<A> {
drop(queue_cell.write().unwrap().take());
if !runner.is_empty() {
runner.await;
tokio::time::timeout(Duration::from_secs(60), runner)
.await
.ok();
}
}));
Self {

6
core/startos/src/net/wifi.rs
View File

@@ -54,8 +54,8 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
.with_call_remote::<CliContext>(),
)
.subcommand(
"delete",
from_fn_async(delete)
"remove",
from_fn_async(remove)
.no_display()
.with_about("Remove a wifi network")
.with_call_remote::<CliContext>(),
@@ -230,7 +230,7 @@ pub async fn connect(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result
}
#[instrument(skip_all)]
pub async fn delete(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<(), Error> {
pub async fn remove(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<(), Error> {
let wifi_manager = wifi_manager(&ctx)?;
if !ssid.is_ascii() {
return Err(Error::new(

12
core/startos/src/notifications.rs
View File

@@ -30,15 +30,15 @@ pub fn notification<C: Context>() -> ParentHandler<C> {
.with_call_remote::<CliContext>(),
)
.subcommand(
"delete",
from_fn_async(delete)
"remove",
from_fn_async(remove)
.no_display()
.with_about("Delete notification for a given id")
.with_call_remote::<CliContext>(),
)
.subcommand(
"delete-before",
from_fn_async(delete_before)
"remove-before",
from_fn_async(remove_before)
.no_display()
.with_about("Delete notifications preceding a given id")
.with_call_remote::<CliContext>(),
@@ -126,7 +126,7 @@ pub struct DeleteParams {
id: u32,
}
pub async fn delete(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Result<(), Error> {
pub async fn remove(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Result<(), Error> {
ctx.db
.mutate(|db| {
db.as_private_mut().as_notifications_mut().remove(&id)?;
@@ -142,7 +142,7 @@ pub struct DeleteBeforeParams {
before: u32,
}
pub async fn delete_before(
pub async fn remove_before(
ctx: RpcContext,
DeleteBeforeParams { before }: DeleteBeforeParams,
) -> Result<(), Error> {

6
core/startos/src/ssh.rs
View File

@@ -99,8 +99,8 @@ pub fn ssh<C: Context>() -> ParentHandler<C> {
.with_call_remote::<CliContext>(),
)
.subcommand(
"delete",
from_fn_async(delete)
"remove",
from_fn_async(remove)
.no_display()
.with_about("Remove ssh key")
.with_call_remote::<CliContext>(),
@@ -159,7 +159,7 @@ pub struct DeleteParams {
}
#[instrument(skip_all)]
pub async fn delete(
pub async fn remove(
ctx: RpcContext,
DeleteParams { fingerprint }: DeleteParams,
) -> Result<(), Error> {

8
web/projects/ui/src/app/services/api/api.types.ts
View File

@@ -132,10 +132,10 @@ export module RR {
} // notification.list
export type GetNotificationsRes = ServerNotification<number>[]
export type DeleteNotificationReq = { id: number } // notification.delete
export type DeleteNotificationReq = { id: number } // notification.remove
export type DeleteNotificationRes = null
export type DeleteAllNotificationsReq = { before: number } // notification.delete-before
export type DeleteAllNotificationsReq = { before: number } // notification.remove-before
export type DeleteAllNotificationsRes = null
// wifi
@@ -166,7 +166,7 @@ export module RR {
export type ConnectWifiReq = { ssid: string } // wifi.connect
export type ConnectWifiRes = null
export type DeleteWifiReq = { ssid: string } // wifi.delete
export type DeleteWifiReq = { ssid: string } // wifi.remove
export type DeleteWifiRes = null
// ssh
@@ -177,7 +177,7 @@ export module RR {
export type AddSSHKeyReq = { key: string } // ssh.add
export type AddSSHKeyRes = SSHKey
export type DeleteSSHKeyReq = { fingerprint: string } // ssh.delete
export type DeleteSSHKeyReq = { fingerprint: string } // ssh.remove
export type DeleteSSHKeyRes = null
// backup

12
web/projects/ui/src/app/services/api/embassy-live-api.service.ts
View File

@@ -37,7 +37,7 @@ export class LiveApiService extends ApiService {
@Inject(PATCH_CACHE) private readonly cache$: Observable<Dump<DataModel>>,
) {
super()
; (window as any).rpcClient = this
;(window as any).rpcClient = this
}
// for sideloading packages
@@ -343,14 +343,14 @@ export class LiveApiService extends ApiService {
async deleteNotification(
params: RR.DeleteNotificationReq,
): Promise<RR.DeleteNotificationRes> {
return this.rpcRequest({ method: 'notification.delete', params })
return this.rpcRequest({ method: 'notification.remove', params })
}
async deleteAllNotifications(
params: RR.DeleteAllNotificationsReq,
): Promise<RR.DeleteAllNotificationsRes> {
return this.rpcRequest({
method: 'notification.delete-before',
method: 'notification.remove-before',
params,
})
}
@@ -379,7 +379,7 @@ export class LiveApiService extends ApiService {
}
async deleteWifi(params: RR.DeleteWifiReq): Promise<RR.DeleteWifiRes> {
return this.rpcRequest({ method: 'wifi.delete', params })
return this.rpcRequest({ method: 'wifi.remove', params })
}
// smtp
@@ -407,7 +407,7 @@ export class LiveApiService extends ApiService {
}
async deleteSshKey(params: RR.DeleteSSHKeyReq): Promise<RR.DeleteSSHKeyRes> {
return this.rpcRequest({ method: 'ssh.delete', params })
return this.rpcRequest({ method: 'ssh.remove', params })
}
// backup
@@ -518,7 +518,7 @@ export class LiveApiService extends ApiService {
async removeAcme(params: RR.RemoveAcmeReq): Promise<RR.RemoveAcmeRes> {
return this.rpcRequest({
method: 'net.acme.delete',
method: 'net.acme.remove',
params,
})
}