Codex/improve ordavk 2.0 PRO+

build.gradle

@@ -1,11 +1,13 @@
 subprojects {
     apply plugin: 'java'
 
-    group 'com.vk.api'
-    version '1.0.16'
+    group = 'com.vk.api'
+    version = '1.0.16'
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
     tasks.withType(Javadoc) {
         options.addStringOption('Xdoclint:none', '-quiet')
@@ -34,4 +36,4 @@ subprojects {
         jacksonVersion = '2.8.5'
         jettyVersion = '9.4.0.v20161208'
     }
-}
+}

orda-vk-plugin/README.md

@@ -0,0 +1,115 @@
+# OrdaVK 2.0 PRO (на базе Lite)
+
+## Что добавлено поверх Lite
+- Сохранены все Lite-команды и маршруты (`/ac`, `/helpop`, `/report`, `/rep`).
+- Ticket workflow PRO: `!take`, `!unassign`, `!reopen`, `!replyclose`, фильтры `!tickets`, `!ticket full`.
+- Templates UX: `!rlist`, placeholders `{player}`, `{ticket}`, `{staff}`.
+- Audit commands: `!audit`, `!audit recent`, `!audit <staff>`, `!audit ticket <id>`, `!audit player <nick>`, `!audit punish <nick>`.
+- Discipline commands: `!staffnote`, `!staffwarn`, `!staffreprimand`, `!staffdiscipline`, `!staffforgive`.
+- Punishment flow: `!unmute`, `!pardon`, `!unwarn`, `!punishlog` + tracking reversals.
+- Явные VK-алиасы для chat moderation: `!vkick`, `!vkban`, `!vkunban` (старые команды оставлены).
+- Расширен `!lookup`: режимы command/tickets/punish и лимит.
+- Расширен `!staffstats`: support/report, replies, first response, punish/reverted, discipline, quality/recommendation.
+- SQLite storage для операционных данных: tickets/history, pending, punishments, discipline, audit.
+
+## Команды
+### Help
+- `!help`
+- `!help support`
+- `!help mod`
+- `!help admin`
+- `!help punish`
+- `!help audit`
+
+### Tickets
+- `!tickets`
+- `!tickets mine|open|unassigned|support|report`
+- `!ticket <id>`
+- `!ticket full <id>` / `!ticket <id> full`
+- `!reply <id> <text>`
+- `!replyclose <id> <text>`
+- `!assign <id> <vk_id>`
+- `!take <id>`
+- `!unassign <id>`
+- `!close <id> [comment]`
+- `!reopen <id>`
+- `!move <id> support|report [--reason ...]`
+- `!r <id> <template>`
+- `!rlist`
+
+### Player / Staff
+- `!check <nick>`
+- `!check tech <nick>`
+- `!lookup <nick>`
+- `!lookup <nick> 20`
+- `!lookup <nick> tickets`
+- `!lookup <nick> punish`
+- `!staffstats <vk_id|nick> [full]`
+
+### Audit / Discipline
+- `!audit`
+- `!audit recent`
+- `!audit <vk_id|nick>`
+- `!audit ticket <id>`
+- `!audit player <nick>`
+- `!audit punish <nick>`
+- `!staffnote <vk_id|nick> <text>`
+- `!staffwarn <vk_id|nick> <text>`
+- `!staffreprimand <vk_id|nick> <text>`
+- `!staffdiscipline <vk_id|nick>`
+- `!staffforgive <record_id>`
+- `!staffsuspend <vk_id|nick> [reason]`
+- `!staffrestore <vk_id|nick> [reason]`
+- `!staffstatus <vk_id|nick>`
+- `!staffrevokecheck <vk_id|nick>`
+
+### Punishments
+- `!mute <nick> <preset|time reason>`
+- `!ban <nick> <preset|time reason>`
+- `!warn <nick> <preset|reason>`
+- `!unmute <nick> [reason]`
+- `!pardon <nick> [reason]`
+- `!unwarn <nick> [reason]`
+- `!punishlog <nick>`
+
+### Admin / VK / Raw
+- `!admins`
+- `!admin set|level|remove`
+- `!rnick`
+- `!kick` / `!ban @id` / `!unban`
+- `!vkick` / `!vkban` / `!vkunban`
+- `!noname`
+- `!cmd <raw>`
+
+## Хранение данных
+SQLite (`ordavk-pro.db`):
+- `tickets`
+- `ticket_history`
+- `audit_log`
+- `punishments`
+- `discipline`
+- `pending`
+
+YAML:
+- config/presets/templates/policies/retention.
+
+
+## Auto-suspend staff
+- 3 активных `REPRIMAND` => автоматический `SUSPENDED`.
+- Бот удаляет staff из VK staff-чатов и запускает revoke-команды сервера из `config.yml`.
+- Восстановление только вручную: `!staffrestore` (по умолчанию без авто-возврата серверных прав).
+
+- Быстрый контроль: `!staffstatus` и `!staffrevokecheck` для senior staff.
+
+## VK buttons (safe UX)
+- Кнопки добавлены как ускорение (не замена команд) для: `!ticket`, `!tickets`, `!staffstatus`.
+- Опасные действия через 2 шага подтверждения: закрытие/перенос тикета, suspend/restore staff.
+- При устаревшем payload бот отвечает коротко и безопасно (без падений/дублей).
+- Stage-2: добавлены utility-кнопки для `!check` (lookup + punish preset/confirm), `!staffdiscipline` (status/revokecheck/suspend/restore) и фильтры для `!audit`/`!audit recent`.
+
+
+## P0 moderation controls
+- `!getip <nick>` — показать последний известный IP игрока (senior only).
+- `!banip <ip|nick> <reason>` / `!unbanip <ip> [reason]` — IP ban через config-команды.
+- `!offreport <nick> <time> [reason]` / `!onreport <nick> [reason]` — временный блок `/report` и `/rep`.
+- `!offhelpop <nick> <time> [reason]` / `!onhelpop <nick> [reason]` — временный блок `/helpop` и `/ac`.

orda-vk-plugin/build.gradle

@@ -0,0 +1,37 @@
+plugins {
+    id 'java'
+}
+
+group = 'com.orda.vk'
+version = '2.0Pro'
+
+repositories {
+    mavenCentral()
+    maven {
+        url = 'https://repo.papermc.io/repository/maven-public/'
+    }
+}
+
+dependencies {
+    implementation project(':sdk')
+    compileOnly 'io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT'
+    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'org.xerial:sqlite-jdbc:3.46.1.3'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+    options.release = 17
+}
+
+processResources {
+    filteringCharset = 'UTF-8'
+    filesMatching('plugin.yml') {
+        expand(version: version)
+    }
+}

orda-vk-plugin/src/main/java/com/orda/vkplugin/OrdaVkPlugin.java

@@ -0,0 +1,29 @@
+package com.orda.vkplugin;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.orda.vkplugin.listener.GameEventListener;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class OrdaVkPlugin extends JavaPlugin {
+    private VkBridgeService vkBridgeService;
+
+    @Override
+    public void onEnable() {
+        saveDefaultConfig();
+        Gson gson = new GsonBuilder().create();
+
+        vkBridgeService = new VkBridgeService(this, gson);
+        getServer().getPluginManager().registerEvents(new GameEventListener(vkBridgeService), this);
+        vkBridgeService.start();
+        getLogger().info("Orda VK запущен.");
+    }
+
+    @Override
+    public void onDisable() {
+        if (vkBridgeService != null) {
+            vkBridgeService.stop();
+        }
+        getLogger().info("Orda VK остановлен.");
+    }
+}