untested hashtag boost

pull/14/head
Ondřej Hruška 3 years ago
parent 012f8717de
commit 3b7700a4b1
Signed by: MightyPork
GPG Key ID: 2C5FD5035250423D
  1. 1
      Cargo.lock
  2. 4
      Cargo.toml
  3. 178
      src/command.rs
  4. 354
      src/group_handle.rs
  5. 43
      src/store/data.rs
  6. 2
      src/store/mod.rs

1
Cargo.lock generated

@ -276,7 +276,6 @@ checksum = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
[[package]] [[package]]
name = "elefren" name = "elefren"
version = "0.22.0" version = "0.22.0"
source = "git+https://git.ondrovo.com/MightyPork/elefren-fork.git#de38639fd178ae8ae47adb880ed965437a3d608e"
dependencies = [ dependencies = [
"chrono", "chrono",
"doc-comment", "doc-comment",

@ -10,8 +10,8 @@ build = "build.rs"
[dependencies] [dependencies]
#elefren = { version = "0.22.0", features = ["toml"] } #elefren = { version = "0.22.0", features = ["toml"] }
#elefren = { path = "../elefren22-fork" } elefren = { path = "../elefren22-fork" }
elefren = { git = "https://git.ondrovo.com/MightyPork/elefren-fork.git" } #elefren = { git = "https://git.ondrovo.com/MightyPork/elefren-fork.git" }
env_logger = "0.9.0" env_logger = "0.9.0"

@ -3,22 +3,54 @@ use regex::Regex;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub enum StatusCommand { pub enum StatusCommand {
Boost, /// Ignore this post
Ignore, Ignore,
/// Boost the previous post in the thread
Boost,
/// Admin: Ban a user
BanUser(String), BanUser(String),
/// Admin: Un-ban a server
UnbanUser(String), UnbanUser(String),
/// Admin: Ban a server
BanServer(String), BanServer(String),
/// Admin: Un-ban a server
UnbanServer(String), UnbanServer(String),
/// Admin: Add a member to a closed group (or force join)
AddMember(String), AddMember(String),
/// Admin: Remove a user from the group, also unfollow
RemoveMember(String), RemoveMember(String),
/// Admin: Add a hashtag to the group
AddTag(String),
/// Admin: Remove a hashtag from the group
RemoveTag(String),
/// Admin: Give admin to a user
GrantAdmin(String), GrantAdmin(String),
/// Admin: Revoke admin to a user
RemoveAdmin(String), RemoveAdmin(String),
/// Admin: Send a public announcement
Announce(String), Announce(String),
/// Admin: Make the group open-access
OpenGroup, OpenGroup,
/// Admin: Make the group member-only, this effectively disables posting from non-members
/// and disables /join and follow-back
CloseGroup, CloseGroup,
/// Show help. The content varies by group params (open/closed access), the user's privileges
/// and membership status.
Help, Help,
/// Show members. Non-admins will only see a list of admins.
ListMembers, ListMembers,
/// Show tags.
ListTags,
/// Leave the group, this asks the group to unfollow the user and also revokes their membership.
Leave, Leave,
/// Join a public group. This is normally not needed, as the group follows back and adds followers as members.
/// Manual join is useful when the follow somehow fails, or when the user wants to be able to
/// post without receiving the group's posts (naughty!)
///
/// In member-only groups, this will just DM the user some info on how to get added.
Join,
/// The group will DM "Pong" back, this is to test that the daemon is running and also that the
/// user is not banned and federates.
Ping, Ping,
} }
@ -27,12 +59,19 @@ macro_rules! p_user {
r"(@?[a-zA-Z0-9_.-]+@[a-zA-Z0-9_.-]+\.[a-z0-9_-]+|@[a-zA-Z0-9_.-]+)" r"(@?[a-zA-Z0-9_.-]+@[a-zA-Z0-9_.-]+\.[a-z0-9_-]+|@[a-zA-Z0-9_.-]+)"
}; };
} }
macro_rules! p_server { macro_rules! p_server {
() => { () => {
r"([a-zA-Z0-9_.-]+\.[a-zA-Z0-9_-]+)" r"([a-zA-Z0-9_.-]+\.[a-zA-Z0-9_-]+)"
}; };
} }
macro_rules! p_hashtag {
() => {
r"#(\w+)"
};
}
macro_rules! command { macro_rules! command {
($($val:expr),+) => { ($($val:expr),+) => {
Regex::new(concat!(r"(?:^|\s|>|\n)[\\/]", $($val,)+ r"(?:$|[!,]|\W)")).unwrap() Regex::new(concat!(r"(?:^|\s|>|\n)[\\/]", $($val,)+ r"(?:$|[!,]|\W)")).unwrap()
@ -55,6 +94,10 @@ static RE_ADD_MEMBER: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:
static RE_REMOVE_MEMBER: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:kick|remove)\s+", p_user!())); static RE_REMOVE_MEMBER: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:kick|remove)\s+", p_user!()));
static RE_ADD_TAG: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:add)\s+", p_hashtag!()));
static RE_REMOVE_TAG: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:remove)\s+", p_hashtag!()));
static RE_GRANT_ADMIN: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:op|admin)\s+", p_user!())); static RE_GRANT_ADMIN: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:op|admin)\s+", p_user!()));
static RE_REVOKE_ADMIN: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:deop|deadmin)\s+", p_user!())); static RE_REVOKE_ADMIN: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:deop|deadmin)\s+", p_user!()));
@ -67,14 +110,37 @@ static RE_HELP: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"help"));
static RE_MEMBERS: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:members|who)")); static RE_MEMBERS: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:members|who)"));
static RE_TAGS: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:hashtags|tags)"));
static RE_LEAVE: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:leave)")); static RE_LEAVE: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:leave)"));
static RE_JOIN: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:join)"));
static RE_PING: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:ping)")); static RE_PING: once_cell::sync::Lazy<Regex> = Lazy::new(|| command!(r"(?:ping)"));
static RE_ANNOUNCE: once_cell::sync::Lazy<Regex> = static RE_ANNOUNCE: once_cell::sync::Lazy<Regex> =
Lazy::new(|| Regex::new(concat!(r"(?:^|\s|>|\n)[\\/]announce\s+(.*)$")).unwrap()); Lazy::new(|| Regex::new(concat!(r"(?:^|\s|>|\n)[\\/]announce\s+(.*)$")).unwrap());
pub fn parse_status(content: &str) -> Vec<StatusCommand> { static RE_A_HASHTAG: once_cell::sync::Lazy<Regex> =
Lazy::new(|| Regex::new(concat!(r"\b#(\w+)")).unwrap());
pub fn parse_status_tags(content: &str) -> Vec<String> {
debug!("Raw content: {}", content);
let content = content.replace("<br/>", " ");
let content = voca_rs::strip::strip_tags(&content);
debug!("Stripped tags: {}", content);
let mut tags = vec![];
for c in RE_A_HASHTAG.captures_iter(&content) {
if let Some(s) = c.get(1) {
tags.push(s.as_str().to_string())
}
}
tags
}
pub fn parse_slash_commands(content: &str) -> Vec<StatusCommand> {
debug!("Raw content: {}", content); debug!("Raw content: {}", content);
let content = content.replace("<br/>", " "); let content = content.replace("<br/>", " ");
@ -111,6 +177,9 @@ pub fn parse_status(content: &str) -> Vec<StatusCommand> {
if RE_LEAVE.is_match(&content) { if RE_LEAVE.is_match(&content) {
debug!("LEAVE"); debug!("LEAVE");
commands.push(StatusCommand::Leave); commands.push(StatusCommand::Leave);
} else if RE_JOIN.is_match(&content) {
debug!("JOIN");
commands.push(StatusCommand::Join);
} }
if RE_PING.is_match(&content) { if RE_PING.is_match(&content) {
@ -123,6 +192,11 @@ pub fn parse_status(content: &str) -> Vec<StatusCommand> {
commands.push(StatusCommand::ListMembers); commands.push(StatusCommand::ListMembers);
} }
if RE_TAGS.is_match(&content) {
debug!("TAGS");
commands.push(StatusCommand::ListTags);
}
if RE_OPEN_GROUP.is_match(&content) { if RE_OPEN_GROUP.is_match(&content) {
debug!("OPEN GROUP"); debug!("OPEN GROUP");
commands.push(StatusCommand::OpenGroup); commands.push(StatusCommand::OpenGroup);
@ -188,11 +262,27 @@ pub fn parse_status(content: &str) -> Vec<StatusCommand> {
if let Some(s) = c.get(1) { if let Some(s) = c.get(1) {
let s = s.as_str(); let s = s.as_str();
let s = s.trim_start_matches('@'); let s = s.trim_start_matches('@');
debug!("UNBAN USER: {}", s); debug!("REMOVE USER: {}", s);
commands.push(StatusCommand::RemoveMember(s.to_owned())); commands.push(StatusCommand::RemoveMember(s.to_owned()));
} }
} }
for c in RE_ADD_TAG.captures_iter(&content) {
if let Some(s) = c.get(1) {
let s = s.as_str();
debug!("ADD TAG: {}", s);
commands.push(StatusCommand::AddTag(s.to_owned()));
}
}
for c in RE_REMOVE_TAG.captures_iter(&content) {
if let Some(s) = c.get(1) {
let s = s.as_str();
debug!("REMOVE TAG: {}", s);
commands.push(StatusCommand::RemoveTag(s.to_owned()));
}
}
for c in RE_GRANT_ADMIN.captures_iter(&content) { for c in RE_GRANT_ADMIN.captures_iter(&content) {
if let Some(s) = c.get(1) { if let Some(s) = c.get(1) {
let s = s.as_str(); let s = s.as_str();
@ -216,11 +306,11 @@ pub fn parse_status(content: &str) -> Vec<StatusCommand> {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use crate::command::{parse_status, StatusCommand}; use crate::command::{parse_slash_commands, StatusCommand, RE_JOIN, RE_ADD_TAG, RE_A_HASHTAG};
use super::{ use super::{
RE_ADD_MEMBER, RE_ANNOUNCE, RE_BAN_SERVER, RE_BAN_USER, RE_BOOST, RE_CLOSE_GROUP, RE_GRANT_ADMIN, RE_HELP, RE_ADD_MEMBER, RE_ANNOUNCE, RE_BAN_SERVER, RE_BAN_USER, RE_BOOST, RE_CLOSE_GROUP, RE_GRANT_ADMIN, RE_HELP,
RE_IGNORE, RE_LEAVE, RE_MEMBERS, RE_OPEN_GROUP, RE_REMOVE_MEMBER, RE_REVOKE_ADMIN, RE_IGNORE, RE_LEAVE, RE_MEMBERS, RE_TAGS, RE_OPEN_GROUP, RE_REMOVE_MEMBER, RE_REVOKE_ADMIN,
}; };
#[test] #[test]
@ -276,23 +366,18 @@ mod test {
assert!(RE_BAN_USER.is_match("/ban @LAIN@PleromA.soykaf.com")); assert!(RE_BAN_USER.is_match("/ban @LAIN@PleromA.soykaf.com"));
let c = RE_BAN_USER.captures("/ban lain@pleroma.soykaf.com"); let c = RE_BAN_USER.captures("/ban lain@pleroma.soykaf.com");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "lain@pleroma.soykaf.com"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "lain@pleroma.soykaf.com");
let c = RE_BAN_USER.captures("/ban lain@pleroma.soykaf.com xx"); let c = RE_BAN_USER.captures("/ban lain@pleroma.soykaf.com xx");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "lain@pleroma.soykaf.com"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "lain@pleroma.soykaf.com");
let c = RE_BAN_USER.captures("/ban @lain@pleroma.soykaf.com"); let c = RE_BAN_USER.captures("/ban @lain@pleroma.soykaf.com");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain@pleroma.soykaf.com"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain@pleroma.soykaf.com");
let c = RE_BAN_USER.captures("/ban @lain"); let c = RE_BAN_USER.captures("/ban @lain");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain");
let c = RE_BAN_USER.captures("/ban @lain xx"); let c = RE_BAN_USER.captures("/ban @lain xx");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain");
} }
@ -306,11 +391,9 @@ mod test {
assert!(!RE_BAN_SERVER.is_match("/ban @pleroma.soykaf.com")); assert!(!RE_BAN_SERVER.is_match("/ban @pleroma.soykaf.com"));
let c = RE_BAN_SERVER.captures("/ban pleroma.soykaf.com"); let c = RE_BAN_SERVER.captures("/ban pleroma.soykaf.com");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "pleroma.soykaf.com"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "pleroma.soykaf.com");
let c = RE_BAN_SERVER.captures("/ban pleroma.soykaf.com xx"); let c = RE_BAN_SERVER.captures("/ban pleroma.soykaf.com xx");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "pleroma.soykaf.com"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "pleroma.soykaf.com");
} }
@ -321,7 +404,6 @@ mod test {
assert!(RE_ADD_MEMBER.is_match("\\add @lain")); assert!(RE_ADD_MEMBER.is_match("\\add @lain"));
let c = RE_ADD_MEMBER.captures("/add @lain"); let c = RE_ADD_MEMBER.captures("/add @lain");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain");
} }
@ -337,10 +419,34 @@ mod test {
assert!(RE_REMOVE_MEMBER.is_match("/remove @lain")); assert!(RE_REMOVE_MEMBER.is_match("/remove @lain"));
let c = RE_REMOVE_MEMBER.captures("/kick lain@pleroma.soykaf.com"); let c = RE_REMOVE_MEMBER.captures("/kick lain@pleroma.soykaf.com");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "lain@pleroma.soykaf.com"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "lain@pleroma.soykaf.com");
} }
#[test]
fn test_add_member() {
assert!(RE_ADD_TAG.is_match("/add #breadposting"));
assert!(RE_ADD_TAG.is_match("/add #čučkaři"));
assert!(RE_ADD_TAG.is_match("/add #χαλβάς"));
assert!(RE_ADD_TAG.is_match("\\add #ласточка"));
assert!(RE_ADD_TAG.is_match("/add #nya."));
assert!(RE_ADD_TAG.is_match("/add #nya)"));
let c = RE_ADD_TAG.captures("/add #breadposting");
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "breadposting");
let c = RE_ADD_TAG.captures("/add #χαλβάς");
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "χαλβάς");
let c = RE_ADD_TAG.captures("/add #ласточка");
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "ласточка");
let c = RE_ADD_TAG.captures("#nya.");
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "nya");
let c = RE_ADD_TAG.captures("#nya)");
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "nya");
}
#[test] #[test]
fn test_add_admin() { fn test_add_admin() {
assert!(!RE_GRANT_ADMIN.is_match("/expel lain@pleroma.soykaf.com")); assert!(!RE_GRANT_ADMIN.is_match("/expel lain@pleroma.soykaf.com"));
@ -350,7 +456,6 @@ mod test {
assert!(RE_GRANT_ADMIN.is_match("\\op @lain")); assert!(RE_GRANT_ADMIN.is_match("\\op @lain"));
let c = RE_GRANT_ADMIN.captures("/op @lain@pleroma.soykaf.com"); let c = RE_GRANT_ADMIN.captures("/op @lain@pleroma.soykaf.com");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain@pleroma.soykaf.com"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain@pleroma.soykaf.com");
} }
@ -362,7 +467,6 @@ mod test {
assert!(RE_REVOKE_ADMIN.is_match("/deadmin @lain")); assert!(RE_REVOKE_ADMIN.is_match("/deadmin @lain"));
let c = RE_REVOKE_ADMIN.captures("/deadmin @lain"); let c = RE_REVOKE_ADMIN.captures("/deadmin @lain");
assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain"); assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain");
} }
@ -405,6 +509,27 @@ mod test {
assert!(RE_MEMBERS.is_match("/who")); assert!(RE_MEMBERS.is_match("/who"));
} }
#[test]
fn test_members() {
assert!(!RE_TAGS.is_match("/members"));
assert!(RE_TAGS.is_match("/hashtags"));
assert!(RE_TAGS.is_match("dsfsd /tags dfgd d"));
}
#[test]
fn test_match_tag() {
assert!(!RE_A_HASHTAG.is_match("banana sdfsdf sdfsd fdsf sd"));
assert!(RE_A_HASHTAG.is_match("#banana"));
assert!(RE_A_HASHTAG.is_match("#ласточка"));
assert!(RE_A_HASHTAG.is_match("#χαλβάς"));
assert!(RE_A_HASHTAG.is_match("foo #banana gfdfgd"));
let c = RE_GRANT_ADMIN.captures("foo #banana #χαλβάς #ласточка.");
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "banana");
assert_eq!(c.unwrap().get(2).unwrap().as_str(), "χαλβάς");
assert_eq!(c.unwrap().get(3).unwrap().as_str(), "ласточка");
}
#[test] #[test]
fn test_leave() { fn test_leave() {
assert!(!RE_LEAVE.is_match("/list")); assert!(!RE_LEAVE.is_match("/list"));
@ -414,6 +539,15 @@ mod test {
assert!(RE_LEAVE.is_match("/leave z")); assert!(RE_LEAVE.is_match("/leave z"));
} }
#[test]
fn test_leave() {
assert!(!RE_JOIN.is_match("/list"));
assert!(RE_JOIN.is_match("/join"));
assert!(RE_JOIN.is_match("/join"));
assert!(RE_JOIN.is_match("x /join"));
assert!(RE_JOIN.is_match("/join z"));
}
#[test] #[test]
fn test_announce() { fn test_announce() {
assert!(!RE_ANNOUNCE.is_match("/list")); assert!(!RE_ANNOUNCE.is_match("/list"));
@ -435,15 +569,15 @@ mod test {
fn test_real_post() { fn test_real_post() {
assert_eq!( assert_eq!(
Vec::<StatusCommand>::new(), Vec::<StatusCommand>::new(),
parse_status("Hello there is nothing here /fake command") parse_slash_commands("Hello there is nothing here /fake command")
); );
assert_eq!( assert_eq!(
vec![StatusCommand::Help], vec![StatusCommand::Help],
parse_status("lets see some \\help and /ban @lain") parse_slash_commands("lets see some \\help and /ban @lain")
); );
assert_eq!( assert_eq!(
vec![StatusCommand::Ignore], vec![StatusCommand::Ignore],
parse_status("lets see some /ignore and /ban @lain") parse_slash_commands("lets see some /ignore and /ban @lain")
); );
assert_eq!( assert_eq!(
vec![ vec![
@ -451,7 +585,7 @@ mod test {
StatusCommand::BanUser("piggo@piggo.space".to_string()), StatusCommand::BanUser("piggo@piggo.space".to_string()),
StatusCommand::BanServer("soykaf.com".to_string()) StatusCommand::BanServer("soykaf.com".to_string())
], ],
parse_status("let's /ban @lain! /ban @piggo@piggo.space and also /ban soykaf.com") parse_slash_commands("let's /ban @lain! /ban @piggo@piggo.space and also /ban soykaf.com")
); );
} }
@ -459,13 +593,13 @@ mod test {
fn test_strip() { fn test_strip() {
assert_eq!( assert_eq!(
vec![StatusCommand::BanUser("betty".to_string())], vec![StatusCommand::BanUser("betty".to_string())],
parse_status( parse_slash_commands(
r#"Let's bad the naughty bot: /ban <span class="h-card"><a class="u-url mention" data-user="9nXpaGZL88fPAiP8xU" href="https://piggo.space/users/betty" rel="ugc">@<span>betty</span></a></span>"# r#"Let's bad the naughty bot: /ban <span class="h-card"><a class="u-url mention" data-user="9nXpaGZL88fPAiP8xU" href="https://piggo.space/users/betty" rel="ugc">@<span>betty</span></a></span>"#
) )
); );
assert_eq!( assert_eq!(
vec![StatusCommand::BanUser("betty@abstarbauze.com".to_string())], vec![StatusCommand::BanUser("betty@abstarbauze.com".to_string())],
parse_status( parse_slash_commands(
r#"Let's bad the naughty bot: /ban <span class="h-card"><a class="u-url mention" data-user="9nXpaGZL88fPAiP8xU" href="https://piggo.space/users/betty" rel="ugc">@<span>betty@abstarbauze.com</span></a></span>"# r#"Let's bad the naughty bot: /ban <span class="h-card"><a class="u-url mention" data-user="9nXpaGZL88fPAiP8xU" href="https://piggo.space/users/betty" rel="ugc">@<span>betty@abstarbauze.com</span></a></span>"#
) )
); );

@ -2,19 +2,21 @@ use std::collections::HashSet;
use std::sync::Arc; use std::sync::Arc;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use elefren::{FediClient, StatusBuilder};
use elefren::debug::EventDisplay; use elefren::debug::EventDisplay;
use elefren::debug::NotificationDisplay; use elefren::debug::NotificationDisplay;
use elefren::debug::StatusDisplay;
use elefren::entities::event::Event; use elefren::entities::event::Event;
use elefren::entities::notification::{Notification, NotificationType}; use elefren::entities::notification::{Notification, NotificationType};
use elefren::entities::status::Status;
use elefren::status_builder::Visibility; use elefren::status_builder::Visibility;
use elefren::{FediClient, StatusBuilder};
use futures::StreamExt; use futures::StreamExt;
use crate::command::StatusCommand; use crate::command::StatusCommand;
use crate::error::GroupError; use crate::error::GroupError;
use crate::store::data::GroupConfig;
use crate::store::ConfigStore; use crate::store::ConfigStore;
use crate::utils::{normalize_acct, LogError}; use crate::store::data::GroupConfig;
use crate::utils::{LogError, normalize_acct};
/// This is one group's config store capable of persistence /// This is one group's config store capable of persistence
#[derive(Debug)] #[derive(Debug)]
@ -27,6 +29,9 @@ pub struct GroupHandle {
const DELAY_BEFORE_ACTION: Duration = Duration::from_millis(250); const DELAY_BEFORE_ACTION: Duration = Duration::from_millis(250);
const DELAY_REOPEN_STREAM: Duration = Duration::from_millis(1000); const DELAY_REOPEN_STREAM: Duration = Duration::from_millis(1000);
const MAX_CATCHUP_NOTIFS: usize = 25; const MAX_CATCHUP_NOTIFS: usize = 25;
// also statuses
const MAX_CATCHUP_STATUSES: usize = 100;
// higher because we can expect a lot of non-hashtag statuses here
const PERIODIC_SAVE: Duration = Duration::from_secs(60); const PERIODIC_SAVE: Duration = Duration::from_secs(60);
const PING_INTERVAL: Duration = Duration::from_secs(15); // must be < periodic save! const PING_INTERVAL: Duration = Duration::from_secs(15); // must be < periodic save!
@ -45,6 +50,7 @@ impl GroupHandle {
Ok(()) Ok(())
} }
/*
pub async fn reload(&mut self) -> Result<(), GroupError> { pub async fn reload(&mut self) -> Result<(), GroupError> {
if let Some(g) = self.store.get_group_config(self.config.get_acct()).await { if let Some(g) = self.store.get_group_config(self.config.get_acct()).await {
self.config = g; self.config = g;
@ -53,6 +59,7 @@ impl GroupHandle {
Err(GroupError::GroupNotExist) Err(GroupError::GroupNotExist)
} }
} }
*/
} }
trait NotifTimestamp { trait NotifTimestamp {
@ -65,6 +72,14 @@ impl NotifTimestamp for Notification {
} }
} }
impl NotifTimestamp for Status {
fn timestamp_millis(&self) -> u64 {
// this may not work well for unseen status tracking,
// if ancient statuses were to appear in the timeline :(
self.created_at.timestamp_millis().max(0) as u64
}
}
impl GroupHandle { impl GroupHandle {
pub async fn run(&mut self) -> Result<(), GroupError> { pub async fn run(&mut self) -> Result<(), GroupError> {
assert!(PERIODIC_SAVE >= PING_INTERVAL); assert!(PERIODIC_SAVE >= PING_INTERVAL);
@ -89,6 +104,20 @@ impl GroupHandle {
} }
} }
match self.catch_up_with_missed_statuses().await {
Ok(true) => {
debug!("Some missed statuses handled");
// Save asap!
next_save = Instant::now() - PERIODIC_SAVE
}
Ok(false) => {
debug!("No statuses missed");
}
Err(e) => {
error!("Failed to handle missed statuses: {}", e);
}
}
loop { loop {
if next_save < Instant::now() { if next_save < Instant::now() {
self.save_if_needed().await.log_error("Failed to save group"); self.save_if_needed().await.log_error("Failed to save group");
@ -104,7 +133,9 @@ impl GroupHandle {
Ok(Some(event)) => { Ok(Some(event)) => {
debug!("(@{}) Event: {}", self.config.get_acct(), EventDisplay(&event)); debug!("(@{}) Event: {}", self.config.get_acct(), EventDisplay(&event));
match event { match event {
Event::Update(_status) => {} Event::Update(status) => {
self.handle_status(status).await.log_error("Error handling a status");
}
Event::Notification(n) => { Event::Notification(n) => {
self.handle_notification(n).await.log_error("Error handling a notification"); self.handle_notification(n).await.log_error("Error handling a notification");
} }
@ -156,7 +187,7 @@ impl GroupHandle {
return Ok(()); return Ok(());
} }
let commands = crate::command::parse_status(&status.content); let commands = crate::command::parse_slash_commands(&status.content);
let mut replies = vec![]; let mut replies = vec![];
let mut announcements = vec![]; let mut announcements = vec![];
@ -205,6 +236,9 @@ impl GroupHandle {
any_admin_cmd = true; any_admin_cmd = true;
replies.push(format!("User {} banned from group!", u)); replies.push(format!("User {} banned from group!", u));
self.unfollow_user(&u).await
.log_error("Failed to unfollow");
// no announcement here // no announcement here
} }
Err(e) => { Err(e) => {
@ -280,11 +314,7 @@ impl GroupHandle {
Ok(_) => { Ok(_) => {
any_admin_cmd = true; any_admin_cmd = true;
replies.push(format!("User {} added to the group!", u)); replies.push(format!("User {} added to the group!", u));
self.follow_user(&u).await.log_error("Failed to follow");
if self.config.is_member_only() {
announcements
.push(format!("Welcome new member @{} to the group!", u));
}
} }
Err(e) => { Err(e) => {
replies.push(format!("Failed to add user {} to group: {}", u, e)); replies.push(format!("Failed to add user {} to group: {}", u, e));
@ -303,6 +333,9 @@ impl GroupHandle {
Ok(_) => { Ok(_) => {
any_admin_cmd = true; any_admin_cmd = true;
replies.push(format!("User {} removed from the group.", u)); replies.push(format!("User {} removed from the group.", u));
self.unfollow_user(&u).await
.log_error("Failed to unfollow");
} }
Err(_) => { Err(_) => {
unreachable!() unreachable!()
@ -313,12 +346,33 @@ impl GroupHandle {
replies.push("Only admins can manage members".to_string()); replies.push("Only admins can manage members".to_string());
} }
} }
StatusCommand::AddTag(tag) => {
if is_admin {
any_admin_cmd = true;
self.config.add_tag(&tag);
replies.push(format!("Tag #{} added to the group!", tag));
} else {
replies.push("Only admins can manage group tags".to_string());
}
}
StatusCommand::RemoveTag(tag) => {
if is_admin {
any_admin_cmd = true;
self.config.remove_tag(&tag);
replies.push(format!("Tag #{} removed from the group!", tag));
} else {
replies.push("Only admins can manage group tags".to_string());
}
}
StatusCommand::GrantAdmin(u) => { StatusCommand::GrantAdmin(u) => {
let u = normalize_acct(&u, &group_acct)?; let u = normalize_acct(&u, &group_acct)?;
if is_admin { if is_admin {
if !self.config.is_admin(&u) { if !self.config.is_admin(&u) {
match self.config.set_admin(&u, true) { match self.config.set_admin(&u, true) {
Ok(_) => { Ok(_) => {
// try to make the config a little more sane, admins should be members
let _ = self.config.set_member(&u, true);
any_admin_cmd = true; any_admin_cmd = true;
replies.push(format!("User {} is now a group admin!", u)); replies.push(format!("User {} is now a group admin!", u));
announcements announcements
@ -409,12 +463,13 @@ impl GroupHandle {
**Supported commands:**\n\ **Supported commands:**\n\
`/boost, /b` - boost the replied-to post into the group\n\ `/boost, /b` - boost the replied-to post into the group\n\
`/ignore, /i` - make the group completely ignore the post\n\ `/ignore, /i` - make the group completely ignore the post\n\
`/ping` - check that the service is alive".to_string(), `/ping` - check that the service is alive\n\
`/join` - join the group\n\
`/leave` - leave the group".to_string(),
); );
if self.config.is_member_only() { if self.config.is_member_only() {
replies.push("`/members, /who` - show group members / admins".to_string()); replies.push("`/members, /who` - show group members / admins".to_string());
replies.push("`/leave` - leave the group".to_string());
} else { } else {
replies.push("`/members, /who` - show group admins".to_string()); replies.push("`/members, /who` - show group admins".to_string());
} }
@ -441,18 +496,7 @@ impl GroupHandle {
if is_admin { if is_admin {
if self.config.is_member_only() { if self.config.is_member_only() {
replies.push("Group members:".to_string()); replies.push("Group members:".to_string());
let admins = self.config.get_admins().collect::<HashSet<_>>(); self.list_members(&mut replies);
let mut members = self.config.get_members().collect::<Vec<_>>();
members.extend(admins.iter());
members.sort();
members.dedup();
for m in members {
if admins.contains(&m) {
replies.push(format!("{} [admin]", m));
} else {
replies.push(m.to_string());
}
}
} else { } else {
show_admins = true; show_admins = true;
} }
@ -462,18 +506,55 @@ impl GroupHandle {
if show_admins { if show_admins {
replies.push("Group admins:".to_string()); replies.push("Group admins:".to_string());
let mut admins = self.config.get_admins().collect::<Vec<_>>(); self.list_admins(&mut replies);
admins.sort(); }
for a in admins { }
replies.push(a.to_string()); StatusCommand::ListTags => {
} replies.push("Group tags:".to_string());
let mut tags = self.config.get_tags().collect::<Vec<_>>();
tags.sort();
for t in tags {
replies.push(format!("#{}", t));
} }
} }
StatusCommand::Leave => { StatusCommand::Leave => {
if self.config.is_member(&notif_acct) { if self.config.is_member_or_admin(&notif_acct) {
// admin can leave but that's a bad idea
any_admin_cmd = true; any_admin_cmd = true;
let _ = self.config.set_member(&notif_acct, false); let _ = self.config.set_member(&notif_acct, false);
replies.push("You left the group.".to_string()); replies.push("You're no longer a group member. Unfollow the group user to stop receiving group messages.".to_string());
self.unfollow_user(&notif_acct).await
.log_error("Failed to unfollow");
}
}
StatusCommand::Join => {
if self.config.is_member_or_admin(&notif_acct) {
// Already a member, so let's try to follow the user
// again, maybe first time it failed
self.follow_user(&notif_acct).await
.log_error("Failed to follow");
} else {
// Not a member yet
if self.config.is_member_only() {
// No you can't
replies.push(format!(
"Hi, this group is closed to new sign-ups.\n\
Please ask one of the group admins to add you:"));
self.list_admins(&mut replies);
} else {
// Open access
self.follow_user(&notif_acct).await
.log_error("Failed to follow");
// This only fails if the user is banned, but that is filtered above
let _ = self.config.set_member(&notif_acct, true);
replies.push(format!("\
Thanks for joining, you are now a member and the group user will \
follow you so you can use group hashtags. Make sure you follow the \
group user to receive group messages."));
}
} }
} }
StatusCommand::Ping => { StatusCommand::Ping => {
@ -524,43 +605,106 @@ impl GroupHandle {
} }
NotificationType::Follow => { NotificationType::Follow => {
info!("New follower!"); info!("New follower!");
tokio::time::sleep(Duration::from_millis(500)).await;
if self.config.is_member_or_admin(&notif_acct) {
let text = if self.config.is_member_only() { // Already joined, just doing something silly, ignore this
// Admins are listed without @, so they won't become handles here. debug!("User already a member, ignoring");
// Tagging all admins would be annoying.
let mut admins = self.config.get_admins().cloned().collect::<Vec<_>>();
admins.sort();
format!(
"@{user} welcome to the group! This is a member-only group, you won't be \
able to post. Ask the group admins if you wish to join!\n\n\
Admins: {admins}",
user = notif_acct,
admins = admins.join(", ")
)
} else { } else {
format!( let text = if self.config.is_member_only() {
"@{user} welcome to the group! \ // Admins are listed without @, so they won't become handles here.
To share a post, tag the group user. Use /help for more info.", // Tagging all admins would be annoying.
user = notif_acct let mut admins = self.config.get_admins().cloned().collect::<Vec<_>>();
) admins.sort();
}; format!(
"@{user} Hi, this is a member-only group, you won't be \
let post = StatusBuilder::new() able to post. You can still receive group posts though. If you'd like to join, \
.status(text) please ask one of the group admins to add you:\n\n\
.content_type("text/markdown") {admins}",
.visibility(Visibility::Direct) user = notif_acct,
.build() admins = admins.join(", ")
.expect("error build status"); )
} else {
let _ = self.client.new_status(post).await.log_error("Failed to post"); self.follow_user(&notif_acct).await
.log_error("Failed to follow");
make_welcome_text(&notif_acct)
};
let post = StatusBuilder::new()
.status(text)
.content_type("text/markdown")
.visibility(Visibility::Direct)
.build()
.expect("error build status");
tokio::time::sleep(Duration::from_millis(500)).await;
let _ = self.client.new_status(post).await.log_error("Failed to post");
}
} }
_ => {} NotificationType::Favourite => {}
NotificationType::Reblog => {}
} }
Ok(()) Ok(())
} }
/// Handle a non-mention status
async fn handle_status(&mut self, s: Status) -> Result<(), GroupError> {
debug!("Handling status #{}", s.id);
let ts = s.timestamp_millis();
self.config.set_last_status(ts);
if !s.content.contains('#') {
debug!("No tags in status");
return Ok(());
}
if s.visibility.is_private() {
debug!("Status is direct/private, not boosting");
return Ok(());
}
if s.content.contains("/add ") || s.content.contains("/remove ") {
debug!("Discard, looks like a hashtag manipulation command");
return Ok(());
}
let gu = self.config.get_acct();
let su = normalize_acct(&s.account.acct, gu)?;
if self.config.is_banned(&su) {
debug!("Status author @{} is banned.", su);
return Ok(());
}
if !self.config.is_member_or_admin(&su) {
debug!("Status author @{} is not a member.", su);
return Ok(());
}
let tags = crate::command::parse_status_tags(&s.content);
debug!("Tags in status: {:?}", tags);
for t in tags {
if self.config.is_tag_followed(&t) {
self.client.reblog(&s.id).await
.log_error("Failed to reblog");
break;
}
}
Ok(())
}
async fn follow_user(&mut self, acct: &str) -> Result<(), GroupError> {
self.client.follow(acct).await?;
Ok(())
}
async fn unfollow_user(&mut self, acct: &str) -> Result<(), GroupError> {
self.client.unfollow(acct).await?;
Ok(())
}
/// Catch up with missed notifications, returns true if any were handled /// Catch up with missed notifications, returns true if any were handled
async fn catch_up_with_missed_notifications(&mut self) -> Result<bool, GroupError> { async fn catch_up_with_missed_notifications(&mut self) -> Result<bool, GroupError> {
let last_notif = self.config.get_last_notif(); let last_notif = self.config.get_last_notif();
@ -601,4 +745,92 @@ impl GroupHandle {
Ok(true) Ok(true)
} }
/// Catch up with missed statuses, returns true if any were handled
async fn catch_up_with_missed_statuses(&mut self) -> Result<bool, GroupError> {
let last_status = self.config.get_last_status();
let notifications = self.client.get_home_timeline().await?;
let mut iter = notifications.items_iter();
let mut statuses_to_handle = vec![];
// They are retrieved newest first, but we want oldest first for chronological handling
let mut num = 0;
while let Some(s) = iter.next_item().await {
let ts = s.timestamp_millis();
if ts <= last_status {
break; // reached our last seen status (hopefully there arent any retro-bumped)
}
if s.content.contains('#') && !s.visibility.is_private() {
statuses_to_handle.push(s);
}
num += 1;
if num > MAX_CATCHUP_STATUSES {
warn!("Too many statuses missed to catch up!");
break;
}
}
if statuses_to_handle.is_empty() {
return Ok(false);
}
statuses_to_handle.reverse();
debug!("{} statuses to catch up!", statuses_to_handle.len());
for s in statuses_to_handle {
debug!("Handling missed status: {}", StatusDisplay(&s));
self.handle_status(s).await
.log_error("Error handling a status");
}
Ok(true)
}
fn list_admins(&self, replies: &mut Vec<String>) {
let mut admins = self.config.get_admins().collect::<Vec<_>>();
admins.sort();
for a in admins {
replies.push(a.to_string());
}
}
fn list_members(&self, replies: &mut Vec<String>) {
let admins = self.config.get_admins().collect::<HashSet<_>>();
let mut members = self.config.get_members().collect::<Vec<_>>();
members.extend(admins.iter());
members.sort();
members.dedup();
for m in members {
if admins.contains(&m) {
replies.push(format!("{} [admin]", m));
} else {
replies.push(m.to_string());
}
}
}
}
fn make_welcome_text(user: &str) -> String {
format!(
"@{user} Welcome to the group! To share a post, tag the group user \
or use one of the group hashtags. Use /help for more info.",
user = user
)
}
trait VisExt: Copy {
/// Check if is private or direct
fn is_private(self) -> bool;
}
impl VisExt for Visibility {
fn is_private(self) -> bool {
self == Visibility::Direct || self == Visibility::Private
}
} }

@ -33,6 +33,8 @@ pub(crate) struct GroupConfig {
acct: String, acct: String,
/// elefren data /// elefren data
appdata: AppData, appdata: AppData,
/// Hashtags the group will auto-boost from it's members
group_tags: HashSet<String>,
/// List of admin account "acct" names, e.g. piggo@piggo.space /// List of admin account "acct" names, e.g. piggo@piggo.space
admin_users: HashSet<String>, admin_users: HashSet<String>,
/// List of users allowed to post to the group, if it is member-only /// List of users allowed to post to the group, if it is member-only
@ -43,9 +45,10 @@ pub(crate) struct GroupConfig {
member_only: bool, member_only: bool,
/// Banned domain names, e.g. kiwifarms.cc /// Banned domain names, e.g. kiwifarms.cc
banned_servers: HashSet<String>, banned_servers: HashSet<String>,
/// Last seen notification timestamp /// Last seen notification timestamp (millis)
last_notif_ts: u64, last_notif_ts: u64,
/// Last seen status timestamp (millis)
last_status_ts: u64,
#[serde(skip)] #[serde(skip)]
dirty: bool, dirty: bool,
} }
@ -62,12 +65,14 @@ impl Default for GroupConfig {
redirect: Default::default(), redirect: Default::default(),
token: Default::default(), token: Default::default(),
}, },
group_tags: Default::default(),
admin_users: Default::default(), admin_users: Default::default(),
member_users: Default::default(), member_users: Default::default(),
banned_users: Default::default(), banned_users: Default::default(),
member_only: false, member_only: false,
banned_servers: Default::default(), banned_servers: Default::default(),
last_notif_ts: 0, last_notif_ts: 0,
last_status_ts: 0,
dirty: false, dirty: false,
} }
} }
@ -86,10 +91,12 @@ impl GroupConfig {
self.enabled self.enabled
} }
/*
pub(crate) fn set_enabled(&mut self, ena: bool) { pub(crate) fn set_enabled(&mut self, ena: bool) {
self.enabled = ena; self.enabled = ena;
self.mark_dirty(); self.mark_dirty();
} }
*/
pub(crate) fn get_appdata(&self) -> &AppData { pub(crate) fn get_appdata(&self) -> &AppData {
&self.appdata &self.appdata
@ -108,6 +115,10 @@ impl GroupConfig {
self.member_users.iter() self.member_users.iter()
} }
pub(crate) fn get_tags(&self) -> impl Iterator<Item = &String> {
self.group_tags.iter()
}
pub(crate) fn set_last_notif(&mut self, ts: u64) { pub(crate) fn set_last_notif(&mut self, ts: u64) {
self.last_notif_ts = self.last_notif_ts.max(ts); self.last_notif_ts = self.last_notif_ts.max(ts);
self.mark_dirty(); self.mark_dirty();
@ -117,6 +128,15 @@ impl GroupConfig {
self.last_notif_ts self.last_notif_ts
} }
pub(crate) fn set_last_status(&mut self, ts: u64) {
self.last_status_ts = self.last_status_ts.max(ts);
self.mark_dirty();
}
pub(crate) fn get_last_status(&self) -> u64 {
self.last_status_ts
}
pub(crate) fn get_acct(&self) -> &str { pub(crate) fn get_acct(&self) -> &str {
&self.acct &self.acct
} }
@ -129,6 +149,11 @@ impl GroupConfig {
self.member_users.contains(acct) self.member_users.contains(acct)
} }
pub(crate) fn is_member_or_admin(&self, acct: &str) -> bool {
self.is_member(acct)
|| self.is_admin(acct)
}
pub(crate) fn is_banned(&self, acct: &str) -> bool { pub(crate) fn is_banned(&self, acct: &str) -> bool {
self.banned_users.contains(acct) || self.is_users_server_banned(acct) self.banned_users.contains(acct) || self.is_users_server_banned(acct)
} }
@ -205,6 +230,20 @@ impl GroupConfig {
Ok(()) Ok(())
} }
pub(crate) fn add_tag(&mut self, tag: &str) {
self.group_tags.insert(tag.to_string());
self.mark_dirty();
}
pub(crate) fn remove_tag(&mut self, tag: &str) {
self.group_tags.remove(tag);
self.mark_dirty();
}
pub(crate) fn is_tag_followed(&self, tag: &str) -> bool {
self.group_tags.contains(tag)
}
pub(crate) fn set_member_only(&mut self, member_only: bool) { pub(crate) fn set_member_only(&mut self, member_only: bool) {
self.member_only = member_only; self.member_only = member_only;
self.mark_dirty(); self.mark_dirty();

@ -148,10 +148,12 @@ impl ConfigStore {
.collect() .collect()
} }
/*
pub(crate) async fn get_group_config(&self, group: &str) -> Option<GroupConfig> { pub(crate) async fn get_group_config(&self, group: &str) -> Option<GroupConfig> {
let c = self.data.read().await; let c = self.data.read().await;
c.get_group_config(group).cloned() c.get_group_config(group).cloned()
} }
*/
//noinspection RsSelfConvention //noinspection RsSelfConvention
/// Set group config to the store. The store then saved. /// Set group config to the store. The store then saved.

Loading…
Cancel
Save