@here command now call only active users (at least 1 message in last 60 days)

This commit is contained in:
AB
2021-01-20 20:15:46 +03:00
parent 865fd3bbe4
commit 6c761d7576
2 changed files with 15 additions and 5 deletions

View File

@ -192,7 +192,7 @@ impl Execute for Sql {
#[async_trait]
impl Execute for Here {
async fn exec(&self, api: &Api, message: &Message) -> Result<(), Error> {
let members: Vec<telegram_bot::User> = db::get_members(message.chat.id()).unwrap();
let members: Vec<telegram_bot::User> = db::get_members(message.chat.id(), 60).unwrap();
for u in &members {
debug!("Found user {:?} in chat {}", u, message.chat.id());
}

View File

@ -180,17 +180,27 @@ pub(crate) async fn get_messages_user_all(
Ok(messages)
}
pub(crate) fn get_members(id: telegram_bot::ChatId) -> Result<Vec<telegram_bot::User>> {
pub(crate) fn get_members(id: telegram_bot::ChatId, limit: u32) -> Result<Vec<telegram_bot::User>> {
let where_statement = if limit > 0 {
format!("and days_seen <= {}", limit)
} else {
"".into()
};
debug!("{}", where_statement);
let conn = open()?;
let mut stmt = conn.prepare_cached(
"
SELECT DISTINCT(u.username), u.id, u.first_name, u.last_name, u.date
&format!("
SELECT DISTINCT(u.username), u.id, u.first_name, u.last_name, u.date,
(strftime('%s','now')-r.date)/60/60/24 as days_seen
FROM relations r
JOIN user u
ON u.id = r.user_id
LEFT JOIN conf c
ON r.conf_id = c.id
WHERE c.id = :id",
WHERE c.id = :id
{}
GROUP BY u.id
ORDER BY r.date DESC", where_statement),
)?;
let mut rows = stmt.query_named(&[(":id", &id.to_string())])?;
let mut users = Vec::new();