diff --git a/.gitignore b/.gitignore
index 5a62f49..1758c24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ group-actor-data.toml
.idea/
groups.json
fedigroups
+*.bak
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..9df49b5
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+## v0.2
+
+- Add hashtag boosting and back-follow/unfollow
+- Add hashtag commands
+- Code reorganization
+- Improve greeting messages
+- Do not crash on unknown notification types (elefren patch)
+
+## v0.1
+
+This is the initial test release
+
+.
diff --git a/Cargo.lock b/Cargo.lock
index 9a1f5ee..561e833 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -276,7 +276,7 @@ checksum = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
[[package]]
name = "elefren"
version = "0.22.0"
-source = "git+https://git.ondrovo.com/MightyPork/elefren-fork.git#de38639fd178ae8ae47adb880ed965437a3d608e"
+source = "git+https://git.ondrovo.com/MightyPork/elefren-fork.git?rev=54a0e55#54a0e55964784368864f36580c5630f730bf72dc"
dependencies = [
"chrono",
"doc-comment",
@@ -328,7 +328,7 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
[[package]]
name = "fedigroups"
-version = "0.1.0"
+version = "0.2.0"
dependencies = [
"anyhow",
"clap",
diff --git a/Cargo.toml b/Cargo.toml
index c924c39..9bec613 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "fedigroups"
-version = "0.1.0"
+version = "0.2.0"
authors = ["Ondřej Hruška "]
edition = "2018"
publish = false
@@ -9,17 +9,14 @@ build = "build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-#elefren = { version = "0.22.0", features = ["toml"] }
#elefren = { path = "../elefren22-fork" }
-elefren = { git = "https://git.ondrovo.com/MightyPork/elefren-fork.git" }
+elefren = { git = "https://git.ondrovo.com/MightyPork/elefren-fork.git", rev = "54a0e55" }
env_logger = "0.9.0"
-#elefren = { path = "../elefren-fork" }
log = "0.4.14"
serde = "1"
serde_json = "1"
-#smart-default = "0.6.0"
anyhow = "1"
clap = "2.33.0"
tokio = { version = "1", features = ["full"] }
@@ -32,5 +29,3 @@ once_cell = "1.8.0"
native-tls = "0.2.8"
websocket = "0.26.2"
-
-#tokio = { version = "0.2.22", features = ["full"] }
diff --git a/src/command.rs b/src/command.rs
index cba20f0..97046bb 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -3,22 +3,54 @@ use regex::Regex;
#[derive(Debug, Clone, PartialEq)]
pub enum StatusCommand {
- Boost,
+ /// Ignore this post
Ignore,
+ /// Boost the previous post in the thread
+ Boost,
+ /// Admin: Ban a user
BanUser(String),
+ /// Admin: Un-ban a server
UnbanUser(String),
+ /// Admin: Ban a server
BanServer(String),
+ /// Admin: Un-ban a server
UnbanServer(String),
+ /// Admin: Add a member to a closed group (or force join)
AddMember(String),
+ /// Admin: Remove a user from the group, also unfollow
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),
+ /// Admin: Revoke admin to a user
RemoveAdmin(String),
+ /// Admin: Send a public announcement
Announce(String),
+ /// Admin: Make the group open-access
OpenGroup,
+ /// Admin: Make the group member-only, this effectively disables posting from non-members
+ /// and disables /join and follow-back
CloseGroup,
+ /// Show help. The content varies by group params (open/closed access), the user's privileges
+ /// and membership status.
Help,
+ /// Show members. Non-admins will only see a list of admins.
ListMembers,
+ /// Show tags.
+ ListTags,
+ /// Leave the group, this asks the group to unfollow the user and also revokes their membership.
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,
}
@@ -27,12 +59,19 @@ macro_rules! p_user {
r"(@?[a-zA-Z0-9_.-]+@[a-zA-Z0-9_.-]+\.[a-z0-9_-]+|@[a-zA-Z0-9_.-]+)"
};
}
+
macro_rules! p_server {
() => {
r"([a-zA-Z0-9_.-]+\.[a-zA-Z0-9_-]+)"
};
}
+macro_rules! p_hashtag {
+ () => {
+ r"#(\w+)"
+ };
+}
+
macro_rules! command {
($($val:expr),+) => {
Regex::new(concat!(r"(?:^|\s|>|\n)[\\/]", $($val,)+ r"(?:$|[!,]|\W)")).unwrap()
@@ -55,6 +94,10 @@ static RE_ADD_MEMBER: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:
static RE_REMOVE_MEMBER: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:kick|remove)\s+", p_user!()));
+static RE_ADD_TAG: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:add)\s+", p_hashtag!()));
+
+static RE_REMOVE_TAG: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:remove)\s+", p_hashtag!()));
+
static RE_GRANT_ADMIN: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:op|admin)\s+", p_user!()));
static RE_REVOKE_ADMIN: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:deop|deadmin)\s+", p_user!()));
@@ -67,20 +110,42 @@ static RE_HELP: once_cell::sync::Lazy = Lazy::new(|| command!(r"help"));
static RE_MEMBERS: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:members|who)"));
+static RE_TAGS: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:hashtags|tags)"));
+
static RE_LEAVE: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:leave)"));
+static RE_JOIN: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:join)"));
+
static RE_PING: once_cell::sync::Lazy = Lazy::new(|| command!(r"(?:ping)"));
static RE_ANNOUNCE: once_cell::sync::Lazy =
Lazy::new(|| Regex::new(concat!(r"(?:^|\s|>|\n)[\\/]announce\s+(.*)$")).unwrap());
-pub fn parse_status(content: &str) -> Vec {
+static RE_A_HASHTAG: once_cell::sync::Lazy =
+ Lazy::new(|| Regex::new(concat!(r"(?:^|\b|\s|>|\n)#(\w+)")).unwrap());
+
+pub fn parse_status_tags(content: &str) -> Vec {
debug!("Raw content: {}", content);
+ let content = content.replace(" ", " ");
+ let content = content.replace("
", " ");
+ let content = voca_rs::strip::strip_tags(&content);
+ debug!("Stripped tags: {}", content);
- let content = content.replace(" ", " ");
- // let content = content.replace(" ", " ");
- // let content = content.replace(" ", " ");
- // let content = content.replace(" ", " ");
+ 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 {
+ debug!("Raw content: {}", content);
+
+ let content = content.replace(" ", " ");
+ let content = content.replace("", " ");
let content = voca_rs::strip::strip_tags(&content);
debug!("Stripped tags: {}", content);
@@ -111,6 +176,9 @@ pub fn parse_status(content: &str) -> Vec {
if RE_LEAVE.is_match(&content) {
debug!("LEAVE");
commands.push(StatusCommand::Leave);
+ } else if RE_JOIN.is_match(&content) {
+ debug!("JOIN");
+ commands.push(StatusCommand::Join);
}
if RE_PING.is_match(&content) {
@@ -123,6 +191,11 @@ pub fn parse_status(content: &str) -> Vec {
commands.push(StatusCommand::ListMembers);
}
+ if RE_TAGS.is_match(&content) {
+ debug!("TAGS");
+ commands.push(StatusCommand::ListTags);
+ }
+
if RE_OPEN_GROUP.is_match(&content) {
debug!("OPEN GROUP");
commands.push(StatusCommand::OpenGroup);
@@ -188,11 +261,27 @@ pub fn parse_status(content: &str) -> Vec {
if let Some(s) = c.get(1) {
let s = s.as_str();
let s = s.trim_start_matches('@');
- debug!("UNBAN USER: {}", s);
+ debug!("REMOVE USER: {}", s);
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) {
if let Some(s) = c.get(1) {
let s = s.as_str();
@@ -216,11 +305,11 @@ pub fn parse_status(content: &str) -> Vec {
#[cfg(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::{
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]
@@ -276,23 +365,18 @@ mod test {
assert!(RE_BAN_USER.is_match("/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");
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");
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");
let c = RE_BAN_USER.captures("/ban @lain");
- assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain");
let c = RE_BAN_USER.captures("/ban @lain xx");
- assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain");
}
@@ -306,11 +390,9 @@ mod test {
assert!(!RE_BAN_SERVER.is_match("/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");
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");
}
@@ -321,7 +403,6 @@ mod test {
assert!(RE_ADD_MEMBER.is_match("\\add @lain"));
let c = RE_ADD_MEMBER.captures("/add @lain");
- assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain");
}
@@ -337,10 +418,35 @@ mod test {
assert!(RE_REMOVE_MEMBER.is_match("/remove @lain"));
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");
}
+ #[test]
+ fn test_add_tag() {
+ 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)"));
+ assert!(RE_ADD_TAG.is_match("/add #nya and more)"));
+
+ 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("/add #nya.");
+ assert_eq!(c.unwrap().get(1).unwrap().as_str(), "nya");
+
+ let c = RE_ADD_TAG.captures("/add #nya)");
+ assert_eq!(c.unwrap().get(1).unwrap().as_str(), "nya");
+ }
+
#[test]
fn test_add_admin() {
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"));
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");
}
@@ -362,7 +467,6 @@ mod test {
assert!(RE_REVOKE_ADMIN.is_match("/deadmin @lain"));
let c = RE_REVOKE_ADMIN.captures("/deadmin @lain");
- assert!(c.is_some());
assert_eq!(c.unwrap().get(1).unwrap().as_str(), "@lain");
}
@@ -405,6 +509,34 @@ mod test {
assert!(RE_MEMBERS.is_match("/who"));
}
+ #[test]
+ fn test_tags() {
+ 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"));
+
+ for (i, c) in RE_A_HASHTAG.captures_iter("foo #banana #χαλβάς #ласточка").enumerate() {
+ if i == 0 {
+ assert_eq!(c.get(1).unwrap().as_str(), "banana");
+ }
+ else if i == 1 {
+ assert_eq!(c.get(1).unwrap().as_str(), "χαλβάς");
+ }
+ else if i == 2 {
+ assert_eq!(c.get(1).unwrap().as_str(), "ласточка");
+ }
+ }
+ }
+
#[test]
fn test_leave() {
assert!(!RE_LEAVE.is_match("/list"));
@@ -414,6 +546,15 @@ mod test {
assert!(RE_LEAVE.is_match("/leave z"));
}
+ #[test]
+ fn test_join() {
+ 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]
fn test_announce() {
assert!(!RE_ANNOUNCE.is_match("/list"));
@@ -435,15 +576,15 @@ mod test {
fn test_real_post() {
assert_eq!(
Vec::::new(),
- parse_status("Hello there is nothing here /fake command")
+ parse_slash_commands("Hello there is nothing here /fake command")
);
assert_eq!(
vec![StatusCommand::Help],
- parse_status("lets see some \\help and /ban @lain")
+ parse_slash_commands("lets see some \\help and /ban @lain")
);
assert_eq!(
vec![StatusCommand::Ignore],
- parse_status("lets see some /ignore and /ban @lain")
+ parse_slash_commands("lets see some /ignore and /ban @lain")
);
assert_eq!(
vec![
@@ -451,7 +592,7 @@ mod test {
StatusCommand::BanUser("piggo@piggo.space".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 +600,13 @@ mod test {
fn test_strip() {
assert_eq!(
vec![StatusCommand::BanUser("betty".to_string())],
- parse_status(
+ parse_slash_commands(
r#"Let's bad the naughty bot: /ban @betty"#
)
);
assert_eq!(
vec![StatusCommand::BanUser("betty@abstarbauze.com".to_string())],
- parse_status(
+ parse_slash_commands(
r#"Let's bad the naughty bot: /ban @betty@abstarbauze.com"#
)
);
diff --git a/src/error.rs b/src/error.rs
index 29f109f..3e0095d 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -12,6 +12,8 @@ pub enum GroupError {
GroupNotExist,
#[error("Config error: {0}")]
BadConfig(Cow<'static, str>),
+ #[error("API request timed out")]
+ ApiTimeout,
#[error(transparent)]
IoError(#[from] std::io::Error),
#[error(transparent)]
diff --git a/src/group_handle.rs b/src/group_handle.rs
deleted file mode 100644
index 1f262f4..0000000
--- a/src/group_handle.rs
+++ /dev/null
@@ -1,604 +0,0 @@
-use std::collections::HashSet;
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-use elefren::debug::EventDisplay;
-use elefren::debug::NotificationDisplay;
-use elefren::entities::event::Event;
-use elefren::entities::notification::{Notification, NotificationType};
-use elefren::status_builder::Visibility;
-use elefren::{FediClient, StatusBuilder};
-use futures::StreamExt;
-
-use crate::command::StatusCommand;
-use crate::error::GroupError;
-use crate::store::data::GroupConfig;
-use crate::store::ConfigStore;
-use crate::utils::{normalize_acct, LogError};
-
-/// This is one group's config store capable of persistence
-#[derive(Debug)]
-pub struct GroupHandle {
- pub(crate) client: FediClient,
- pub(crate) config: GroupConfig,
- pub(crate) store: Arc,
-}
-
-const DELAY_BEFORE_ACTION: Duration = Duration::from_millis(250);
-const DELAY_REOPEN_STREAM: Duration = Duration::from_millis(1000);
-const MAX_CATCHUP_NOTIFS: usize = 25;
-const PERIODIC_SAVE: Duration = Duration::from_secs(60);
-const PING_INTERVAL: Duration = Duration::from_secs(15); // must be < periodic save!
-
-impl GroupHandle {
- pub async fn save(&mut self) -> Result<(), GroupError> {
- debug!("Saving group config & status");
- self.store.set_group_config(self.config.clone()).await?;
- self.config.clear_dirty_status();
- Ok(())
- }
-
- pub async fn save_if_needed(&mut self) -> Result<(), GroupError> {
- if self.config.is_dirty() {
- self.save().await?;
- }
- Ok(())
- }
-
- pub async fn reload(&mut self) -> Result<(), GroupError> {
- if let Some(g) = self.store.get_group_config(self.config.get_acct()).await {
- self.config = g;
- Ok(())
- } else {
- Err(GroupError::GroupNotExist)
- }
- }
-}
-
-trait NotifTimestamp {
- fn timestamp_millis(&self) -> u64;
-}
-
-impl NotifTimestamp for Notification {
- fn timestamp_millis(&self) -> u64 {
- self.created_at.timestamp_millis().max(0) as u64
- }
-}
-
-impl GroupHandle {
- pub async fn run(&mut self) -> Result<(), GroupError> {
- assert!(PERIODIC_SAVE >= PING_INTERVAL);
-
- let mut next_save = Instant::now() + PERIODIC_SAVE; // so we save at start
-
- loop {
- debug!("Opening streaming API socket");
- let mut events = self.client.streaming_user().await?;
-
- match self.catch_up_with_missed_notifications().await {
- Ok(true) => {
- debug!("Some missed notifs handled");
- // Save asap!
- next_save = Instant::now() - PERIODIC_SAVE
- }
- Ok(false) => {
- debug!("No notifs missed");
- }
- Err(e) => {
- error!("Failed to handle missed notifs: {}", e);
- }
- }
-
- loop {
- if next_save < Instant::now() {
- self.save_if_needed().await.log_error("Failed to save group");
- next_save = Instant::now() + PERIODIC_SAVE;
- }
-
- let timeout = next_save
- .saturating_duration_since(Instant::now())
- .min(PING_INTERVAL)
- .max(Duration::from_secs(1));
-
- match tokio::time::timeout(timeout, events.next()).await {
- Ok(Some(event)) => {
- debug!("(@{}) Event: {}", self.config.get_acct(), EventDisplay(&event));
- match event {
- Event::Update(_status) => {}
- Event::Notification(n) => {
- self.handle_notification(n).await.log_error("Error handling a notification");
- }
- Event::Delete(_id) => {}
- Event::FiltersChanged => {}
- }
- }
- Ok(None) => {
- warn!("Group @{} socket closed, restarting...", self.config.get_acct());
- break;
- }
- Err(_) => {
- // Timeout so we can save if needed
- }
- }
-
- trace!("Pinging");
- events.send_ping().await.log_error("Fail to send ping");
- }
-
- warn!("Notif stream closed, will reopen");
- tokio::time::sleep(DELAY_REOPEN_STREAM).await;
- }
- }
-
- async fn handle_notification(&mut self, n: Notification) -> Result<(), GroupError> {
- debug!("Handling notif #{}", n.id);
- let ts = n.timestamp_millis();
- self.config.set_last_notif(ts);
-
- let group_acct = self.config.get_acct().to_string();
- let notif_acct = normalize_acct(&n.account.acct, &group_acct)?;
-
- let can_write = self.config.can_write(¬if_acct);
- let is_admin = self.config.is_admin(¬if_acct);
-
- if self.config.is_banned(¬if_acct) {
- warn!("Notification actor {} is banned!", notif_acct);
- return Ok(());
- }
-
- match n.notification_type {
- NotificationType::Mention => {
- if let Some(status) = n.status {
- let status_acct = normalize_acct(&status.account.acct, &group_acct)?;
-
- if self.config.is_banned(&status_acct) {
- warn!("Status author {} is banned!", status_acct);
- return Ok(());
- }
-
- let commands = crate::command::parse_status(&status.content);
-
- let mut replies = vec![];
- let mut announcements = vec![];
- let mut do_boost_prev_post = false;
- let mut any_admin_cmd = false;
-
- if commands.is_empty() {
- debug!("No commands in post");
- if status.in_reply_to_id.is_none() {
- if can_write {
- // Someone tagged the group in OP, boost it.
- info!("Boosting OP mention");
- tokio::time::sleep(DELAY_BEFORE_ACTION).await;
- self.client.reblog(&status.id).await.log_error("Failed to boost");
- } else {
- replies.push("You are not allowed to post to this group".to_string());
- }
- } else {
- debug!("Not OP, ignore mention");
- }
- } else {
- for cmd in commands {
- match cmd {
- // ignore is first on purpose
- StatusCommand::Ignore => {
- debug!("Notif ignored because of ignore command");
- return Ok(());
- }
- StatusCommand::Announce(a) => {
- info!("Sending PSA");
- announcements.push(a);
- }
- StatusCommand::Boost => {
- if can_write {
- do_boost_prev_post = status.in_reply_to_id.is_some();
- } else {
- replies.push("You are not allowed to share to this group".to_string());
- }
- }
- StatusCommand::BanUser(u) => {
- let u = normalize_acct(&u, &group_acct)?;
- if is_admin {
- if !self.config.is_banned(&u) {
- match self.config.ban_user(&u, true) {
- Ok(_) => {
- any_admin_cmd = true;
- replies.push(format!("User {} banned from group!", u));
-
- // no announcement here
- }
- Err(e) => {
- replies.push(format!("Failed to ban user {}: {}", u, e));
- }
- }
- }
- } else {
- replies.push("Only admins can manage user bans".to_string());
- }
- }
- StatusCommand::UnbanUser(u) => {
- let u = normalize_acct(&u, &group_acct)?;
- if is_admin {
- if self.config.is_banned(&u) {
- match self.config.ban_user(&u, false) {
- Ok(_) => {
- any_admin_cmd = true;
- replies.push(format!("User {} un-banned!", u));
-
- // no announcement here
- }
- Err(_) => {
- unreachable!()
- }
- }
- }
- } else {
- replies.push("Only admins can manage user bans".to_string());
- }
- }
- StatusCommand::BanServer(s) => {
- if is_admin {
- if !self.config.is_server_banned(&s) {
- match self.config.ban_server(&s, true) {
- Ok(_) => {
- any_admin_cmd = true;
- announcements.push(format!("Server \"{}\" has been banned.", s));
- replies.push(format!("Server {} banned from group!", s));
- }
- Err(e) => {
- replies.push(format!("Failed to ban server {}: {}", s, e));
- }
- }
- }
- } else {
- replies.push("Only admins can manage server bans".to_string());
- }
- }
- StatusCommand::UnbanServer(s) => {
- if is_admin {
- if self.config.is_server_banned(&s) {
- match self.config.ban_server(&s, false) {
- Ok(_) => {
- any_admin_cmd = true;
- announcements.push(format!("Server \"{}\" has been un-banned.", s));
- replies.push(format!("Server {} un-banned!", s));
- }
- Err(_) => {
- unreachable!()
- }
- }
- }
- } else {
- replies.push("Only admins can manage server bans".to_string());
- }
- }
- StatusCommand::AddMember(u) => {
- let u = normalize_acct(&u, &group_acct)?;
- if is_admin {
- if !self.config.is_member(&u) {
- match self.config.set_member(&u, true) {
- Ok(_) => {
- any_admin_cmd = true;
- replies.push(format!("User {} added to the group!", u));
-
- if self.config.is_member_only() {
- announcements
- .push(format!("Welcome new member @{} to the group!", u));
- }
- }
- Err(e) => {
- replies.push(format!("Failed to add user {} to group: {}", u, e));
- }
- }
- }
- } else {
- replies.push("Only admins can manage members".to_string());
- }
- }
- StatusCommand::RemoveMember(u) => {
- let u = normalize_acct(&u, &group_acct)?;
- if is_admin {
- if self.config.is_member(&u) {
- match self.config.set_member(&u, false) {
- Ok(_) => {
- any_admin_cmd = true;
- replies.push(format!("User {} removed from the group.", u));
- }
- Err(_) => {
- unreachable!()
- }
- }
- }
- } else {
- replies.push("Only admins can manage members".to_string());
- }
- }
- StatusCommand::GrantAdmin(u) => {
- let u = normalize_acct(&u, &group_acct)?;
- if is_admin {
- if !self.config.is_admin(&u) {
- match self.config.set_admin(&u, true) {
- Ok(_) => {
- any_admin_cmd = true;
- replies.push(format!("User {} is now a group admin!", u));
- announcements
- .push(format!("User @{} can now manage this group!", u));
- }
- Err(e) => {
- replies.push(format!(
- "Failed to make user {} a group admin: {}",
- u, e
- ));
- }
- }
- }
- } else {
- replies.push("Only admins can manage admins".to_string());
- }
- }
- StatusCommand::RemoveAdmin(u) => {
- let u = normalize_acct(&u, &group_acct)?;
- if is_admin {
- if self.config.is_admin(&u) {
- match self.config.set_admin(&u, false) {
- Ok(_) => {
- any_admin_cmd = true;
- replies.push(format!("User {} is no longer a group admin!", u));
- announcements
- .push(format!("User @{} no longer manages this group.", u));
- }
- Err(e) => {
- replies
- .push(format!("Failed to revoke {}'s group admin: {}", u, e));
- }
- }
- }
- } else {
- replies.push("Only admins can manage admins".to_string());
- }
- }
- StatusCommand::OpenGroup => {
- if is_admin {
- if self.config.is_member_only() {
- any_admin_cmd = true;
- self.config.set_member_only(false);
- replies.push("Group changed to open-access".to_string());
- announcements.push("This group is now open-access!".to_string());
- }
- } else {
- replies.push("Only admins can set group options".to_string());
- }
- }
- StatusCommand::CloseGroup => {
- if is_admin {
- if !self.config.is_member_only() {
- any_admin_cmd = true;
- self.config.set_member_only(true);
- replies.push("Group changed to member-only".to_string());
- announcements.push("This group is now member-only!".to_string());
- }
- } else {
- replies.push("Only admins can set group options".to_string());
- }
- }
- StatusCommand::Help => {
- if self.config.is_member_only() {
- let mut s = "This is a member-only group. ".to_string();
- if self.config.can_write(¬if_acct) {
- if is_admin {
- s.push_str("*You are an admin.*");
- } else {
- s.push_str("*You are a member.*");
- }
- } else {
- s.push_str("*You are not a member, ask one of the admins to add you.*");
- }
- replies.push(s);
- } else {
- let mut s = "This is a public-access group. ".to_string();
- if is_admin {
- s.push_str("*You are an admin.*");
- }
- replies.push(s);
- }
-
- replies.push(
- "\nTo share an original post, mention the group user.\n\
- Replies and mentions with commands won't be shared.\n\
- \n\
- **Supported commands:**\n\
- `/boost, /b` - boost the replied-to post into the group\n\
- `/ignore, /i` - make the group completely ignore the post\n\
- `/ping` - check that the service is alive".to_string(),
- );
-
- if self.config.is_member_only() {
- replies.push("`/members, /who` - show group members / admins".to_string());
- replies.push("`/leave` - leave the group".to_string());
- } else {
- replies.push("`/members, /who` - show group admins".to_string());
- }
-
- if is_admin {
- replies.push(
- "\n\
- **Admin commands:**\n\
- `/add user` - add a member (use e-mail style address)\n\
- `/kick, /remove user` - kick a member\n\
- `/ban x` - ban a user or a server\n\
- `/unban x` - lift a ban\n\
- `/op, /admin user` - grant admin rights\n\
- `/deop, /deadmin user` - revoke admin rights\n\
- `/opengroup` - make member-only\n\
- `/closegroup` - make public-access\n\
- `/announce x` - make a public announcement from the rest of the status"
- .to_string(),
- );
- }
- }
- StatusCommand::ListMembers => {
- let mut show_admins = false;
- if is_admin {
- if self.config.is_member_only() {
- replies.push("Group members:".to_string());
- let admins = self.config.get_admins().collect::>();
- let mut members = self.config.get_members().collect::>();
- 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 {
- show_admins = true;
- }
- } else {
- show_admins = true;
- }
-
- if show_admins {
- replies.push("Group admins:".to_string());
- let mut admins = self.config.get_admins().collect::>();
- admins.sort();
- for a in admins {
- replies.push(a.to_string());
- }
- }
- }
- StatusCommand::Leave => {
- if self.config.is_member(¬if_acct) {
- any_admin_cmd = true;
- let _ = self.config.set_member(¬if_acct, false);
- replies.push("You left the group.".to_string());
- }
- }
- StatusCommand::Ping => {
- replies.push("Pong".to_string());
- }
- }
- }
-
- tokio::time::sleep(DELAY_BEFORE_ACTION).await;
- }
-
- if do_boost_prev_post {
- self.client
- .reblog(&status.in_reply_to_id.as_ref().unwrap())
- .await
- .log_error("Failed to boost");
- }
-
- if !replies.is_empty() {
- let r = replies.join("\n");
-
- let post = StatusBuilder::new()
- .status(format!("@{user}\n{msg}", user = notif_acct, msg = r))
- .content_type("text/markdown")
- .visibility(Visibility::Direct)
- .build()
- .expect("error build status");
-
- let _ = self.client.new_status(post).await.log_error("Failed to post");
- }
-
- if !announcements.is_empty() {
- let msg = announcements.join("\n");
- let post = StatusBuilder::new()
- .status(format!("**📢 Group announcement**\n{msg}", msg = msg))
- .content_type("text/markdown")
- .visibility(Visibility::Public)
- .build()
- .expect("error build status");
-
- let _ = self.client.new_status(post).await.log_error("Failed to post");
- }
-
- if any_admin_cmd {
- self.save_if_needed().await.log_error("Failed to save");
- }
- }
- }
- NotificationType::Follow => {
- info!("New follower!");
- tokio::time::sleep(Duration::from_millis(500)).await;
-
- let text = if self.config.is_member_only() {
- // Admins are listed without @, so they won't become handles here.
- // Tagging all admins would be annoying.
- let mut admins = self.config.get_admins().cloned().collect::>();
- 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 {
- format!(
- "@{user} welcome to the group! \
- To share a post, tag the group user. Use /help for more info.",
- user = notif_acct
- )
- };
-
- let post = StatusBuilder::new()
- .status(text)
- .content_type("text/markdown")
- .visibility(Visibility::Direct)
- .build()
- .expect("error build status");
-
- let _ = self.client.new_status(post).await.log_error("Failed to post");
- }
- _ => {}
- }
-
- Ok(())
- }
-
- /// Catch up with missed notifications, returns true if any were handled
- async fn catch_up_with_missed_notifications(&mut self) -> Result {
- let last_notif = self.config.get_last_notif();
-
- let notifications = self.client.notifications().await?;
- let mut iter = notifications.items_iter();
-
- let mut notifs_to_handle = vec![];
-
- // They are retrieved newest first, but we want oldest first for chronological handling
-
- let mut num = 0;
- while let Some(n) = iter.next_item().await {
- let ts = n.timestamp_millis();
- if ts <= last_notif {
- break; // reached our last seen notif
- }
- notifs_to_handle.push(n);
- num += 1;
- if num > MAX_CATCHUP_NOTIFS {
- warn!("Too many notifs missed to catch up!");
- break;
- }
- }
-
- if notifs_to_handle.is_empty() {
- return Ok(false);
- }
-
- notifs_to_handle.reverse();
-
- debug!("{} notifications to catch up!", notifs_to_handle.len());
-
- for n in notifs_to_handle {
- debug!("Handling missed notification: {}", NotificationDisplay(&n));
- self.handle_notification(n).await.log_error("Error handling a notification");
- }
-
- Ok(true)
- }
-}
diff --git a/src/group_handler/handle_mention.rs b/src/group_handler/handle_mention.rs
new file mode 100644
index 0000000..e145adf
--- /dev/null
+++ b/src/group_handler/handle_mention.rs
@@ -0,0 +1,625 @@
+use std::collections::HashSet;
+use std::time::Duration;
+
+use elefren::{FediClient, SearchType, StatusBuilder};
+use elefren::entities::prelude::Status;
+use elefren::status_builder::Visibility;
+
+use crate::command::StatusCommand;
+use crate::error::GroupError;
+use crate::group_handler::GroupHandle;
+use crate::store::data::GroupConfig;
+use crate::utils::{LogError, normalize_acct};
+
+pub struct ProcessMention<'a> {
+ status: Status,
+ config: &'a mut GroupConfig,
+ client: &'a mut FediClient,
+ group_acct: String,
+ status_acct: String,
+ status_user_id: String,
+ can_write: bool,
+ is_admin: bool,
+ replies: Vec,
+ announcements: Vec,
+ do_boost_prev_post: bool,
+ want_markdown: bool,
+}
+
+impl<'a> ProcessMention<'a> {
+ async fn lookup_acct_id(&self, acct: &str, followed: bool) -> Result