Don't error out on profiles that don't exist anymore

Nice little match there, sigh.

Closes #1
This commit is contained in:
Aleksei Voronov 2023-09-24 20:26:34 +02:00
parent 642a3d57cc
commit 0cd3202a9c
3 changed files with 41 additions and 10 deletions

View File

@ -14,7 +14,7 @@ Heavily WIP. Doesn't work yet at all, but does read the stream of posts as they
- [x] Serve the feed - [x] Serve the feed
- [x] Handle deleting of posts - [x] Handle deleting of posts
- [ ] Handle errors in the web service gracefully - [ ] Handle errors in the web service gracefully
- [ ] Handle missing profiles in the profile classifier - [x] Handle missing profiles in the profile classifier
- [ ] Add a way to mark a profile as being from a certain country manually - [ ] Add a way to mark a profile as being from a certain country manually
- [ ] Handle reconnecting to websocket somehow - [ ] Handle reconnecting to websocket somehow
- [ ] Publish the feed - [ ] Publish the feed

View File

@ -54,10 +54,16 @@ impl ProfileClassifier {
async fn fill_in_profile_details(&self, did: &str) -> Result<()> { async fn fill_in_profile_details(&self, did: &str) -> Result<()> {
let details = self.bluesky.fetch_profile_details(did).await?; let details = self.bluesky.fetch_profile_details(did).await?;
let country = self
.ai let country = match details {
.infer_country_of_living(&details.display_name, &details.description) Some(details) => {
.await?; self.ai
.infer_country_of_living(&details.display_name, &details.description)
.await?
}
None => "xx".to_owned(),
};
self.database.store_profile_details(did, &country).await?; self.database.store_profile_details(did, &country).await?;
info!("Stored inferred country of living for {did}: {country}"); info!("Stored inferred country of living for {did}: {country}");
Ok(()) Ok(())

View File

@ -1,9 +1,12 @@
use std::matches;
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use atrium_api::blob::BlobRef; use atrium_api::blob::BlobRef;
use atrium_api::client::AtpServiceClient; use atrium_api::client::AtpServiceClient;
use atrium_api::client::AtpServiceWrapper; use atrium_api::client::AtpServiceWrapper;
use atrium_api::records::Record; use atrium_api::records::Record;
use atrium_xrpc::client::reqwest::ReqwestClient; use atrium_xrpc::client::reqwest::ReqwestClient;
use axum::http::StatusCode;
use chrono::Utc; use chrono::Utc;
use futures::StreamExt; use futures::StreamExt;
use log::error; use log::error;
@ -104,7 +107,7 @@ impl Bluesky {
Ok(()) Ok(())
} }
pub async fn fetch_profile_details(&self, did: &str) -> Result<ProfileDetails> { pub async fn fetch_profile_details(&self, did: &str) -> Result<Option<ProfileDetails>> {
let result = self let result = self
.client .client
.service .service
@ -117,17 +120,23 @@ impl Bluesky {
repo: did.to_owned(), repo: did.to_owned(),
rkey: "self".to_owned(), rkey: "self".to_owned(),
}) })
.await?; .await;
let profile = match result.value { let profile_data = match result {
Ok(profile_data) => profile_data,
Err(e) if is_missing_record_error(&e) => return Ok(None),
Err(e) => return Err(e.into()),
};
let profile = match profile_data.value {
Record::AppBskyActorProfile(profile) => profile, Record::AppBskyActorProfile(profile) => profile,
_ => return Err(anyhow!("Big bad, no such profile")), _ => return Err(anyhow!("Big bad, no such profile")),
}; };
Ok(ProfileDetails { Ok(Some(ProfileDetails {
display_name: profile.display_name.unwrap_or_default(), display_name: profile.display_name.unwrap_or_default(),
description: profile.description.unwrap_or_default(), description: profile.description.unwrap_or_default(),
}) }))
} }
pub async fn subscribe_to_operations<P: CommitProcessor>( pub async fn subscribe_to_operations<P: CommitProcessor>(
@ -154,3 +163,19 @@ impl Bluesky {
Ok(()) Ok(())
} }
} }
fn is_missing_record_error<T>(error: &atrium_xrpc::error::Error<T>) -> bool {
use atrium_xrpc::error::{Error, ErrorResponseBody, XrpcError, XrpcErrorKind};
matches!(error,
Error::XrpcResponse(XrpcError {
status: StatusCode::BAD_REQUEST,
error:
Some(XrpcErrorKind::Undefined(ErrorResponseBody {
error: Some(error_code),
message: Some(error_message),
})),
}) if error_code == "InvalidRequest"
&& error_message.starts_with("Could not locate record")
)
}