Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Included Blacklist option #252

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

WIP: Included Blacklist option #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
354a714
Added blacklist option
reyasmohammed Nov 15, 2017
1a623e4
blacklist added
reyasmohammed Nov 15, 2017
328e724
Added blacklist
reyasmohammed Nov 15, 2017
fcd4fec
Added blacklist
reyasmohammed Nov 15, 2017
62b6440
Merge remote-tracking branch 'upstream/master'
reyasmohammed Mar 19, 2019
a13d416
Update antispam.lua
reyasmohammed Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lua/groupbutler/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ local _M =
},
chat_hashes = {'extra', 'info', 'links', 'warns', 'mediawarn', 'spamwarns', 'blocked', 'report', 'defpermissions',
'defpermduration'},
chat_sets = {'whitelist'},
chat_sets = {'whitelist', 'blacklist'},--, 'mods'},

bot_keys = {
d3 = {'bot:general', 'bot:usernames', 'bot:chat:latsmsg'},
d2 = {'bot:groupsid', 'bot:groupsid:removed', 'tempbanned', 'bot:blocked', 'remolden_chats'} --remolden_chats: chat removed with $remold command
Expand Down
27 changes: 25 additions & 2 deletions lua/groupbutler/plugins/help.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,28 @@ If users send a whitelisted link, they won't be warned or kicked.
When the group link is saved with `/setlink`, it gets automatically added to the whitelist.

*Why links are saved without* _https://_ *and* _www_*?*
The bot auto-removes _https://, http:// and www_ from every link to reduce the possibility of having the same link saved twice.
]])
elseif key == 'blacklist' then
return _([[*Blacklist settings*

If an user sends a blacklisted link, it will be deleted.

`/blacklist [link(s)]` or `/bl [link(s)]`: add one or more links to the blacklist.
`/unblacklist [link(s)]` or `/unbl [link(s)]`: remove one or more links from the blacklist.
`/blacklist` or `/bl`: get the blacklist.
`/blacklistl -` or `/bl -`: empty the blacklist.

*Why links are saved without* _https://_ *and* _www_*?*
The bot auto-removes _https://, http:// and www_ from every link to reduce the possibility of having the same link saved twice.
]])
elseif key == 'extra' then
return i18n([[
*Extra commands*

The bot auto-removes _https://, http:// and www_ from every link to reduce the possibility of having the same link saved twice.]]), -- luacheck: ignore 631
extra = i18n([[*Extra commands*

#extra commands are a smart way to save your own custom commands.

• `/extra [#trigger] [reply]`: set a reply to be sent when someone writes the trigger.
Expand Down Expand Up @@ -254,9 +274,12 @@ local function dk_admins(self)
[i18n("Extra commands")] = 'extra',
[i18n("Warns")] = 'warns'
},
{
[i18n("Welcome settings")] = 'welcome',
{
[i18n("Links whitelist")] = 'whitelist',
[i18n("Links blacklist")] = 'blacklist',
},
{
[i18n("Welcome settings")] = 'welcome',
}
}
for _, line in pairs(list) do
Expand Down
Loading