fix spelling/typos; fix default status in reports

master
y 2019-07-24 22:48:03 +00:00
parent c6240dac77
commit 75a6d1bde8
4 changed files with 50 additions and 43 deletions

59
TODO
View File

@ -5,39 +5,29 @@ create a way to search for players by IP/net instead of just ASN
add "last login" to players table
make way to show last login IP on certain commands (e.g. /inspect_asn)
make settings for the hard-coded values for reporting timing
alert staff if there are new reports since their last login
a way to resolve reports?
--------------
# Administration
sban_import [<filename>]
verification on | off
# General status
reports [<timespan>=1w]
bans [<number>=20]
who2
asn <player_name> | <IP>
asn_inspect <ASN> [<timespan>=1w]
asn_record <ASN> [<number>]
asn_block <ASN> [<timespan>] [<reason>]
asn_stats <ASN> [<reason>]
asn_suspect <ASN> [<reason>]
asn_unblock <ASN> [<reason>]
asn_unsuspect <ASN> [<reason>]
ip_inspect <IP> [<timespan>=1w]
ip_record <IP> [<number>]
ip_block <IP> [<timespan>] [<reason>]
ip_unblock <IP> [<reason>]
ip_suspect <IP> [<reason>]
ip_unsuspect <IP> [<reason>]
ip_trust <IP> [<reason>]
ip_untrust <IP> [<reason>]
# Player inspection
pgrep <pattern> [<limit>=20]
asn <player_name> | <IP>
cluster <player_name>
inspect <player_name>
ban_record <player_name> [<number>]
logins <player_name> [<number>=20]
# Player management
kick <player_name> [<reason>]
ban <player_name> [<timespan>] [<reason>]
unban <player_name> [<reason>]
@ -47,15 +37,32 @@ verify <player_name> [<reason>]
unverify <player_name> [<reason>]
whitelist <player_name> [<reason>]
unwhitelist <player_name> [<reason>]
master <alt> <master>
master_rm <player_name>
# IP inspection
ip_inspect <IP> [<timespan>=1w]
ip_record <IP> [<number>]
report
reports
# IP management
ip_block <IP> [<timespan>] [<reason>]
ip_unblock <IP> [<reason>]
ip_suspect <IP> [<reason>]
ip_unsuspect <IP> [<reason>]
ip_trust <IP> [<reason>]
ip_untrust <IP> [<reason>]
# ASN inspection
asn_inspect <ASN> [<timespan>=1w]
asn_record <ASN> [<number>]
asn_stats <ASN>
# ASN management
asn_block <ASN> [<timespan>] [<reason>]
asn_unblock <ASN> [<reason>]
asn_suspect <ASN> [<reason>]
asn_unsuspect <ASN> [<reason>]
# Available to all players
report <message>
first-login <player_name>
who2
bans [<number>=20]

View File

@ -18,7 +18,7 @@ end
-- make this the first chat message handler by inserting it at the start.
-- this has the effect of
-- (1) pre-empting irc (and irc2)
-- (1) preempting irc (and irc2)
-- (2) disabling all server-side commands
table.insert(minetest.registered_on_chat_messages, 1,
function(name, message)

View File

@ -45,7 +45,7 @@ local function alias_chatcommand(name, existing_name)
end
local existing_def = minetest.registered_chatcommands[existing_name]
if not existing_def then
verbana.log('error', 'Could not alias command %q to %q, because %q doesn\'t exist', name, existing_name, existing_name)
verbana.log('error', "Could not alias command %q to %q, because %q doesn't exist", name, existing_name, existing_name)
else
minetest.register_chatcommand(name, existing_def)
end
@ -83,7 +83,7 @@ register_chatcommand('verification', {
elseif params == 'off' then
value = false
else
return false, 'Invalid paramters'
return false, 'Invalid parameters'
end
if verbana.settings.universal_verification == value then
return true, ('Universal verification is already %s'):format(params)
@ -577,7 +577,7 @@ register_chatcommand('ip_suspect', {
})
register_chatcommand('ip_unsuspect', {
description='Unmark an IP as suspcious',
description='Unmark an IP as suspicious',
params='<IP> [<reason>]',
privs={[mod_priv]=true},
func=function(caller, params)
@ -729,7 +729,7 @@ register_chatcommand('asn_suspect', {
})
register_chatcommand('asn_unsuspect', {
description='Unmark an ASN as suspcious.',
description='Unmark an ASN as suspicious.',
params='<ASN> [<reason>]',
privs={[mod_priv]=true},
func=function(caller, params)
@ -1011,9 +1011,9 @@ register_chatcommand('logins', {
iso_date(row.timestamp),
(rows.success and ' failed!') or '',
lib_ip.ipint_to_ipstr(row.ipint),
data.ip_status_name[row.ip_status_id or data.ip_status.default.id],
data.ip_status_name[row.ip_status_id] or data.ip_status.default.name,
row.asn,
data.asn_status_name[row.asn_status_id or data.asn_status.default.id],
data.asn_status_name[row.asn_status_id] or data.asn_status.default.name,
lib_asn.get_description(row.asn)
)
chat_send_player(caller, message)
@ -1048,10 +1048,10 @@ register_chatcommand('inspect', {
local asn_description = lib_asn.get_description(row.asn)
local message = ('%s<%s> A%s (%s) <%s>'):format(
ipstr,
data.ip_status_name[row.ip_status_id or data.ip_status.default.id],
data.ip_status_name[row.ip_status_id] or data.ip_status.default.name,
row.asn,
asn_description,
data.asn_status_name[row.asn_status_id or data.asn_status.default.id]
data.asn_status_name[row.asn_status_id] or data.asn_status.default.name
)
chat_send_player(caller, message)
end
@ -1092,7 +1092,7 @@ register_chatcommand('ip_inspect', {
for _, row in ipairs(rows) do
local message = ('% 20s: %s'):format(
row.player_name,
data.player_status_name[row.player_status_id or data.player_status.default.id]
data.player_status_name[row.player_status_id] or data.player_status.default.name
)
chat_send_player(caller, message)
end
@ -1135,7 +1135,7 @@ register_chatcommand('asn_inspect', {
for _, row in ipairs(rows) do
local message = ('% 20s: %s'):format(
row.player_name,
data.player_status_name[row.player_status_id or data.player_status.default.id]
data.player_status_name[row.player_status_id] or data.player_status.default.name
)
chat_send_player(caller, message)
end
@ -1163,7 +1163,7 @@ register_chatcommand('asn_stats', {
chat_send_player(caller, ('Statistics for %s:'):format(asn_description))
for _, row in ipairs(rows) do
chat_send_player(caller, ('%s %s'):format(
data.player_status_name[row.player_status_id or data.player_status.default.id],
data.player_status_name[row.player_status_id] or data.player_status.default.name,
row.count
))
end
@ -1194,7 +1194,7 @@ register_chatcommand('cluster', {
for _, row in ipairs(rows) do
local message = ('% 20s: %s'):format(
row.player_name,
data.player_status_name[row.player_status_id or data.player_status.default.id]
data.player_status_name[row.player_status_id] or data.player_status.default.name
)
chat_send_player(caller, message)
end
@ -1357,7 +1357,7 @@ register_chatcommand('first-login', {
end
local rows = data.get_first_login(player_id)
if not rows then
return false, 'An error occured. See server logs.'
return false, 'An error occurred. See server logs.'
elseif #rows == 0 then
return true, 'No record of player logging in'
end
@ -1446,7 +1446,7 @@ register_chatcommand('pgrep', {
for _, row in ipairs(rows) do
chat_send_player(caller, '%s %s',
row.name,
data.player_status_name[row.player_status_id or data.player_status.default.id]
data.player_status_name[row.player_status_id] or data.player_status.default.name
)
end
return true

View File

@ -7,7 +7,7 @@ verbana.asn_description_path (Location of the ASN description file) string
# The location of the ASN data file (default: in the verbana mod folder)
verbana.asn_data_path (Location of the ASN data file) string
# The privilege of the Verbana adminstrator(s)
# The privilege of the Verbana administrator(s)
verbana.admin_priv (Priv required for Verbana administration) string ban_admin
# The privilege of the Verbana moderator(s)
@ -33,5 +33,5 @@ verbana.jail_check_period (Timespan between checks for verification jail escapee
verbana.universal_verification (Enable verification for all new users) bool false
# In debug mode, Verbana will not block any players from connecting, change their privileges,
# or anything else that affects gameplay.
# or anything else that affects game-play.
verbana.debug_mode (Whether to run verbana in debug mode) bool true