Skip to content

Commit a6987ab

Browse files
committed
refactor(core): rename signal to transformer
1 parent fd71574 commit a6987ab

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/AbstractBot.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import org.ntqqrev.acidify.entity.BotFriend
1818
import org.ntqqrev.acidify.entity.BotGroup
1919
import org.ntqqrev.acidify.entity.internal.BotEntityCache
2020
import org.ntqqrev.acidify.event.AcidifyEvent
21-
import org.ntqqrev.acidify.event.internal.KickSignal
22-
import org.ntqqrev.acidify.event.internal.MsgPushSignal
21+
import org.ntqqrev.acidify.event.internal.KickTransformer
22+
import org.ntqqrev.acidify.event.internal.MsgPushTransformer
2323
import org.ntqqrev.acidify.internal.AbstractClient
2424
import org.ntqqrev.acidify.logging.LogHandler
2525
import org.ntqqrev.acidify.logging.LogLevel
@@ -40,9 +40,9 @@ sealed class AbstractBot(
4040
extraBufferCapacity = 100,
4141
onBufferOverflow = BufferOverflow.DROP_OLDEST
4242
)
43-
internal val signals = listOf(
44-
MsgPushSignal,
45-
KickSignal
43+
internal val transformers = listOf(
44+
MsgPushTransformer,
45+
KickTransformer
4646
).associateBy { it.cmd }
4747
internal lateinit var faceDetailMapMut: Map<String, BotFaceDetail>
4848
internal var eventCollectJob: Job? = null

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/SystemOps.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ suspend fun AbstractBot.online(preloadContacts: Boolean = false) {
2727
eventCollectJob = launch {
2828
while (currentCoroutineContext().isActive) {
2929
val sso = client.pushChannel.receive()
30-
val signal = signals[sso.command]
31-
if (signal != null) {
30+
val transformer = transformers[sso.command]
31+
if (transformer != null) {
3232
try {
33-
val parsed = signal.parse(this@online, sso.response)
34-
logger.v { " ${sso.command} 解析出事件:$parsed" }
33+
val parsed = transformer.parse(this@online, sso.response)
34+
logger.v { "由推送 ${sso.command} 解析出事件:$parsed" }
3535
parsed.forEach { sharedEventFlow.emit(it) }
3636
} catch (e: Exception) {
37-
logger.e(e) { "处理信令 ${sso.command} 时出现错误" }
37+
logger.e(e) { "处理推送 ${sso.command} 时出现错误" }
3838
}
3939
}
4040
}

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/event/internal/AbstractSignal.kt renamed to acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/event/internal/AbstractTransformer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ package org.ntqqrev.acidify.event.internal
33
import org.ntqqrev.acidify.AbstractBot
44
import org.ntqqrev.acidify.event.AcidifyEvent
55

6-
internal abstract class AbstractSignal(val cmd: String) {
6+
internal abstract class AbstractTransformer(val cmd: String) {
77
abstract suspend fun parse(bot: AbstractBot, payload: ByteArray): List<AcidifyEvent>
88
}

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/event/internal/KickSignal.kt renamed to acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/event/internal/KickTransformer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.ntqqrev.acidify.event.BotOfflineEvent
66
import org.ntqqrev.acidify.internal.proto.system.KickNT
77
import org.ntqqrev.acidify.internal.util.pbDecode
88

9-
internal object KickSignal : AbstractSignal("trpc.qq_new_tech.status_svc.StatusService.KickNT") {
9+
internal object KickTransformer : AbstractTransformer("trpc.qq_new_tech.status_svc.StatusService.KickNT") {
1010
override suspend fun parse(bot: AbstractBot, payload: ByteArray): List<AcidifyEvent> {
1111
val kickNT = payload.pbDecode<KickNT>()
1212
return listOf(

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/event/internal/MsgPushSignal.kt renamed to 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
@@ -23,7 +23,7 @@ import org.ntqqrev.acidify.struct.RequestState
2323
import kotlin.time.Clock
2424

2525
@Suppress("duplicatedCode")
26-
internal object MsgPushSignal : AbstractSignal("trpc.msg.olpush.OlPushService.MsgPush") {
26+
internal object MsgPushTransformer : AbstractTransformer("trpc.msg.olpush.OlPushService.MsgPush") {
2727
override suspend fun parse(bot: AbstractBot, payload: ByteArray): List<AcidifyEvent> {
2828
val commonMsg = payload.pbDecode<PushMsg>().message
2929
val contentHead = commonMsg.contentHead

0 commit comments

Comments
 (0)