pijul nest
guest › [sign in] [explore]

Accept all previous HTTP API

[?]
Dec 9, 2020, 5:14 PM
RNQTHBRIVBDC25NEWEZLM62EZD7KOQHIZFHVHOLEXDXWUAPNTEPQC

Dependencies

Change contents

  • edit in src/xmpp/mod.rs at line 15
    [2.39099]→[2.39099:39429](∅→∅)
    struct XmppProcessState<F, S> {
    cmd_recv: S,
    signal: F,
    conn: MaybeXmppConnection,
    }
    impl<F, S> XmppProcessState<F, S> {
    fn new(cmd_recv: S, signal: F, conn: MaybeXmppConnection) -> XmppProcessState<F, S> {
    XmppProcessState {
    cmd_recv,
    signal,
    conn,
    }
    }
    }
  • edit in src/main.rs at line 112
    [2.47870]
    [2.47870]
    .map_err(std::convert::Into::into),
    }
    })
    }
    (None, Ok(xmpp_to), _) => {
    info!("Got message request. Reading body...");
    let mut cmd_send = self.cmd_send.clone();
    Box::pin(async move {
    match body_to_string(req).await {
    Ok(message) => {
    match cmd_send.send(XmppCommand::Chat { xmpp_to, message }).await {
    Ok(_) => Response::builder()
    .body(Body::from(format!("Accepted")))
    .map_err(std::convert::Into::into),
    Err(e) => {
    error!("Cann't send message command: {}", e);
    Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("Cann't get message text")))
    .map_err(std::convert::Into::into)
    }
    }
    }
    Err(e) => Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("Cann't get message text")))
  • replacement in src/main.rs at line 142
    [2.47989]→[2.47989:49108](∅→∅)
    (None, Ok(xmpp_to), _) => Box::pin(async {
    Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("SOON")))
    .map_err(std::convert::Into::into)
    }),
    (Some(Ok(muc_id)), _, Ok(show)) => Box::pin(async {
    Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("SOON")))
    .map_err(std::convert::Into::into)
    }),
    (Some(Ok(muc_id)), _, _) => Box::pin(async {
    Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("SOON")))
    .map_err(std::convert::Into::into)
    }),
    (Some(Err(err)), _, _) => Box::pin(async {
    Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("SOON")))
    .map_err(std::convert::Into::into)
    }),
    [2.47989]
    [2.49108]
    (Some(Ok(muc_id)), _, Ok(show)) => {
    info!("Got chat presence request. Reading body...");
    let mut cmd_send = self.cmd_send.clone();
    Box::pin(async move {
    match body_to_string(req).await {
    Ok(message) => {
    match cmd_send
    .send(XmppCommand::ChatroomPresence {
    muc_id,
    show,
    message,
    })
    .await
    {
    Ok(_) => Response::builder()
    .body(Body::from(format!("Accepted")))
    .map_err(std::convert::Into::into),
    Err(e) => {
    error!("Cann't send chat presence command: {}", e);
    Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("Cann't get chat presence text")))
    .map_err(std::convert::Into::into)
    }
    }
    }
    Err(e) => Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("Cann't get chat presence text")))
    .map_err(std::convert::Into::into),
    }
    })
    }
    (Some(Ok(muc_id)), _, _) => {
    info!("Got chat message request. Reading body...");
    let mut cmd_send = self.cmd_send.clone();
    Box::pin(async move {
    match body_to_string(req).await {
    Ok(message) => {
    match cmd_send
    .send(XmppCommand::Chatroom { muc_id, message })
    .await
    {
    Ok(_) => Response::builder()
    .body(Body::from(format!("Accepted")))
    .map_err(std::convert::Into::into),
    Err(e) => {
    error!("Cann't send chat message command: {}", e);
    Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("Cann't get chat message text")))
    .map_err(std::convert::Into::into)
    }
    }
    }
    Err(e) => Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("Cann't get chat message text")))
    .map_err(std::convert::Into::into),
    }
    })
    }
    (Some(Err(err)), _, _) => {
    warn!("Unknown destination: {}", err);
    Box::pin(async move {
    Response::builder()
    .status(hyper::StatusCode::BAD_REQUEST)
    .body(Body::from(format!("Unknown destination: {}", err,)))
    .map_err(std::convert::Into::into)
    })
    }
  • replacement in src/main.rs at line 315
    [2.52313]→[2.52313:52336](∅→∅)
    http_server.await;
    [2.52313]
    [2.52336]
    http_server.await?;
  • replacement in src/main.rs at line 319
    [2.52367]→[2.52367:52398](∅→∅)
    xmpp_join.join().unwrap();
    [2.52367]
    [2.52398]
    xmpp_join.join().unwrap()?;