grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removing current instance, checking for federation enabled.

Browse source
This commit is contained in:
Dessalines 2020-09-22 21:12:42 -05:00
parent f4c0248d7a
commit b41edb35aa
1 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/api/mod.rs
View file

@ -99,31 +99,36 @@ pub(in crate::api) async fn check_community_ban(
} }
pub(in crate::api) async fn linked_instances(pool: &DbPool) -> Result<Vec<String>, LemmyError> { pub(in crate::api) async fn linked_instances(pool: &DbPool) -> Result<Vec<String>, LemmyError> {
let distinct_communities = blocking(pool, move |conn| {
Community::distinct_federated_communities(conn)
})
.await??;
let mut instances: Vec<String> = Vec::new(); let mut instances: Vec<String> = Vec::new();
for actor_id in &distinct_communities { if Settings::get().federation.enabled {
instances.push(Url::parse(actor_id)?.host_str().unwrap_or("").to_string()); let distinct_communities = blocking(pool, move |conn| {
Community::distinct_federated_communities(conn)
})
.await??;
for actor_id in &distinct_communities {
instances.push(Url::parse(actor_id)?.host_str().unwrap_or("").to_string());
}
let mut allowed_instances = Settings::get().get_allowed_instances();
instances.append(&mut allowed_instances);
let blocked_instances = Settings::get().get_blocked_instances();
for blocked in &blocked_instances {
instances.retain(|i| !i.eq(blocked));
}
// Sort and remove dupes
instances.sort_unstable();
instances.dedup();
// Remove the empties
instances.retain(|d| !d.eq(""));
// Remove the current instance
instances.retain(|d| !d.eq(&Settings::get().hostname));
} }
let mut allowed_instances = Settings::get().get_allowed_instances();
instances.append(&mut allowed_instances);
let blocked_instances = Settings::get().get_blocked_instances();
for blocked in &blocked_instances {
instances.retain(|i| !i.eq(blocked));
}
// Sort and remove dupes
instances.sort_unstable();
instances.dedup();
// Remove the empties
instances.retain(|d| !d.eq(""));
Ok(instances) Ok(instances)
} }