Merge pull request #13 from Ferius057/dev

Dev
Ferius057 · Nov 12, 2023 · 4319512 · 4319512
2 parents 050cec7 + a75b078
commit 4319512
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <h1 align="center">VK-MailingGroup</h1>
 <p align="center">
-       <a href="https://github.com/Ferius057/VK-MailingGroup/releases/tag/1.4.0">
+       <a href="https://github.com/Ferius057/VK-MailingGroup/releases/tag/1.4.1">
     <img src="https://img.shields.io/github/v/release/Ferius057/VK-MailingGroup?style=flat-square">
   </a>
     <a href="https://opensource.org/licenses/MIT">
@@ -13,7 +13,7 @@
     <img src="https://img.shields.io/badge/License-MIT-yellow.svg">
   </a>
   <p align="center">
-  <a href="https://github.com/Ferius057/VK-MailingGroup/releases/download/1.4.0/MailingGroup.jar">
+  <a href="https://github.com/Ferius057/VK-MailingGroup/releases/download/1.4.1/MailingGroup.jar">
     <img src="https://img.shields.io/github/downloads/Ferius057/VK-MailingGroup/total?color=6ff00">
   <a href="https://www.donationalerts.com/r/ferius_057">
     <img src="https://img.shields.io/badge/Donate-DonationAlerts-orange.svg">
@@ -39,13 +39,13 @@
 <hr>
 
 ## Использование:
-   <a href="https://github.com/Ferius057/VK-MailingGroup/releases/download/1.4.0/MailingGroup.jar">
+   <a href="https://github.com/Ferius057/VK-MailingGroup/releases/download/1.4.1/MailingGroup.jar">
     <img src="https://img.shields.io/github/downloads/Ferius057/VK-MailingGroup/total?color=6ff00">
   </a>
 
 ```bash
 # Скачать на Linux
-$ wget https://github.com/Ferius057/VK-MailingGroup/releases/download/1.4.0/MailingGroup.jar
+$ wget https://github.com/Ferius057/VK-MailingGroup/releases/download/1.4.1/MailingGroup.jar
 
 
 # Для запуска скрипта

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>kz.ferius_057</groupId>
     <artifactId>MailingGroup</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

diff --git a/src/main/java/kz/ferius_057/mailingGroup/Main.java b/src/main/java/kz/ferius_057/mailingGroup/Main.java
@@ -27,7 +27,7 @@
  * @date ⭐ 10.09.2022 | 2:57 ⭐
  */
 public class Main {
-    static final Logger LOGGER = LogManager.getLogger(Config.class);
+    static final Logger LOGGER = LogManager.getLogger(Main.class);
     static final String CURRENT_VERSION = getCurrentVersion();
 
     static {

diff --git a/src/main/java/kz/ferius_057/mailingGroup/data/Config.java b/src/main/java/kz/ferius_057/mailingGroup/data/Config.java
@@ -52,7 +52,8 @@ public static Config load(final Path path) {
             return new Config(
                     config.getString("token"),
                     config.getString("message")
-                            .replace("\n", "<br>"),
+                            .replace("\n", "<br>")
+                            .replace("\"", "&#8221;"),
                     config.getConfigurationSection("attachments")
                             .getValues(true)
                             .entrySet().stream()

diff --git a/src/main/java/kz/ferius_057/mailingGroup/vk/Mailing.java b/src/main/java/kz/ferius_057/mailingGroup/vk/Mailing.java
@@ -137,11 +137,17 @@ private void send(final List<Integer> users, final AtomicInteger numberQuery, fi
                 .exceptionally(throwable -> {
                     try {
                         // TODO: 05.11.2022 | проверять ошибки
-                        LOGGER.error("Прошу вас отписать мне в вк - vk.com/ferius_057 или тг - t.me/ferius_057");
-                        LOGGER.error("Не удалось выполнить метод execute: {}", throwable.getCause().getMessage());
-                        JsonObject jsonObject = new Gson().fromJson(throwable.getCause().getMessage(), JsonObject.class);
-                        System.out.println(jsonObject);
-                        System.out.println(jsonObject.get("error").getAsJsonObject().get("error_code").getAsInt());
+                        val errorMessage = throwable.getMessage();
+                        val sb = new StringBuilder("\n");
+                        sb.append("Прошу вас отписать мне в вк - vk.com/ferius_057 или тг - t.me/ferius_057");
+                        sb.append("\n").append("Не удалось выполнить метод execute: ").append(errorMessage);
+
+                        val jsonObject = new Gson().fromJson(errorMessage, JsonObject.class);
+                        sb.append("\n").append(jsonObject);
+                        sb.append("\n").append(jsonObject.get("error").getAsJsonObject().get("error_code").getAsInt());
+                        sb.append("\n").append(jsonObject.get("error").getAsJsonObject().get("error_msg").getAsString()).append("\n");
+
+                        LOGGER.error(sb.toString());
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -163,7 +169,7 @@ private void send(final List<Integer> users, final AtomicInteger numberQuery, fi
                                 totalMemory / 1048576, freeMemory / 1048576,
                                 (totalMemory - freeMemory) / 1048576);
 
-                        isLastQuery(numberQuery.get()); // если последний запрос то завершение
+                        isLastQuery(numberQuery.get()); // если последний запрос, то завершение
                     }
                 });
     }