use crate::{
- functions::lower,
- naive_now,
newtypes::{CommunityId, DbUrl, PersonId},
source::community::{
Community,
CommunitySafe,
},
traits::{ApubActor, Bannable, Crud, DeleteableOrRemoveable, Followable, Joinable},
+ utils::{functions::lower, naive_now},
};
use diesel::{
dsl::*,
RunQueryDsl,
TextExpressionMethods,
};
-use url::Url;
mod safe_type {
use crate::{schema::community::*, source::community::Community, traits::ToSafe};
local,
icon,
banner,
+ hidden,
+ posting_restricted_to_mods,
);
impl ToSafe for Community {
local,
icon,
banner,
+ hidden,
+ posting_restricted_to_mods,
)
}
}
.get_result::<Self>(conn)
}
- pub fn distinct_federated_communities(conn: &PgConnection) -> Result<Vec<String>, Error> {
+ pub fn distinct_federated_communities(conn: &PgConnection) -> Result<Vec<DbUrl>, Error> {
use crate::schema::community::dsl::*;
- community.select(actor_id).distinct().load::<String>(conn)
+ community.select(actor_id).distinct().load::<DbUrl>(conn)
}
pub fn upsert(conn: &PgConnection, community_form: &CommunityForm) -> Result<Community, Error> {
}
impl ApubActor for Community {
- fn read_from_apub_id(conn: &PgConnection, object_id: Url) -> Result<Option<Self>, Error> {
+ fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Option<Self>, Error> {
use crate::schema::community::dsl::*;
- let object_id: DbUrl = object_id.into();
Ok(
community
.filter(actor_id.eq(object_id))
#[cfg(test)]
mod tests {
use crate::{
- establish_unpooled_connection,
source::{community::*, person::*},
traits::{Bannable, Crud, Followable, Joinable},
+ utils::establish_unpooled_connection,
};
use serial_test::serial;
followers_url: inserted_community.followers_url.to_owned(),
inbox_url: inserted_community.inbox_url.to_owned(),
shared_inbox_url: None,
+ hidden: false,
+ posting_restricted_to_mods: false,
};
let community_follower_form = CommunityFollowerForm {