mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-14 11:29:22 +00:00
35cbae61bc
* Respond directly with LemmyError Instrument Perform implementations for more precise traces Use ApiError to format JSON errors when messages are present Keep SpanTrace output in LemmyError Display impl * Hide SpanTrace debug output from LemmyError * Don't log when entering spans, only when leaving * Update actix-web * Update actix-rt * Add newline after error info in LemmyError Display impl * Propogate span information to blocking operations * Instrument apub functions * Use skip_all for more instrument attributes, don't skip 'self' in some api actions * Make message a static string * Send proper JSON over websocket * Add 'message' to LemmyError display if present * Use a quieter root span builder, don't pretty-print logs * Keep passwords and emails out of logs * Re-enable logging Login * Instrument feeds * Emit our own errors * Move error log after status code recording * Make Sensitive generic over the inner type * Remove line that logged secrets
103 lines
2.6 KiB
Rust
103 lines
2.6 KiB
Rust
use crate::Perform;
|
|
use actix_web::web::Data;
|
|
use lemmy_api_common::{get_local_user_view_from_jwt, websocket::*};
|
|
use lemmy_utils::{ConnectionId, LemmyError};
|
|
use lemmy_websocket::{
|
|
messages::{JoinCommunityRoom, JoinModRoom, JoinPostRoom, JoinUserRoom},
|
|
LemmyContext,
|
|
};
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl Perform for UserJoin {
|
|
type Response = UserJoinResponse;
|
|
|
|
#[tracing::instrument(skip(context, websocket_id))]
|
|
async fn perform(
|
|
&self,
|
|
context: &Data<LemmyContext>,
|
|
websocket_id: Option<ConnectionId>,
|
|
) -> Result<UserJoinResponse, LemmyError> {
|
|
let data: &UserJoin = self;
|
|
let local_user_view =
|
|
get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
|
|
|
|
if let Some(ws_id) = websocket_id {
|
|
context.chat_server().do_send(JoinUserRoom {
|
|
local_user_id: local_user_view.local_user.id,
|
|
id: ws_id,
|
|
});
|
|
}
|
|
|
|
Ok(UserJoinResponse { joined: true })
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl Perform for CommunityJoin {
|
|
type Response = CommunityJoinResponse;
|
|
|
|
#[tracing::instrument(skip(context, websocket_id))]
|
|
async fn perform(
|
|
&self,
|
|
context: &Data<LemmyContext>,
|
|
websocket_id: Option<ConnectionId>,
|
|
) -> Result<CommunityJoinResponse, LemmyError> {
|
|
let data: &CommunityJoin = self;
|
|
|
|
if let Some(ws_id) = websocket_id {
|
|
context.chat_server().do_send(JoinCommunityRoom {
|
|
community_id: data.community_id,
|
|
id: ws_id,
|
|
});
|
|
}
|
|
|
|
Ok(CommunityJoinResponse { joined: true })
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl Perform for ModJoin {
|
|
type Response = ModJoinResponse;
|
|
|
|
#[tracing::instrument(skip(context, websocket_id))]
|
|
async fn perform(
|
|
&self,
|
|
context: &Data<LemmyContext>,
|
|
websocket_id: Option<ConnectionId>,
|
|
) -> Result<ModJoinResponse, LemmyError> {
|
|
let data: &ModJoin = self;
|
|
|
|
if let Some(ws_id) = websocket_id {
|
|
context.chat_server().do_send(JoinModRoom {
|
|
community_id: data.community_id,
|
|
id: ws_id,
|
|
});
|
|
}
|
|
|
|
Ok(ModJoinResponse { joined: true })
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl Perform for PostJoin {
|
|
type Response = PostJoinResponse;
|
|
|
|
#[tracing::instrument(skip(context, websocket_id))]
|
|
async fn perform(
|
|
&self,
|
|
context: &Data<LemmyContext>,
|
|
websocket_id: Option<ConnectionId>,
|
|
) -> Result<PostJoinResponse, LemmyError> {
|
|
let data: &PostJoin = self;
|
|
|
|
if let Some(ws_id) = websocket_id {
|
|
context.chat_server().do_send(JoinPostRoom {
|
|
post_id: data.post_id,
|
|
id: ws_id,
|
|
});
|
|
}
|
|
|
|
Ok(PostJoinResponse { joined: true })
|
|
}
|
|
}
|