mirror of
https://git.ondrovo.com/MightyPork/group-actor.git
synced 2024-10-06 18:21:52 +00:00
nobot fix
This commit is contained in:
parent
e77c8157ae
commit
5389031d8c
4 changed files with 10 additions and 5 deletions
|
@ -1,5 +1,8 @@
|
|||
# Changelog
|
||||
|
||||
## v0.4.5
|
||||
- Ignore #nobot in bio if the user is also a member
|
||||
|
||||
## v0.4.4
|
||||
- Fix some failing tests
|
||||
- Lowercase the domain when normalizing an account
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "fedigroups"
|
||||
version = "0.4.4"
|
||||
version = "0.4.5"
|
||||
authors = ["Ondřej Hruška <ondra@ondrovo.com>"]
|
||||
edition = "2018"
|
||||
publish = false
|
||||
|
|
|
@ -8,6 +8,8 @@ pub enum GroupError {
|
|||
UserIsBanned,
|
||||
#[error("User opted out from the group")]
|
||||
UserOptedOut,
|
||||
#[error("User opted out from the group using #nobot")]
|
||||
UserOptedOutNobot,
|
||||
#[error("Server could not be banned because there are admin users on it")]
|
||||
AdminsOnServer,
|
||||
#[error("Config error: {0}")]
|
||||
|
|
|
@ -773,11 +773,11 @@ impl<'a> ProcessMention<'a> {
|
|||
// Try to unfollow
|
||||
let account = self.client.get_account(id).await?;
|
||||
let bio = utils::strip_html(&account.note);
|
||||
if RE_NOBOT_TAG.is_match(&bio) {
|
||||
// #nobot
|
||||
Err(GroupError::UserOptedOut)
|
||||
let normalized = normalize_acct(&account.acct, &self.group_acct)?;
|
||||
if RE_NOBOT_TAG.is_match(&bio) && !self.config.is_member(&normalized) {
|
||||
// #nobot in a non-member account
|
||||
Err(GroupError::UserOptedOutNobot)
|
||||
} else {
|
||||
let normalized = normalize_acct(&account.acct, &self.group_acct)?;
|
||||
if self.config.is_banned(&normalized) {
|
||||
Err(GroupError::UserIsBanned)
|
||||
} else if self.config.is_optout(&normalized) {
|
||||
|
|
Loading…
Reference in a new issue