Fix rubenlagus#1373

chenjy16 · Jun 11, 2024 · 725c84c · 725c84c
1 parent 61b18fb
commit 725c84c
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 56 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.telegram</groupId>
     <artifactId>Bots</artifactId>
     <packaging>pom</packaging>
-    <version>7.4.0</version>
+    <version>7.4.1</version>
 
     <modules>
         <module>telegrambots-meta</module>

diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <artifactId>telegrambots-abilities</artifactId>
@@ -104,12 +104,12 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots-webhook</artifactId>
-            <version>7.4.0</version>
+            <version>7.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots-longpolling</artifactId>
-            <version>7.4.0</version>
+            <version>7.4.1</version>
         </dependency>
 
         <dependency>

diff --git a/telegrambots-client/pom.xml b/telegrambots-client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <name>Telegram Bots Client</name>

diff --git a/telegrambots-extensions/README.md b/telegrambots-extensions/README.md
@@ -16,12 +16,12 @@ Just import add the library to your project with one of these options:
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots-extensions</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </dependency>
 ```
 
    2. Using Gradle:
 
 ```gradle
-    implementation 'org.telegram:telegrambots-extensions:7.4.0'
+    implementation 'org.telegram:telegrambots-extensions:7.4.1'
 ```
diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <artifactId>telegrambots-extensions</artifactId>
@@ -89,12 +89,12 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots-webhook</artifactId>
-            <version>7.4.0</version>
+            <version>7.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots-longpolling</artifactId>
-            <version>7.4.0</version>
+            <version>7.4.1</version>
         </dependency>
 
         <dependency>

diff --git a/telegrambots-longpolling/pom.xml b/telegrambots-longpolling/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <artifactId>telegrambots-longpolling</artifactId>

diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <artifactId>telegrambots-meta</artifactId>

diff --git a/.../src/main/java/org/telegram/telegrambots/meta/api/methods/payments/RefundStarPayment.java b/.../src/main/java/org/telegram/telegrambots/meta/api/methods/payments/RefundStarPayment.java
@@ -0,0 +1,60 @@
+package org.telegram.telegrambots.meta.api.methods.payments;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.jackson.Jacksonized;
+import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethodBoolean;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 7.4
+ *
+ * Refunds a successful payment in Telegram Stars. Returns True on success.
+ */
+@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
+@ToString
+@RequiredArgsConstructor
+@SuperBuilder
+@Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class RefundStarPayment extends BotApiMethodBoolean {
+    public static final String PATH = "refundStarPayment";
+
+    private static final String USER_ID_FIELD = "user_id";
+    private static final String TELEGRAM_PAYMENT_CHARGE_ID_FIELD = "telegram_payment_charge_id";
+
+    /**
+     * Identifier of the user whose payment will be refunded
+     */
+    @JsonProperty(USER_ID_FIELD)
+    @NonNull
+    private Integer userId;
+    /**
+     * Telegram payment identifier
+     */
+    @JsonProperty(TELEGRAM_PAYMENT_CHARGE_ID_FIELD)
+    @NonNull
+    private String telegramPaymentChargeId;
+
+    @Override
+    public String getMethod() {
+        return PATH;
+    }
+
+    @Override
+    public void validate() throws TelegramApiValidationException {
+        if (telegramPaymentChargeId.isEmpty()) {
+            throw new TelegramApiValidationException("TelegramPaymentChargeId parameter can't be empty", this);
+        }
+    }
+}
diff --git a/.../src/main/java/org/telegram/telegrambots/meta/api/objects/payments/RefundStarPayment.java b/.../src/main/java/org/telegram/telegrambots/meta/api/objects/payments/RefundStarPayment.java
diff --git a/telegrambots-springboot-longpolling-starter/pom.xml b/telegrambots-springboot-longpolling-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <artifactId>telegrambots-springboot-longpolling-starter</artifactId>
@@ -71,7 +71,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <telegrambots.version>7.4.0</telegrambots.version>
+        <telegrambots.version>7.4.1</telegrambots.version>
         <spring.version>3.2.3</spring.version>
     </properties>
 

diff --git a/telegrambots-springboot-webhook-starter/pom.xml b/telegrambots-springboot-webhook-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <artifactId>telegrambots-springboot-webhook-starter</artifactId>
@@ -71,7 +71,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <telegrambots.version>7.4.0</telegrambots.version>
+        <telegrambots.version>7.4.1</telegrambots.version>
         <spring.version>3.2.3</spring.version>
         <jackson.version>2.16.1</jackson.version>
     </properties>

diff --git a/telegrambots-test-reports/pom.xml b/telegrambots-test-reports/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <artifactId>telegrambots-test-reports</artifactId>

diff --git a/telegrambots-webhook/pom.xml b/telegrambots-webhook/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.1</version>
     </parent>
 
     <artifactId>telegrambots-webhook</artifactId>