use crate::{
+ functions::lower,
naive_now,
newtypes::{DbUrl, PersonId},
schema::person::dsl::*,
- source::person::{Person, PersonForm},
+ source::person::{Person, PersonForm, PersonSafe},
traits::Crud,
};
-use diesel::{dsl::*, result::Error, ExpressionMethods, PgConnection, QueryDsl, RunQueryDsl, *};
+use diesel::{dsl::*, result::Error, ExpressionMethods, PgConnection, QueryDsl, RunQueryDsl};
use url::Url;
mod safe_type {
matrix_user_id,
admin,
bot_account,
+ ban_expires,
);
impl ToSafe for Person {
matrix_user_id,
admin,
bot_account,
+ ban_expires,
)
}
}
matrix_user_id,
admin,
bot_account,
+ ban_expires,
);
impl ToSafe for PersonAlias1 {
matrix_user_id,
admin,
bot_account,
+ ban_expires,
)
}
}
matrix_user_id,
admin,
bot_account,
+ ban_expires,
);
impl ToSafe for PersonAlias2 {
matrix_user_id,
admin,
bot_account,
+ ban_expires,
)
}
}
}
impl Person {
- pub fn ban_person(conn: &PgConnection, person_id: PersonId, ban: bool) -> Result<Self, Error> {
+ pub fn ban_person(
+ conn: &PgConnection,
+ person_id: PersonId,
+ ban: bool,
+ expires: Option<chrono::NaiveDateTime>,
+ ) -> Result<Self, Error> {
diesel::update(person.find(person_id))
- .set(banned.eq(ban))
+ .set((banned.eq(ban), ban_expires.eq(expires)))
.get_result::<Self>(conn)
}
person
.filter(deleted.eq(false))
.filter(local.eq(true))
- .filter(name.ilike(from_name))
+ .filter(lower(name).eq(lower(from_name)))
.first::<Person>(conn)
}
.set(deleted.eq(new_deleted))
.get_result::<Self>(conn)
}
+
+ pub fn is_banned(&self) -> bool {
+ is_banned(self.banned, self.ban_expires)
+ }
+
+ pub fn leave_admin(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
+ diesel::update(person.find(person_id))
+ .set(admin.eq(false))
+ .get_result::<Self>(conn)
+ }
+}
+
+impl PersonSafe {
+ pub fn is_banned(&self) -> bool {
+ is_banned(self.banned, self.ban_expires)
+ }
+}
+
+fn is_banned(banned_: bool, expires: Option<chrono::NaiveDateTime>) -> bool {
+ if let Some(expires) = expires {
+ banned_ && expires.gt(&naive_now())
+ } else {
+ banned_
+ }
}
#[cfg(test)]
let new_person = PersonForm {
name: "holly".into(),
+ public_key: "nada".to_owned(),
..PersonForm::default()
};
bot_account: false,
admin: false,
private_key: None,
- public_key: None,
+ public_key: "nada".to_owned(),
last_refreshed_at: inserted_person.published,
inbox_url: inserted_person.inbox_url.to_owned(),
shared_inbox_url: None,
matrix_user_id: None,
+ ban_expires: None,
};
let read_person = Person::read(&conn, inserted_person.id).unwrap();