two different firehose notifications

This commit is contained in:
Brandon Thomas committed 2023-04-25 01:33:47 -07:00
1 parent 4842b9bbc1
commit 692c3f64b6
3 files changed
+30 -9

No files matched your search

@@ -36,6 +36,7 @@ enum FirehoseEvent {
GenericDownloadCompleted,
MediaUploaded,
DeviceMediaRecorded,
CommentCreated,
@@ -66,6 +67,7 @@ impl FirehoseEvent {
FirehoseEvent::GenericDownloadStarted => "generic_download_started",
FirehoseEvent::GenericDownloadCompleted => "generic_download_completed",
FirehoseEvent::MediaUploaded => "media_uploaded",
FirehoseEvent::DeviceMediaRecorded => "device_media_recorded",
FirehoseEvent::CommentCreated => "comment_created",
@@ -249,6 +251,16 @@ impl FirehosePublisher {
Ok(())
}
pub async fn publish_device_media_recorded(&self, maybe_user_token: Option<&UserToken>, upload_token: &MediaUploadToken) -> AnyhowResult<()> {
let _record_id = self.insert(
FirehoseEvent::DeviceMediaRecorded,
maybe_user_token.map(|u| u.as_str()),
Some(upload_token.as_str()),
Some(upload_token.as_str()),
).await?;
Ok(())
}
pub async fn publish_comment_created(&self, user_token: &UserToken, comment_token: &CommentToken) -> AnyhowResult<()> {
let _record_id = self.insert(
FirehoseEvent::CommentCreated,
@@ -14,7 +14,7 @@ pub struct UploadMediaRequest {
}
/// Where the frontend tells us the file came from.
#[derive(Eq, PartialEq)]
#[derive(Eq, PartialEq, Clone, Copy)]
pub enum MediaSource {
Unknown,
UserFile,
@@ -267,14 +267,23 @@ pub async fn handle_upload(
info!("new media upload id: {} token: {:?}", record_id, &token);
server_state.firehose_publisher.publish_media_uploaded(
maybe_user_token.as_ref(),
&token)
.await
.map_err(|e| {
warn!("error publishing event: {:?}", e);
UploadError::ServerError
})?;
let firehose_result = match media_upload_source {
MediaUploadSource::DeviceApi => {
server_state.firehose_publisher.publish_device_media_recorded(
maybe_user_token.as_ref(),
&token).await
}
_ => {
server_state.firehose_publisher.publish_media_uploaded(
maybe_user_token.as_ref(),
&token).await
}
};
let _r = firehose_result.map_err(|e| {
warn!("error publishing event: {:?}", e);
UploadError::ServerError
})?;
Ok(SuccessCase::MediaSuccessfullyUploaded {
upload_token: token,