Compare commits

...

12 Commits

Author SHA1 Message Date
207521b638
rename track "staff" to "roles" 2025-08-07 00:23:27 +03:00
d240a44602 Merge pull request 'feature-32-change-DiscordSRV-storage-backend' (#38) from feature-32 into develop
All checks were successful
/ build-docker (push) Successful in 12m52s
Reviewed-on: #38
Reviewed-by: oznobys <oznobys@noreply.localhost>
2025-08-06 19:58:18 +00:00
66681a9bf1
change DiscordSRV storage backend from file to database 2025-08-06 22:55:28 +03:00
78f3df715b Merge pull request 'feature-42-fix-unicode' (#37) from feature-42 into develop
All checks were successful
/ build-docker (push) Successful in 12m55s
Reviewed-on: #37
2025-08-06 18:57:29 +00:00
314bd15a51
add unicode locale generation to Dockerfile
before the change, unicode characters were displayed in console as question marks
2025-08-06 21:55:19 +03:00
94cc77340a Merge pull request 'feature-27-database-and-duration-permission-fix' (#35) from feature-27 into develop
All checks were successful
/ build-docker (push) Successful in 7m2s
Reviewed-on: #35
Reviewed-by: oznobys <oznobys@noreply.localhost>
2025-08-04 15:28:40 +00:00
f47a370c7a Merge pull request 'feature-23-command-whitelist' (#36) from feature-23 into develop
Some checks failed
/ build-docker (push) Has been cancelled
Reviewed-on: #36
Reviewed-by: oznobys <oznobys@noreply.localhost>
2025-08-04 15:24:05 +00:00
f93a2208fd
disable prefix in LibertyBans messages 2025-08-03 22:55:01 +03:00
7da0770b58
disable mute commands in CarbonChat
before the change, CarbonChat mute command overrided LibertyBans mute command, player could not execute it
2025-08-03 13:10:26 +03:00
266e1b6a22
enable duration permissions in LibertyBans 2025-08-03 13:07:25 +03:00
7741c86fc7
add website link to ban description in russian localization 2025-08-03 13:06:16 +03:00
2b7054c519
fix database strings substitution
before the change file database was used although mariadb was supposed to be used
2025-08-03 10:50:37 +03:00
8 changed files with 42 additions and 30 deletions

View File

@ -83,6 +83,12 @@ RUN mkdir -p ${DATA_PATH}/Chunky/tasks && \
ln -sf ${DATA_PATH}/Chunky/tasks \
${CONFIG_PATH}/plugins/Chunky/tasks
# Generate unicode locale so that cyrillic characters display properly
RUN apt-get update -y && apt-get install -y locales && \
echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
dpkg-reconfigure --frontend=noninteractive locales
ENV LANG en_US.UTF-8
VOLUME ${DATA_PATH}
@ -124,12 +130,11 @@ ENV GRIM_DB_PASSWORD=0000
ENV DISCORDSRV_BOT_TOKEN=dummy-token
ENV LUCKPERMS_DB_HOST=127.0.0.1
ENV LUCKPERMS_DB_PORT=3306
ENV LUCKPERMS_DB_NAME=luckperms
ENV LUCKPERMS_DB_USERNAME=luckperms
ENV LUCKPERMS_DB_PASSWORD=0000
ENV DISCORDSRV_DB_HOST=127.0.0.1
ENV DISCORDSRV_DB_PORT=3306
ENV DISCORDSRV_DB_NAME=discordsrv_db
ENV DISCORDSRV_DB_USERNAME=discordsrv
ENV DISCORDSRV_DB_PASSWORD=0000
WORKDIR ${WORKDIR_PATH}/config
@ -182,6 +187,12 @@ CMD \
# Add DiscordSRV bot token
sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \
# Add database info to DiscordSRV config
sed -i "s/_DISCORDSRV_DB_HOST_/${DISCORDSRV_DB_HOST}/g" plugins/DiscordSRV/config.yml && \
sed -i "s/_DISCORDSRV_DB_PORT_/${DISCORDSRV_DB_PORT}/g" plugins/DiscordSRV/config.yml && \
sed -i "s/_DISCORDSRV_DB_NAME_/${DISCORDSRV_DB_NAME}/g" plugins/DiscordSRV/config.yml && \
sed -i "s/_DISCORDSRV_DB_USERNAME_/${DISCORDSRV_DB_USERNAME}/g" plugins/DiscordSRV/config.yml && \
sed -i "s/_DISCORDSRV_DB_PASSWORD_/${DISCORDSRV_DB_PASSWORD}/g" plugins/DiscordSRV/config.yml && \
# Launch
java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui

View File

@ -43,7 +43,7 @@ settings {
]
}
"carbon:unmute" {
enabled=true
enabled=false
name=unmute
aliases=[]
}
@ -100,7 +100,7 @@ settings {
]
}
"carbon:muteinfo" {
enabled=true
enabled=false
name=muteinfo
aliases=[
muted
@ -114,7 +114,7 @@ settings {
]
}
"carbon:mute" {
enabled=true
enabled=false
name=mute
aliases=[]
}

View File

@ -39,10 +39,10 @@ DiscordInviteLink: "https://discord.gg/5ZnJD4yDBq"
# Эти функции не полностью оптимизированы; Используйте на свой риск
# JDBC (MySQL/MariaDB)
Experiment_JdbcAccountLinkBackend: "jdbc:mysql://HOST:PORT/NAME?autoReconnect=true&useSSL=false"
Experiment_JdbcTablePrefix: ""
Experiment_JdbcUsername: ""
Experiment_JdbcPassword: ""
Experiment_JdbcAccountLinkBackend: "jdbc:mysql://_DISCORDSRV_DB_HOST_:_DISCORDSRV_DB_PORT_/_DISCORDSRV_DB_NAME_?autoReconnect=true&useSSL=false"
Experiment_JdbcTablePrefix: "discordsrv"
Experiment_JdbcUsername: "_DISCORDSRV_DB_USERNAME_"
Experiment_JdbcPassword: "_DISCORDSRV_DB_PASSWORD_"
# Webhook Delivery
Experiment_WebhookChatMessageDelivery: false

View File

@ -9,11 +9,13 @@ durationPermissions:
# Specify all the durations which you want to explicitly grant permission for.
permissions-to-check:
- 'perm'
- '4h'
- '30d'
- '10d'
- '7d'
- '14d'
- '28d'
- '90d'
- '180d'
# If disabled, players are not checked for duration permissions.
enable: false
enable: true
# Formatting of absolute dates
date-formatting:
@ -25,7 +27,7 @@ date-formatting:
# What language file should be used for messages?
# For example, 'en' means LibertyBans will look for a file called 'messages_en.yml'
lang-file: 'en'
lang-file: 'ru'
# Options related to punishment enforcement and alt account checking
#
# -- Alt Account Enforcement and Checking --

View File

@ -149,7 +149,6 @@ additions:
- ''
- '&3&lAppeal Your Punishment&f'
- '&cWebsite: &7https://bebrashield.net&f'
- '&cDiscord: &7https://discord.gg/xsyy7d8RfG'
permission:
duration: '&cYou may not do this for &e%DURATION%&c.'
both: '&cYou may not do this to players and their IP addresses.'
@ -480,7 +479,7 @@ all:
# The prefix to use
value: '&6&lLibertyBans &8»&7 '
# If enabled, all messages will be prefixed
enable: true
enable: false
# This section is only relevant if using the server scopes feature
scopes:

View File

@ -134,7 +134,7 @@ all:
base-permission-message: '&cТы уверен, что оно тебе нужно? К слову, права на эту команду у тебя нет.'
prefix:
# If enabled, all messages will be prefixed
enable: true
enable: false
# The prefix to use
value: '&6&lLibertyBans &8»&7 '
@ -197,8 +197,8 @@ additions:
- '&cПричина&f'
- '&7%REASON%&f'
- ''
- '&3По поводу разбана пишите в тех.поддержку:&f'
- '&cwww.support.com'
- '&3По поводу разбана пишите администрации:&f'
- '&cWebsite: &7https://bebrashield.net&f'
permission:
duration: '&cТебе нельзя банить на &e%DURATION%&c.'
both: '&cВы не можете блокировать игроков.'

View File

@ -77,11 +77,11 @@ timeouts:
# Authentication details for remote databases: used for MariaDB, MySQL, PostgreSQL, and CockroachDB.
auth-details:
database: 'minecraft_db'
password: '0000'
user: 'minecraft'
host: '127.0.0.1'
port: 3306
host: '_LIBERTYBANS_DB_HOST_'
port: _LIBERTYBANS_DB_PORT_
database: '_LIBERTYBANS_DB_NAME_'
user: '_LIBERTYBANS_DB_USERNAME_'
password: '_LIBERTYBANS_DB_PASSWORD_'
# The values in this section only apply when using a MariaDB or MySQL database
mariadb:
@ -111,7 +111,7 @@ use-traditional-jdbc-url: false
# 'MYSQL' - Requires an external MySQL database. At least MySQL 8.0 is required.
# 'POSTGRES' - Requires an external PostgreSQL database. At least PostgreSQL 12 is required.
# 'COCKROACH' - Requires an external CockroachDB database. The latest CockroachDB is required. Warning: this option is strictly experimental.
rdms-vendor: 'HSQLDB'
rdms-vendor: 'MARIADB'
#
# How large should the connection pool be?
# A thread pool of similar size is derived from the connection pool size.

View File

@ -404,7 +404,7 @@ auto-install-translations: true
meta-formatting:
prefix:
format:
- highest_on_track_staff
- highest_on_track_roles
- highest_on_track_clans
duplicates: first-only