Riley
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
114 lines
4.1 KiB
Rust
114 lines
4.1 KiB
Rust
use crate::{
|
|
activities::community::announce::GetCommunity,
|
|
objects::community::ApubCommunity,
|
|
protocol::{
|
|
activities::{
|
|
community::{
|
|
add_mod::AddMod,
|
|
announce::AnnounceActivity,
|
|
block_user::BlockUserFromCommunity,
|
|
remove_mod::RemoveMod,
|
|
report::Report,
|
|
undo_block_user::UndoBlockUserFromCommunity,
|
|
update::UpdateCommunity,
|
|
},
|
|
create_or_update::{comment::CreateOrUpdateComment, post::CreateOrUpdatePost},
|
|
deletion::{delete::Delete, undo_delete::UndoDelete},
|
|
following::{
|
|
accept::AcceptFollowCommunity,
|
|
follow::FollowCommunity,
|
|
undo_follow::UndoFollowCommunity,
|
|
},
|
|
private_message::{
|
|
create_or_update::CreateOrUpdatePrivateMessage,
|
|
delete::DeletePrivateMessage,
|
|
undo_delete::UndoDeletePrivateMessage,
|
|
},
|
|
voting::{undo_vote::UndoVote, vote::Vote},
|
|
},
|
|
objects::page::Page,
|
|
},
|
|
};
|
|
use lemmy_apub_lib::traits::ActivityHandler;
|
|
use lemmy_utils::LemmyError;
|
|
use lemmy_websocket::LemmyContext;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
|
|
#[serde(untagged)]
|
|
#[activity_handler(LemmyContext)]
|
|
pub enum SharedInboxActivities {
|
|
GroupInboxActivities(Box<GroupInboxActivities>),
|
|
// Note, pm activities need to be at the end, otherwise comments will end up here. We can probably
|
|
// avoid this problem by replacing createpm.object with our own struct, instead of NoteExt.
|
|
PersonInboxActivities(Box<PersonInboxActivities>),
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
|
|
#[serde(untagged)]
|
|
#[activity_handler(LemmyContext)]
|
|
pub enum GroupInboxActivities {
|
|
FollowCommunity(FollowCommunity),
|
|
UndoFollowCommunity(UndoFollowCommunity),
|
|
AnnouncableActivities(Box<AnnouncableActivities>),
|
|
Report(Report),
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
|
|
#[serde(untagged)]
|
|
#[activity_handler(LemmyContext)]
|
|
pub enum PersonInboxActivities {
|
|
AcceptFollowCommunity(AcceptFollowCommunity),
|
|
/// Some activities can also be sent from user to user, eg a comment with mentions
|
|
AnnouncableActivities(AnnouncableActivities),
|
|
CreateOrUpdatePrivateMessage(CreateOrUpdatePrivateMessage),
|
|
DeletePrivateMessage(DeletePrivateMessage),
|
|
UndoDeletePrivateMessage(UndoDeletePrivateMessage),
|
|
AnnounceActivity(AnnounceActivity),
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
|
|
#[serde(untagged)]
|
|
#[activity_handler(LemmyContext)]
|
|
pub enum AnnouncableActivities {
|
|
CreateOrUpdateComment(CreateOrUpdateComment),
|
|
CreateOrUpdatePost(CreateOrUpdatePost),
|
|
Vote(Vote),
|
|
UndoVote(UndoVote),
|
|
Delete(Delete),
|
|
UndoDelete(UndoDelete),
|
|
UpdateCommunity(UpdateCommunity),
|
|
BlockUserFromCommunity(BlockUserFromCommunity),
|
|
UndoBlockUserFromCommunity(UndoBlockUserFromCommunity),
|
|
AddMod(AddMod),
|
|
RemoveMod(RemoveMod),
|
|
// For compatibility with Pleroma/Mastodon (send only)
|
|
Page(Page),
|
|
}
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl GetCommunity for AnnouncableActivities {
|
|
#[tracing::instrument(skip(self, context))]
|
|
async fn get_community(
|
|
&self,
|
|
context: &LemmyContext,
|
|
request_counter: &mut i32,
|
|
) -> Result<ApubCommunity, LemmyError> {
|
|
use AnnouncableActivities::*;
|
|
let community = match self {
|
|
CreateOrUpdateComment(a) => a.get_community(context, request_counter).await?,
|
|
CreateOrUpdatePost(a) => a.get_community(context, request_counter).await?,
|
|
Vote(a) => a.get_community(context, request_counter).await?,
|
|
UndoVote(a) => a.get_community(context, request_counter).await?,
|
|
Delete(a) => a.get_community(context, request_counter).await?,
|
|
UndoDelete(a) => a.get_community(context, request_counter).await?,
|
|
UpdateCommunity(a) => a.get_community(context, request_counter).await?,
|
|
BlockUserFromCommunity(a) => a.get_community(context, request_counter).await?,
|
|
UndoBlockUserFromCommunity(a) => a.get_community(context, request_counter).await?,
|
|
AddMod(a) => a.get_community(context, request_counter).await?,
|
|
RemoveMod(a) => a.get_community(context, request_counter).await?,
|
|
Page(_) => unimplemented!(),
|
|
};
|
|
Ok(community)
|
|
}
|
|
}
|