diff --git a/src/database/models.rs b/src/database/models.rs index 609488c..4d10b95 100644 --- a/src/database/models.rs +++ b/src/database/models.rs @@ -286,6 +286,25 @@ impl User { is_first_incident: incidents.is_empty(), }) } + + pub async fn count(&self, session: &Session) -> Result { + let result = session + .query_unpaged( + r#" + SELECT + user_id + FROM + payphone.users; + "#, + (), + ) + .await + .map_err(DatabaseError::QueryError)? + .into_rows_result() + .map_err(|_| DatabaseError::ResultNotRows)?; + + Ok(result.rows_num()) + } } impl From for User { diff --git a/src/groups/calls/commands.rs b/src/groups/calls/commands.rs index 7fe214d..2b4ac93 100644 --- a/src/groups/calls/commands.rs +++ b/src/groups/calls/commands.rs @@ -215,8 +215,9 @@ impl Command for SkipCommand { if let Some(call) = call { ctx.send() .content(format!( - "☎️ {}", - get_string_call_hangup_this_party(ctx.prefix) + "**TIP:** {}\n☎️ Skipped! Searching for a call...\n☎️ {}", + get_string_tips(ctx.prefix), + get_string_call_answered(ctx.prefix) )) .await .bye(); diff --git a/src/groups/calls/lists/hate-speech-and-slurs.txt b/src/groups/calls/lists/hate-speech-and-slurs.txt index b92884d..9a44d29 100644 --- a/src/groups/calls/lists/hate-speech-and-slurs.txt +++ b/src/groups/calls/lists/hate-speech-and-slurs.txt @@ -20,6 +20,8 @@ nlger nlgers ngiga ngigas +negaras +nigy diga digas fag @@ -30,6 +32,8 @@ fgot fgots fgt fgts +phagot +phagots retard retards rtrd