Compare commits
19 Commits
1252763b68
...
renovate/n
Author | SHA1 | Date | |
---|---|---|---|
![]() |
303c7bc256 | ||
b19893f5ad | |||
1bc7c1369c | |||
a397b71382 | |||
c3d271bb3b | |||
6fd0260b4e | |||
b33dc292cd | |||
0c6c3755f2 | |||
6f58e1753f | |||
41491890f5 | |||
01923bb039 | |||
![]() |
f6357ea36a | ||
![]() |
c9da76d3e2 | ||
![]() |
9266c8a433 | ||
![]() |
a229861e3a | ||
![]() |
1112ce0591 | ||
![]() |
2020290349 | ||
![]() |
ea0f899cb1 | ||
![]() |
13d556eaf4 |
@ -11,7 +11,7 @@ COPY . .
|
|||||||
RUN mvn package -T2C -q -Dmaven.test.skip -DskipTests
|
RUN mvn package -T2C -q -Dmaven.test.skip -DskipTests
|
||||||
|
|
||||||
# Stage 2: Create the final lightweight image
|
# Stage 2: Create the final lightweight image
|
||||||
FROM eclipse-temurin:17.0.12_7-jre-focal
|
FROM eclipse-temurin:17.0.13_11-jre-focal
|
||||||
|
|
||||||
# Install Git
|
# Install Git
|
||||||
RUN apt-get update && apt-get install git -y
|
RUN apt-get update && apt-get install git -y
|
||||||
|
13
API/pom.xml
13
API/pom.xml
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>3.3.3</version>
|
<version>3.4.0</version>
|
||||||
<relativePath/>
|
<relativePath/>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -55,7 +55,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.konghq</groupId>
|
<groupId>com.konghq</groupId>
|
||||||
<artifactId>unirest-java-bom</artifactId>
|
<artifactId>unirest-java-bom</artifactId>
|
||||||
<version>4.4.4</version>
|
<version>4.4.5</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -78,13 +78,13 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<version>1.18.34</version>
|
<version>1.18.36</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.dv8tion</groupId>
|
<groupId>net.dv8tion</groupId>
|
||||||
<artifactId>JDA</artifactId>
|
<artifactId>JDA</artifactId>
|
||||||
<version>5.1.0</version>
|
<version>5.2.2</version>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>club.minnced</groupId>
|
<groupId>club.minnced</groupId>
|
||||||
@ -105,18 +105,17 @@
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- Error Reporting & Metrics -->
|
<!-- Error Reporting & Metrics -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.sentry</groupId>
|
<groupId>io.sentry</groupId>
|
||||||
<artifactId>sentry-spring-boot-starter-jakarta</artifactId>
|
<artifactId>sentry-spring-boot-starter-jakarta</artifactId>
|
||||||
<version>8.0.0-alpha.4</version>
|
<version>8.0.0-rc.2</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.questdb</groupId>
|
<groupId>org.questdb</groupId>
|
||||||
<artifactId>questdb</artifactId>
|
<artifactId>questdb</artifactId>
|
||||||
<version>8.1.1</version>
|
<version>8.2.1</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NonNull;
|
import lombok.NonNull;
|
||||||
import net.dv8tion.jda.api.entities.Activity;
|
import net.dv8tion.jda.api.entities.Activity;
|
||||||
|
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
|
||||||
import net.dv8tion.jda.api.entities.emoji.EmojiUnion;
|
import net.dv8tion.jda.api.entities.emoji.EmojiUnion;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -38,7 +39,13 @@ public class CustomStatus {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
EmojiUnion emoji = activity.getEmoji();
|
EmojiUnion emoji = activity.getEmoji();
|
||||||
return new CustomStatus(activity.getName(), emoji == null ? null : emoji.asUnicode().getFormatted());
|
String emojiString = null;
|
||||||
|
if (emoji instanceof CustomEmoji customEmoji) {
|
||||||
|
emojiString = customEmoji.getImageUrl();
|
||||||
|
} else if (emoji != null) {
|
||||||
|
emojiString = emoji.asUnicode().getFormatted();
|
||||||
|
}
|
||||||
|
return new CustomStatus(activity.getName(), emojiString);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ package me.braydon.tether.service;
|
|||||||
|
|
||||||
import com.github.benmanes.caffeine.cache.Cache;
|
import com.github.benmanes.caffeine.cache.Cache;
|
||||||
import com.github.benmanes.caffeine.cache.Caffeine;
|
import com.github.benmanes.caffeine.cache.Caffeine;
|
||||||
|
import io.questdb.cutlass.line.LineSenderException;
|
||||||
import jakarta.annotation.PostConstruct;
|
import jakarta.annotation.PostConstruct;
|
||||||
import kong.unirest.core.HttpResponse;
|
import kong.unirest.core.HttpResponse;
|
||||||
import kong.unirest.core.HttpStatus;
|
import kong.unirest.core.HttpStatus;
|
||||||
@ -130,7 +131,12 @@ public final class DiscordService extends ListenerAdapter {
|
|||||||
long before = System.currentTimeMillis();
|
long before = System.currentTimeMillis();
|
||||||
cachedUser = new CachedDiscordUser(getUser(snowflake, member != null), System.currentTimeMillis());
|
cachedUser = new CachedDiscordUser(getUser(snowflake, member != null), System.currentTimeMillis());
|
||||||
if (metricsEnabled) {
|
if (metricsEnabled) {
|
||||||
UserLookupTimingsMetric.track(System.currentTimeMillis() - before);
|
try {
|
||||||
|
UserLookupTimingsMetric.track(System.currentTimeMillis() - before);
|
||||||
|
} catch (LineSenderException | IllegalStateException ignored) {
|
||||||
|
// This can happen due to no metrics server being
|
||||||
|
// available, we can safely ignore it and continue
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cachedUsers.put(snowflake, cachedUser);
|
cachedUsers.put(snowflake, cachedUser);
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@ -27,8 +27,8 @@
|
|||||||
],
|
],
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bun": "latest",
|
"@types/bun": "latest",
|
||||||
"@types/react": "^18.3.5",
|
"@types/react": "^19.0.0",
|
||||||
"react": "^18.3.1"
|
"react": "^19.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": "*",
|
"react": "*",
|
||||||
|
Reference in New Issue
Block a user