diff --git a/electron.vite.config.ts b/electron.vite.config.ts index a469511..9c1d7eb 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -45,7 +45,7 @@ let config = { ...external.map(genCpModule), { src: './manifest.json', dest: 'dist' }, { src: './icon.jpg', dest: 'dist' }, - { src: './src/ntqqapi/native/crychic/crychic-win32-x64.node', dest: 'dist/main/' }, + // { src: './src/ntqqapi/native/crychic/crychic-win32-x64.node', dest: 'dist/main/' }, // { src: './src/ntqqapi/native/moehook/MoeHoo-win32-x64.node', dest: 'dist/main/' }, // { src: './src/ntqqapi/native/moehook/MoeHoo-linux-x64.node', dest: 'dist/main/' }, ], diff --git a/src/common/config.ts b/src/common/config.ts index 3d039a7..d9a1eea 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -53,7 +53,6 @@ export class ConfigUtil { reportSelfMessage: false, autoDeleteFile: false, autoDeleteFileSecond: 60, - enablePoke: false, musicSignUrl: '', } diff --git a/src/common/types.ts b/src/common/types.ts index 80f15e0..b4d722d 100644 --- a/src/common/types.ts +++ b/src/common/types.ts @@ -28,7 +28,6 @@ export interface Config { autoDeleteFile?: boolean autoDeleteFileSecond?: number ffmpeg?: string // ffmpeg路径 - enablePoke?: boolean musicSignUrl?: string ignoreBeforeLoginMsg?: boolean } diff --git a/src/main/main.ts b/src/main/main.ts index aadd755..69ac2fe 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -48,7 +48,6 @@ import { dbUtil } from '../common/db' import { setConfig } from './setConfig' import { NTQQUserApi } from '../ntqqapi/api/user' import { NTQQGroupApi } from '../ntqqapi/api/group' -import { crychic } from '../ntqqapi/native/crychic' import { OB11FriendPokeEvent, OB11GroupPokeEvent } from '../onebot11/event/notice/OB11PokeEvent' import { checkNewVersion, upgradeLLOneBot } from '../common/utils/upgrade' import { log } from '../common/utils/log' @@ -209,26 +208,7 @@ function onLoad() { } async function startReceiveHook() { - startHook().then() - if (getConfigUtil().getConfig().enablePoke) { - if (qqPkgInfo.buildVersion > '23873') { - log(`当前版本${qqPkgInfo.buildVersion}不支持发送戳一戳模块`) - } - else { - crychic.loadNode() - crychic.registerPokeHandler((id, isGroup) => { - log(`收到戳一戳消息了!是否群聊:${isGroup},id:${id}`) - let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent - if (isGroup) { - pokeEvent = new OB11GroupPokeEvent(parseInt(id)) - } - else { - pokeEvent = new OB11FriendPokeEvent(parseInt(selfInfo.uin), parseInt(id)) - } - postOb11Event(pokeEvent) - }) - } - } + startHook() registerReceiveHook<{ msgList: Array }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], async (payload) => { diff --git a/src/onebot11/action/msg/SendMsg.ts b/src/onebot11/action/msg/SendMsg.ts index 2c92a51..b5eb8b2 100644 --- a/src/onebot11/action/msg/SendMsg.ts +++ b/src/onebot11/action/msg/SendMsg.ts @@ -23,7 +23,7 @@ import { OB11MessageVideo, OB11PostSendMsg, } from '../../types' -import { NTQQMsgApi, Peer } from '../../../ntqqapi/api/msg' +import { NTQQMsgApi } from '../../../ntqqapi/api/msg' import { SendMsgElementConstructor } from '../../../ntqqapi/constructor' import BaseAction from '../BaseAction' import { ActionName, BaseCheckResult } from '../types' @@ -37,6 +37,7 @@ import { uri2local } from '../../../common/utils' import { crychic } from '../../../ntqqapi/native/crychic' import { NTQQGroupApi } from '../../../ntqqapi/api' import { CustomMusicSignPostData, IdMusicSignPostData, MusicSign, MusicSignPostData } from '../../../common/utils/sign' +import { Peer } from '../../../ntqqapi/types/msg' function checkSendMessage(sendMsgList: OB11MessageData[]) { function checkUri(uri: string): boolean { diff --git a/src/renderer/index.ts b/src/renderer/index.ts index 8efc0a0..eb1be0d 100644 --- a/src/renderer/index.ts +++ b/src/renderer/index.ts @@ -186,11 +186,6 @@ async function onSettingWindowCreated(view: Element) { SettingItem('', null, SettingButton('保存', 'config-ob11-save', 'primary')), ]), SettingList([ - SettingItem( - '戳一戳消息, 暂时只支持Windows版的LLOneBot', - `重启QQ后生效,如果导致QQ崩溃请勿开启此项, 群戳一戳只能收到群号`, - SettingSwitch('enablePoke', config.enablePoke), - ), SettingItem( '使用 Base64 编码获取文件', '调用 /get_image、/get_record、/get_file 时,没有 url 时添加 Base64 字段',