Skip to content

Commit d750fd8

Browse files
committed
cargo fmt
1 parent 9818d3f commit d750fd8

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

rsky-common/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pub mod env;
2-
pub mod explicit_slurs;
2+
pub mod explicit_slurs;

rsky-feedgen/src/apis/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use rsky_common::env::env_int;
21
use crate::db::*;
3-
use rsky_common::explicit_slurs::contains_explicit_slurs;
42
use crate::models::create_request::CreateRecord;
53
use crate::models::Lexicon::{AppBskyFeedFollow, AppBskyFeedLike, AppBskyFeedPost};
64
use crate::models::*;
@@ -15,6 +13,8 @@ use once_cell::sync::Lazy;
1513
use rand::Rng;
1614
use regex::Regex;
1715
use rocket::State;
16+
use rsky_common::env::env_int;
17+
use rsky_common::explicit_slurs::contains_explicit_slurs;
1818
use rsky_lexicon::app::bsky::embed::{Embeds, MediaUnion};
1919
use rsky_lexicon::app::bsky::feed::PostLabels;
2020
use std::collections::HashSet;
@@ -1179,7 +1179,7 @@ mod tests {
11791179
show_sponsored_post: false,
11801180
sponsored_post_uri: "at://did:example/sponsored-post".to_string(),
11811181
sponsored_post_probability: 1.0,
1182-
trending_percentile_min: 0.9
1182+
trending_percentile_min: 0.9,
11831183
};
11841184
let rocket = before(config.clone());
11851185

@@ -1238,7 +1238,7 @@ mod tests {
12381238
show_sponsored_post: true,
12391239
sponsored_post_uri: "at://did:example/sponsored-post".to_string(),
12401240
sponsored_post_probability: 1.0,
1241-
trending_percentile_min: 0.9
1241+
trending_percentile_min: 0.9,
12421242
};
12431243
let rocket = before(config.clone());
12441244

@@ -1296,7 +1296,7 @@ mod tests {
12961296
show_sponsored_post: true,
12971297
sponsored_post_uri: "at://did:example/sponsored-post".to_string(),
12981298
sponsored_post_probability: 1.0,
1299-
trending_percentile_min: 0.9
1299+
trending_percentile_min: 0.9,
13001300
};
13011301
let rocket = before(config.clone());
13021302

@@ -1355,7 +1355,7 @@ mod tests {
13551355
show_sponsored_post: true,
13561356
sponsored_post_uri: "at://did:example/sponsored-post".to_string(),
13571357
sponsored_post_probability: 0.5,
1358-
trending_percentile_min: 0.9
1358+
trending_percentile_min: 0.9,
13591359
};
13601360
let rocket = before(config.clone());
13611361

@@ -1426,7 +1426,7 @@ mod tests {
14261426
show_sponsored_post: true,
14271427
sponsored_post_uri: "at://did:example/sponsored-post".to_string(),
14281428
sponsored_post_probability: 1.0,
1429-
trending_percentile_min: 0.9
1429+
trending_percentile_min: 0.9,
14301430
};
14311431
let rocket = before(config.clone());
14321432

rsky-labeler/src/main.rs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ async fn get_labels(
124124

125125
async fn label_subject(
126126
agent: &AtpAgent<MemorySessionStore, ReqwestClient>,
127-
subject_ref: EmitEventInputSubjectRefs
127+
subject_ref: EmitEventInputSubjectRefs,
128128
) -> Result<(), Box<dyn std::error::Error>> {
129129
let label_result = agent
130130
.api
@@ -140,7 +140,8 @@ async fn label_subject(
140140
ModEventLabel {
141141
data: ModEventLabelData {
142142
comment: Some(
143-
env::var("MOD_SERVICE_LABEL_REASON").unwrap_or("Explicit slur filter".to_string()),
143+
env::var("MOD_SERVICE_LABEL_REASON")
144+
.unwrap_or("Explicit slur filter".to_string()),
144145
),
145146
create_label_vals: vec![env::var("MOD_SERVICE_LABEL")
146147
.unwrap_or("antiblack-harassment".to_string())],
@@ -193,7 +194,7 @@ async fn tag_subject(
193194
async fn create_report(
194195
agent: &AtpAgent<MemorySessionStore, ReqwestClient>,
195196
subject_ref: EmitEventInputSubjectRefs,
196-
reason: Option<String>
197+
reason: Option<String>,
197198
) -> Result<(), Box<dyn std::error::Error>> {
198199
let report_result = agent
199200
.api
@@ -362,17 +363,21 @@ async fn process(
362363
continue;
363364
}
364365
if env_bool("ENABLE_CREATE_REPORT").unwrap_or(true) {
365-
match create_report(agent, auto_report.subject_ref.clone(), auto_report.reason).await {
366+
match create_report(
367+
agent,
368+
auto_report.subject_ref.clone(),
369+
auto_report.reason,
370+
)
371+
.await
372+
{
366373
Ok(()) => (),
367374
Err(error) => {
368375
eprintln!("@LOG: Failed to create report for record: {error:?}")
369376
}
370377
}
371378
}
372379
if env_bool("ENABLE_CREATE_LABEL").unwrap_or(true) {
373-
match label_subject(agent, auto_report.subject_ref.clone())
374-
.await
375-
{
380+
match label_subject(agent, auto_report.subject_ref.clone()).await {
376381
Ok(()) => (),
377382
Err(error) => eprintln!("@LOG: Failed to label record: {error:?}"),
378383
}

rsky-lexicon/src/com/atproto/label/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use chrono::{DateTime, Utc};
55
#[derive(Debug, Serialize, Deserialize)]
66
pub struct SubscribeLabels {
77
pub seq: i64,
8-
pub labels: Vec<Label>
8+
pub labels: Vec<Label>,
99
}
1010

1111
/// Metadata tag on an atproto resource (eg, repo or record).

0 commit comments

Comments
 (0)