Merge branch 'main' into kotlin-richtext

slackapi · Sep 20, 2024 · 8aa01ca · 8aa01ca
2 parents 12c2ea7 + e5565e7
commit 8aa01ca
Show file tree

Hide file tree

Showing 35 changed files with 370 additions and 54 deletions.
diff --git a/bolt-aws-lambda/pom.xml b/bolt-aws-lambda/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
         <aws-lambda-core.version>1.2.3</aws-lambda-core.version>
     </properties>
 
     <artifactId>bolt-aws-lambda</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-docker-examples/echo-command-app/build.gradle b/bolt-docker-examples/echo-command-app/build.gradle
@@ -10,7 +10,7 @@ repositories {
 dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("com.slack.api:bolt-jetty:1.43.0")
+    implementation("com.slack.api:bolt-jetty:1.43.1")
     implementation("ch.qos.logback:logback-classic:1.5.6")
     implementation('net.logstash.logback:logstash-logback-encoder:7.4')
 }

diff --git a/bolt-google-cloud-functions/pom.xml b/bolt-google-cloud-functions/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
     </properties>
 
     <artifactId>bolt-google-cloud-functions</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-helidon/pom.xml b/bolt-helidon/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -18,7 +18,7 @@
     </properties>
 
     <artifactId>bolt-helidon</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-http4k/pom.xml b/bolt-http4k/pom.xml
@@ -6,18 +6,18 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <http4k.version>5.30.0.0</http4k.version>
+        <http4k.version>5.31.0.0</http4k.version>
         <!-- http4k 5.26+ no longer supports Java 1.8 -->
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <artifactId>bolt-http4k</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencyManagement>

diff --git a/bolt-jakarta-jetty/pom.xml b/bolt-jakarta-jetty/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-jakarta-jetty</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-jakarta-servlet/pom.xml b/bolt-jakarta-servlet/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-jakarta-servlet</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-jakarta-socket-mode/pom.xml b/bolt-jakarta-socket-mode/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -15,7 +15,7 @@
     </properties>
 
     <artifactId>bolt-jakarta-socket-mode</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-jetty/pom.xml b/bolt-jetty/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
         <jetty.version>9.4.53.v20231009</jetty.version>
     </properties>
 
     <artifactId>bolt-jetty</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-kotlin-examples/pom.xml b/bolt-kotlin-examples/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-kotlin-examples</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-ktor/pom.xml b/bolt-ktor/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-ktor</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/bolt-micronaut/pom.xml b/bolt-micronaut/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -26,7 +26,7 @@
     </properties>
 
     <artifactId>bolt-micronaut</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-quarkus-examples/pom.xml b/bolt-quarkus-examples/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -24,7 +24,7 @@
     </properties>
 
     <artifactId>bolt-quarkus-examples</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencyManagement>

diff --git a/bolt-servlet/pom.xml b/bolt-servlet/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -15,7 +15,7 @@
     </properties>
 
     <artifactId>bolt-servlet</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-socket-mode/pom.xml b/bolt-socket-mode/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
     </properties>
 
     <artifactId>bolt-socket-mode</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt/pom.xml b/bolt/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.43.1-SNAPSHOT</version>
+        <version>1.44.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt</artifactId>
-    <version>1.43.1-SNAPSHOT</version>
+    <version>1.44.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/bolt/src/main/java/com/slack/api/bolt/meta/BoltLibraryVersion.java b/bolt/src/main/java/com/slack/api/bolt/meta/BoltLibraryVersion.java
@@ -5,7 +5,7 @@ private BoltLibraryVersion() {
     }
 
     public static final String get() {
-        return "1.43.1-SNAPSHOT";
+        return "1.44.0-SNAPSHOT";
     }
 }
 
diff --git a/bolt/src/main/java/com/slack/api/bolt/request/builtin/EventRequest.java b/bolt/src/main/java/com/slack/api/bolt/request/builtin/EventRequest.java
@@ -83,6 +83,8 @@ public EventRequest(
         }
         this.getContext().setEnterpriseId(enterpriseId);
         this.getContext().setTeamId(teamId);
+        this.getContext().setRequestUserId(extractRequestUserId(payload));
+
         // set retry related header values to the context
         if (this.headers != null && this.headers.getNames().size() > 0) {
             for (String name : this.headers.getNames()) {
@@ -119,7 +121,35 @@ public EventRequest(
         }
     }
 
-    private EventContext context = new EventContext();
+    private static String extractRequestUserId(JsonObject payload) {
+        if (payload.get("user") != null) {
+            if (payload.get("user").isJsonPrimitive()) {
+                return payload.get("user").getAsString();
+            } else if (payload.get("user").isJsonObject()) {
+                JsonElement userId = payload.get("user").getAsJsonObject().get("id");
+                if (userId != null) {
+                    return userId.getAsString();
+                }
+            }
+        }
+        if (payload.get("user_id") != null) {
+            return payload.get("user_id").getAsString();
+        }
+        if (payload.get("event") != null) {
+            return extractRequestUserId(payload.get("event").getAsJsonObject());
+        }
+        if (payload.get("message") != null) {
+            // message_changed: body["event"]["message"]
+            return extractRequestUserId(payload.get("message").getAsJsonObject());
+        }
+        if (payload.get("previous_message") != null) {
+            // message_deleted: body["event"]["previous_message"]
+            return extractRequestUserId(payload.get("previous_message").getAsJsonObject());
+        }
+        return null;
+    }
+
+    private final EventContext context = new EventContext();
 
     @Override
     public EventContext getContext() {