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

Shamrock: fix #213

Browse Source
This commit is contained in:
whitechi73 2024-01-28 22:38:54 +08:00
parent a485e72ddf
commit 9482641c38
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/convert/MessageElemConverter.kt
View File

@ -18,7 +18,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 文本 / 艾特 消息转换消息段 * 文本 / 艾特 消息转换消息段
*/ */
object TextConverter: MessageElemConverter() { data object TextConverter: MessageElemConverter() {
override suspend fun convert(chatType: Int, peerId: String, element: MsgElement): MessageSegment { override suspend fun convert(chatType: Int, peerId: String, element: MsgElement): MessageSegment {
val text = element.textElement val text = element.textElement
return if (text.atType != MsgConstant.ATTYPEUNKNOWN) { return if (text.atType != MsgConstant.ATTYPEUNKNOWN) {
@ -42,7 +42,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 小表情 / 戳一戳 消息转换消息段 * 小表情 / 戳一戳 消息转换消息段
*/ */
object FaceConverter: MessageElemConverter() { data object FaceConverter: MessageElemConverter() {
override suspend fun convert(chatType: Int, peerId: String, element: MsgElement): MessageSegment { override suspend fun convert(chatType: Int, peerId: String, element: MsgElement): MessageSegment {
val face = element.faceElement val face = element.faceElement
if (face.faceType == 5) { if (face.faceType == 5) {
@ -97,7 +97,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 图片消息转换消息段 * 图片消息转换消息段
*/ */
object ImageConverter: MessageElemConverter() { data object ImageConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -121,7 +121,9 @@ internal sealed class MessageElemConverter: IMessageConvert {
MsgConstant.KCHATTYPEGROUP -> RichProtoSvc.getGroupPicDownUrl(md5) MsgConstant.KCHATTYPEGROUP -> RichProtoSvc.getGroupPicDownUrl(md5)
MsgConstant.KCHATTYPEC2C -> RichProtoSvc.getC2CPicDownUrl(md5) MsgConstant.KCHATTYPEC2C -> RichProtoSvc.getC2CPicDownUrl(md5)
else -> unknownChatType(chatType) else -> unknownChatType(chatType)
} },
"subType" to image.picSubType,
"type" to if (image.isFlashPic) "flash" else "show"
) )
) )
} }
@ -130,7 +132,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 语音消息转换消息段 * 语音消息转换消息段
*/ */
object VoiceConverter: MessageElemConverter() { data object VoiceConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -166,7 +168,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 视频消息转换消息段 * 视频消息转换消息段
*/ */
object VideoConverter: MessageElemConverter() { data object VideoConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -195,7 +197,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 商城大表情消息转换消息段 * 商城大表情消息转换消息段
*/ */
object MarketFaceConverter: MessageElemConverter() { data object MarketFaceConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -218,7 +220,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* JSON消息转消息段 * JSON消息转消息段
*/ */
object StructJsonConverter: MessageElemConverter() { data object StructJsonConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -280,7 +282,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 回复消息转消息段 * 回复消息转消息段
*/ */
object ReplyConverter: MessageElemConverter() { data object ReplyConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -312,7 +314,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 灰色提示条消息过滤 * 灰色提示条消息过滤
*/ */
object GrayTipsConverter: MessageElemConverter() { data object GrayTipsConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -347,7 +349,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 文件消息转换消息段 * 文件消息转换消息段
*/ */
object FileConverter: MessageElemConverter() { data object FileConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -381,7 +383,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
/** /**
* 老板QQ的合并转发信息 * 老板QQ的合并转发信息
*/ */
object XmlMultiMsgConverter: MessageElemConverter() { data object XmlMultiMsgConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -397,7 +399,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
} }
} }
object XmlLongMsgConverter: MessageElemConverter() { data object XmlLongMsgConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,
@ -413,7 +415,7 @@ internal sealed class MessageElemConverter: IMessageConvert {
} }
} }
object MarkdownConverter: MessageElemConverter() { data object MarkdownConverter: MessageElemConverter() {
override suspend fun convert( override suspend fun convert(
chatType: Int, chatType: Int,
peerId: String, peerId: String,

2
xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/hooks/IpcService.kt
View File

@ -16,7 +16,7 @@ import moe.fuqiuluo.shamrock.xposed.ipc.ShamrockIpc
import moe.fuqiuluo.symbols.Process import moe.fuqiuluo.symbols.Process
import moe.fuqiuluo.symbols.XposedHook import moe.fuqiuluo.symbols.XposedHook
@XposedHook(Process.MSF, 0) @XposedHook(Process.MSF, priority = 0)
internal class IpcService: IAction { internal class IpcService: IAction {
override fun invoke(ctx: Context) { override fun invoke(ctx: Context) {
if (!PlatformUtils.isMsfProcess()) return if (!PlatformUtils.isMsfProcess()) return