Compare commits

..

No commits in common. "417ab22a7b1f4565f0246a774e6d3072fac718f3" and "d830576e66a978abe2e987ef999818fe21464242" have entirely different histories.

2 changed files with 4 additions and 2 deletions

View file

@ -21,7 +21,7 @@ pub enum Identity {
impl Identity { impl Identity {
pub fn filter_condition(&self) -> Condition { pub fn filter_condition(&self) -> Condition {
let base_cond = Condition::any().add(model::addressing::Column::Actor.is_null()); let base_cond = Condition::any().add(model::addressing::Column::Actor.eq(apb::target::PUBLIC));
match self { match self {
Identity::Anonymous => base_cond, Identity::Anonymous => base_cond,
Identity::Remote { internal, .. } => base_cond.add(model::addressing::Column::Instance.eq(*internal)), Identity::Remote { internal, .. } => base_cond.add(model::addressing::Column::Instance.eq(*internal)),

View file

@ -236,7 +236,9 @@ async fn fetch_object_inner(ctx: &Context, id: &str, depth: usize) -> crate::Res
return Ok(x); // already in db, easy return Ok(x); // already in db, easy
} }
let object = ctx.pull_object(id).await?; let object = Context::request(
Method::GET, id, None, &format!("https://{}", ctx.domain()), ctx.pkey(), ctx.domain(),
).await?.json::<serde_json::Value>().await?;
if let Some(oid) = object.id() { if let Some(oid) = object.id() {
if oid != id { if oid != id {