refactor: 旧代码移除

This commit is contained in:
手瓜一十雪
2024-11-21 11:01:35 +08:00
parent c332795844
commit 0f3862a937
12 changed files with 143 additions and 139 deletions

View File

@@ -1,7 +1,7 @@
import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '../types';
export default class GetGuildList extends OneBotAction<null, null> {
export class GetGuildList extends OneBotAction<null, null> {
actionName = ActionName.GetGuildList;
async _handle(payload: null): Promise<null> {

View File

@@ -1,7 +1,7 @@
import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '../types';
export default class GetGuildProfile extends OneBotAction<null, null> {
export class GetGuildProfile extends OneBotAction<null, null> {
actionName = ActionName.GetGuildProfile;
async _handle(payload: null): Promise<null> {

View File

@@ -22,7 +22,6 @@ import GoCQHTTPGetStrangerInfo from './go-cqhttp/GetStrangerInfo';
import SendLike from './user/SendLike';
import SetGroupAddRequest from './group/SetGroupAddRequest';
import SetGroupLeave from './group/SetGroupLeave';
import GetGuildList from './guild/GetGuildList';
import SetFriendAddRequest from './user/SetFriendAddRequest';
import SetGroupWholeBan from './group/SetGroupWholeBan';
import SetGroupName from './group/SetGroupName';
@@ -70,7 +69,6 @@ import { FetchEmojiLike } from './extends/FetchEmojiLike';
import { FetchUserProfileLike } from './extends/FetchUserProfileLike';
import { NapCatCore } from '@/core';
import { NapCatOneBot11Adapter } from '@/onebot';
import GetGuildProfile from './guild/GetGuildProfile';
import { SetInputStatus } from './extends/SetInputStatus';
import { GetCSRF } from './system/GetCSRF';
import { DelGroupNotice } from './group/DelGroupNotice';
@@ -102,6 +100,8 @@ import { GetMiniAppArk } from "@/onebot/action/extends/GetMiniAppArk";
import { GetAiRecord } from "@/onebot/action/group/GetAiRecord";
import { SendGroupAiRecord } from "@/onebot/action/group/SendGroupAiRecord";
import { GetAiCharacters } from "@/onebot/action/extends/GetAiCharacters";
import { GetGuildList } from './guild/GetGuildList';
import { GetGuildProfile } from './guild/GetGuildProfile';
export type ActionMap = Map<string, OneBotAction<any, any>>;

View File

@@ -27,19 +27,18 @@ export class SetMsgEmojiLike extends OneBotAction<Payload, any> {
if (!payload.emoji_id) {
throw new Error('emojiId not found');
}
if (!payload.set) {
payload.set = true;
}
payload.set = payload.set ?? true;
const msgData = (await this.core.apis.MsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId])).msgList;
if (!msgData || msgData.length == 0 || !msgData[0].msgSeq) {
if (!msgData || msgData.length === 0 || !msgData[0].msgSeq) {
throw new Error('find msg by msgid error');
}
return await this.core.apis.MsgApi.setEmojiLike(
msg.Peer,
msgData[0].msgSeq,
payload.emoji_id.toString(),
typeof payload.set == 'string' ? payload.set === 'true' : !!payload
typeof payload.set === 'string' ? payload.set === 'true' : !!payload.set
);
}
}
}

View File

@@ -24,7 +24,7 @@ function from(source: string) {
return { type, data, capture };
}
function h(type: string, data: any) {
function convert(type: string, data: any) {
return {
type,
data,
@@ -37,31 +37,29 @@ export function decodeCQCode(source: string): OB11MessageData[] {
while ((result = from(source))) {
const { type, data, capture } = result;
if (capture.index) {
elements.push(h('text', { text: unescape(source.slice(0, capture.index)) }));
elements.push(convert('text', { text: unescape(source.slice(0, capture.index)) }));
}
elements.push(h(type, data));
elements.push(convert(type, data));
source = source.slice(capture.index + capture[0].length);
}
if (source) elements.push(h('text', { text: unescape(source) }));
if (source) elements.push(convert('text', { text: unescape(source) }));
return elements;
}
function CQCodeEscapeText(text: string) {
return text.replace(/&/g, '&amp;')
.replace(/\[/g, '&#91;')
.replace(/]/g, '&#93;');
}
function CQCodeEscape(text: string) {
return text.replace(/&/g, '&amp;')
.replace(/\[/g, '&#91;')
.replace(/]/g, '&#93;')
.replace(/,/g, '&#44;');
}
export function encodeCQCode(data: OB11MessageData) {
const CQCodeEscapeText = (text: string) => {
return text.replace(/&/g, '&amp;')
.replace(/\[/g, '&#91;')
.replace(/]/g, '&#93;');
};
const CQCodeEscape = (text: string) => {
return text.replace(/&/g, '&amp;')
.replace(/\[/g, '&#91;')
.replace(/]/g, '&#93;')
.replace(/,/g, '&#44;');
};
if (data.type === 'text') {
return CQCodeEscapeText(data.data.text);
}
@@ -74,11 +72,13 @@ export function encodeCQCode(data: OB11MessageData) {
}
try {
const text = value?.toString();
if (text) result += `,${name}=${CQCodeEscape(text)}`;
if (text) {
result += `,${name}=${CQCodeEscape(text)}`;
}
} catch (error) {
// If it can't be converted, skip this name-value pair
console.error(`Error encoding CQCode for ${name}:`, error);
}
}
result += ']';
return result;
}
}

View File

@@ -3,7 +3,7 @@ import { NapCatCore } from '@/core';
export class OB11GroupAdminNoticeEvent extends OB11GroupNoticeEvent {
notice_type = 'group_admin';
sub_type: 'set' | 'unset'; // "set" | "unset"
sub_type: 'set' | 'unset';
constructor(core: NapCatCore, group_id: number, user_id: number, sub_type: 'set' | 'unset') {
super(core, group_id, user_id);

View File

@@ -5,13 +5,13 @@ export type GroupDecreaseSubType = 'leave' | 'kick' | 'kick_me';
export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent {
notice_type = 'group_decrease';
sub_type: GroupDecreaseSubType = 'leave'; // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me")
sub_type: GroupDecreaseSubType = 'leave';
operator_id: number;
constructor(core: NapCatCore, groupId: number, userId: number, operatorId: number, subType: GroupDecreaseSubType = 'leave') {
super(core, groupId, userId);
this.group_id = groupId;
this.operator_id = operatorId; // 实际上不应该这么实现,但是现在还没有办法识别用户是被踢出的,还是自己主动退出的
this.operator_id = operatorId;
this.user_id = userId;
this.sub_type = subType;
}