OSDN > Finden Software > Communications > Chat > MonikaBot > SCM > hg > monikabot > Commit

MonikaBot
Fork

monikabot: Commit

Add kickRegex config field, and implement auto-kicking based on
usernames

diff -r 1453a424a136 -r 9f1a9414ec5c src/config/config.cr

--- a/src/config/config.cr Tue May 25 21:53:05 2021 -0600

+++ b/src/config/config.cr Tue Jun 08 19:28:05 2021 -0600

		@@ -101,6 +101,10 @@
101	101	# The database configuration section.
102	102	property dbconfig : DBConfig
103	103
	104	+ # An array of strings, treated as regular expressions, of
	105	+ # usernames to immediately kick.
	106	+ property kickRegex : Array(String) = [] of String
	107	+
104	108	# Returns the known, configured servers ("guilds").
105	109	@[YAML::Field(ignore: true)]
106	110	@servers : Hash(UInt64, ServerConfig) = {} of UInt64 => ServerConfig

		@@ -165,8 +169,12 @@
165	169
166	170	str << "RSS Frequency (minutes): #{rssCheckFrequency}\n"
167	171
	172	+ str << "Kick Regexes:\n"
	173	+ kickRegex.each do \|rgx\|
	174	+ str << " * #{rgx}\n"
	175	+ end
	176	+
168	177	str << "Servers:\n"
169		-
170	178	servers.each do \|_, server\|
171	179	server.dump(str)
172	180	end

diff -r 1453a424a136 -r 9f1a9414ec5c src/monika.cr

--- a/src/monika.cr Tue May 25 21:53:05 2021 -0600

+++ b/src/monika.cr Tue Jun 08 19:28:05 2021 -0600

		@@ -60,6 +60,7 @@
60	60	@subsystems = {} of String => Subsystem
61	61	@dbConn : DB::Database
62	62	@deinitCalled = false
	63	+ @compiledKickRegexes = [] of Regex
63	64
64	65	# The loaded subsystems.
65	66	getter subsystems

		@@ -290,6 +291,20 @@
290	291
291	292	baseClient.on_guild_member_add do \|payload\|
292	293	begin
	294	+ if @compiledKickRegexes.empty?
	295	+ Monika.config.kickRegex.each do \|rgx\|
	296	+ @compiledKickRegexes << Regex.new(rgx, Regex::Options::IGNORE_CASE)
	297	+ end
	298	+ end
	299	+
	300	+ if @compiledKickRegexes.size > 0 && @compiledKickRegexes.any? &.match(payload.user.username)
	301	+ sleep 1.second
	302	+ Monika.log.log("Kicking #{payload.user}, match found in kick regexes")
	303	+ Monika.instance.baseClient.remove_guild_member(payload.guild_id, payload.user.id,
	304	+ "Kicking #{payload.user}, match found in kick regexes")
	305	+ next
	306	+ end
	307	+
293	308	Monika.history.handleUserJoin(payload)
294	309	rescue err : Monikabot::History::NoGuildConfigError
295	310	Monika.log.warn("#{err}")