shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

update kritor

Browse Source
This commit is contained in:
Simplxs 2024-04-08 20:00:44 +08:00
parent 926c4659f6
commit 36a09ca088
No known key found for this signature in database
GPG Key ID: E23537FF14DD6507
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kritor/kritor

@ -1 +1 @@
Subproject commit d94600bc7adef49c6dcd5a1973578d4a101c9b38
Subproject commit a7dfcf9aa9692f78f387919034f76e0130f6c12e

18
xposed/src/main/java/moe/fuqiuluo/shamrock/internals/GlobalEventTransmitter.kt
View File

@ -24,12 +24,12 @@ internal object GlobalEventTransmitter : QQInterfaces() {
MutableSharedFlow<NoticeEvent>()
}
private val requestEventFlow by lazy {
MutableSharedFlow<RequestsEvent>()
MutableSharedFlow<RequestEvent>()
}
private suspend fun pushNotice(noticeEvent: NoticeEvent) = noticeEventFlow.emit(noticeEvent)
private suspend fun pushRequest(requestEvent: RequestsEvent) = requestEventFlow.emit(requestEvent)
private suspend fun pushRequest(requestEvent: RequestEvent) = requestEventFlow.emit(requestEvent)
private suspend fun transMessageEvent(record: MsgRecord, message: PushMessageBody) =
MessageEventFlow.emit(record to message)
@ -484,13 +484,13 @@ internal object GlobalEventTransmitter : QQInterfaces() {
*/
object RequestTransmitter {
suspend fun transFriendApp(time: Long, operator: Long, tipText: String, flag: String): Boolean {
pushRequest(RequestsEvent.newBuilder().apply {
this.type = RequestsEvent.RequestType.FRIEND_APPLY
pushRequest(RequestEvent.newBuilder().apply {
this.type = RequestEvent.RequestType.FRIEND_APPLY
this.time = time.toInt()
this.requestId = flag
this.friendApply = FriendApplyRequest.newBuilder().apply {
this.applierUin = operator
this.message = tipText
this.flag = flag
}.build()
}.build())
return true
@ -504,15 +504,15 @@ internal object GlobalEventTransmitter : QQInterfaces() {
groupCode: Long,
flag: String
): Boolean {
pushRequest(RequestsEvent.newBuilder().apply {
this.type = RequestsEvent.RequestType.GROUP_APPLY
pushRequest(RequestEvent.newBuilder().apply {
this.type = RequestEvent.RequestType.GROUP_APPLY
this.time = time.toInt()
this.requestId = flag
this.groupApply = GroupApplyRequest.newBuilder().apply {
this.applierUid = applierUid
this.applierUin = applierUin
this.groupId = groupCode
this.reason = reason
this.flag = flag
}.build()
}.build())
return true
@ -535,7 +535,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
}
}
suspend inline fun onRequestEvent(collector: FlowCollector<RequestsEvent>) {
suspend inline fun onRequestEvent(collector: FlowCollector<RequestEvent>) {
requestEventFlow.collect {
GlobalScope.launch {
collector.emit(it)

4
xposed/src/main/java/qq/service/msg/NtMsgConvertor.kt
View File

@ -663,14 +663,14 @@ object NtMsgConvertor {
}
}
MusicPlatform.NetEase -> {
MusicPlatform.NETEASE -> {
val id = sourceMusic.music.id
if (!MusicHelper.tryShare163MusicById(contact, msgId, id)) {
LogCenter.log("无法发送网易云音乐分享", Level.ERROR)
}
}
MusicPlatform.Custom -> {
MusicPlatform.CUSTOM -> {
val data = sourceMusic.music.custom
ArkMsgHelper.tryShareMusic(
contact,