Skip to content

Commit 723dce4

Browse files
authored
Merge branch 'LagrangeDev:main' into seal-on-main
2 parents 6cd2fd2 + 7780018 commit 723dce4

5 files changed

Lines changed: 3 additions & 11 deletions

File tree

acidify-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ group = "org.ntqqrev"
1818
version = "1.6.1"
1919

2020
kotlin {
21-
js(IR) {
21+
js {
2222
nodejs()
2323
useEsModules()
2424
binaries.library()

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/event/internal/MsgPushTransformer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ internal object MsgPushTransformer : AbstractTransformer("trpc.msg.olpush.OlPush
6969
val member = bot.getGroup(msg.peerUin)?.getMember(msg.senderUin)
7070
member?.updateBinding(
7171
member.data.copy(
72-
nickname = msg.extraInfo.nick,
72+
nickname = msg.extraInfo.nick.ifEmpty { member.data.nickname },
7373
card = msg.extraInfo.groupCard,
7474
specialTitle = msg.extraInfo.specialTitle
7575
)

acidify-milky/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ plugins {
77
group = "org.ntqqrev"
88

99
kotlin {
10-
compilerOptions {
11-
freeCompilerArgs.add("-Xcontext-parameters")
12-
}
13-
1410
sourceSets {
1511
commonMain.dependencies {
1612
implementation(project(":acidify-core"))

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
44

55
[versions]
6-
kotlin = "2.3.21"
6+
kotlin = "2.4.0"
77
kx-serialization = "1.11.0"
88
kx-coroutines = "1.11.0"
99
kx-io = "0.9.0"

yogurt/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ kotlin {
3333
}
3434
}
3535

36-
compilerOptions {
37-
freeCompilerArgs.add("-Xcontext-parameters")
38-
}
39-
4036
sourceSets {
4137
commonMain.dependencies {
4238
implementation(project(":acidify-core"))

0 commit comments

Comments
 (0)