Skip to content

Commit

Permalink
Beta382 (#383)
Browse files Browse the repository at this point in the history 
* beta338

* beta319

* beta340

* beta341

* actionfix

* beta342

* beta342

* beta342

* beta344

* beta345

* beta346

* beta347

* beta348

* beta349

* beta350

* beta351

* beta352

* beta353

* beta354

* beta355

* beta356

* beta357

* beta358

* beta359

* beta360

* beta361

* beta362

* beta363

* beta365

* beta366

* beta367

* beta368

* beta382
  • Loading branch information
@Hoshinonyaruko
Hoshinonyaruko authored Apr 25, 2024
1 parent 1c748a3 commit bab6fe6
Show file tree
Hide file tree
Showing 16 changed files with 238 additions and 46 deletions.
20 changes: 18 additions & 2 deletions Processor/ProcessC2CMessage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,21 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
} else {
IsBindedUserId = idmap.CheckValuev2(userid64)
}

var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

privateMsg := OnebotPrivateMessage{
RawMessage: messageText,
Message: segmentedMessages,
MessageID: messageID,
MessageType: "private",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
Sender: PrivateSender{
Nickname: "", //这个不支持,但加机器人好友,会收到一个事件,可以对应储存获取,用idmaps可以做到.
Expand Down Expand Up @@ -205,14 +213,22 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
messageID := int(messageID64)
//todo 判断array模式 然后对Message处理成array格式
IsBindedUserId := idmap.CheckValue(data.Author.ID, userid64)

var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

groupMsg := OnebotGroupMessage{
RawMessage: messageText,
Message: messageText,
MessageID: messageID,
GroupID: userid64,
MessageType: "group",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
Sender: Sender{
UserID: userid64,
Expand Down
27 changes: 24 additions & 3 deletions Processor/ProcessChannelDirectMessage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,20 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
IsBindedUserId = idmap.CheckValuev2(userid64)
}

var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

privateMsg := OnebotPrivateMessage{
RawMessage: messageText,
Message: segmentedMessages,
MessageID: messageID,
MessageType: "private",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
Sender: PrivateSender{
Nickname: data.Member.Nick,
Expand Down Expand Up @@ -196,6 +203,12 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
mylog.Printf("Error storing ID: %v", err)
return nil
}
var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}
//OnebotChannelMessage
onebotMsg := OnebotChannelMessage{
ChannelID: data.ChannelID,
Expand All @@ -205,7 +218,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
MessageID: data.ID,
MessageType: "guild",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
SelfTinyID: "",
Sender: Sender{
Expand Down Expand Up @@ -348,14 +361,22 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
} else {
IsBindedUserId = idmap.CheckValuev2(userid64)
}

var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

groupMsg := OnebotGroupMessage{
RawMessage: messageText,
Message: segmentedMessages,
MessageID: messageID,
GroupID: ChannelID64,
MessageType: "group",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
Sender: Sender{
Nickname: data.Member.Nick,
Expand Down
14 changes: 11 additions & 3 deletions Processor/ProcessGroupAddBot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,23 @@ func (p *Processors) ProcessGroupAddBot(data *dto.GroupAddBotEvent) error {
mylog.Printf("Invalid type for timestamp: %T", v)
return nil
}

mylog.Printf("Bot被[%v]邀请进入群[%v]", userid64, GroupID64)

var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

Request = GroupRequestEvent{
Comment: "",
Flag: "",
GroupID: GroupID64,
PostType: "request",
RequestType: "group",
SelfID: int64(config.GetAppID()),
SelfID: selfid64,
SubType: "invite",
Time: timestampInt64,
UserID: userid64,
Expand All @@ -111,7 +119,7 @@ func (p *Processors) ProcessGroupAddBot(data *dto.GroupAddBotEvent) error {
NoticeType: "group_increase",
OperatorID: 0,
PostType: "notice",
SelfID: int64(config.GetAppID()),
SelfID: selfid64,
SubType: "invite",
Time: timestampInt64,
UserID: userid64,
Expand Down
9 changes: 8 additions & 1 deletion Processor/ProcessGroupDelBot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,19 @@ func (p *Processors) ProcessGroupDelBot(data *dto.GroupAddBotEvent) error {
mylog.Printf("Bot被[%v]从群[%v]移出", userid64, GroupID64)
//从数据库删除群数据(仅删除类型缓存,再次加入会刷新)
idmap.DeleteConfigv2(fmt.Sprint(GroupID64), "type")

var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}
Notice = GroupNoticeEvent{
GroupID: GroupID64,
NoticeType: "group_decrease",
OperatorID: 0,
PostType: "notice",
SelfID: int64(config.GetAppID()),
SelfID: selfid64,
SubType: "kick_me",
Time: timestampInt64,
UserID: userid64,
Expand Down
9 changes: 8 additions & 1 deletion Processor/ProcessGroupMessage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,21 @@ func (p *Processors) ProcessGroupMessage(data *dto.WSGroupATMessageData) error {
IsBindedUserId = idmap.CheckValuev2(userid64)
IsBindedGroupId = idmap.CheckValuev2(GroupID64)
}
var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

groupMsg := OnebotGroupMessage{
RawMessage: messageText,
Message: segmentedMessages,
MessageID: messageID,
GroupID: GroupID64,
MessageType: "group",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
Sender: Sender{
UserID: userid64,
Expand Down
16 changes: 14 additions & 2 deletions Processor/ProcessGuildATMessage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
if config.GetArrayValue() {
segmentedMessages = handlers.ConvertToSegmentedMessage(data)
}
var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}
// 处理onebot_channel_message逻辑
onebotMsg := OnebotChannelMessage{
ChannelID: data.ChannelID,
Expand All @@ -63,7 +69,7 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
MessageID: data.ID,
MessageType: "guild",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
SelfTinyID: "0",
Sender: Sender{
Expand Down Expand Up @@ -208,14 +214,20 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
IsBindedUserId = idmap.CheckValuev2(userid64)
IsBindedGroupId = idmap.CheckValuev2(ChannelID64)
}
var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}
groupMsg := OnebotGroupMessage{
RawMessage: messageText,
Message: segmentedMessages,
MessageID: messageID,
GroupID: ChannelID64,
MessageType: "group",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
Sender: Sender{
Nickname: data.Member.Nick,
Expand Down
19 changes: 17 additions & 2 deletions Processor/ProcessGuildNormalMessage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
if config.GetArrayValue() {
segmentedMessages = handlers.ConvertToSegmentedMessage(data)
}
var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

// 处理onebot_channel_message逻辑
onebotMsg := OnebotChannelMessage{
ChannelID: data.ChannelID,
Expand All @@ -60,7 +67,7 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
MessageID: data.ID,
MessageType: "guild",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
SelfTinyID: "0",
Sender: Sender{
Expand Down Expand Up @@ -203,14 +210,22 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
IsBindedUserId = idmap.CheckValuev2(userid64)
IsBindedGroupId = idmap.CheckValuev2(ChannelID64)
}

var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

groupMsg := OnebotGroupMessage{
RawMessage: messageText,
Message: segmentedMessages,
MessageID: messageID,
GroupID: ChannelID64,
MessageType: "group",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
Sender: Sender{
Nickname: data.Member.Nick,
Expand Down
26 changes: 22 additions & 4 deletions Processor/ProcessInlineSearch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,19 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
return nil
}
}
var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}

if !config.GetGlobalInteractionToMessage() {
notice := &OnebotInteractionNotice{
GroupID: GroupID64,
NoticeType: "interaction",
PostType: "notice",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
SubType: "create",
Time: time.Now().Unix(),
UserID: userid64,
Expand All @@ -95,14 +102,20 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
return nil
}
messageID := int(messageID64)
var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}
groupMsg := OnebotGroupMessage{
RawMessage: data.Data.Resolved.ButtonData,
Message: segmentedMessages,
MessageID: messageID,
GroupID: GroupID64,
MessageType: "group",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
Sender: Sender{
UserID: userid64,
Expand Down Expand Up @@ -131,7 +144,12 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
//群回调
newdata := ConvertInteractionToMessage(data)
segmentedMessages := handlers.ConvertToSegmentedMessage(newdata)

var selfid64 int64
if config.GetUseUin() {
selfid64 = config.GetUinint64()
} else {
selfid64 = int64(p.Settings.AppID)
}
onebotMsg := OnebotChannelMessage{
ChannelID: data.ChannelID,
GuildID: data.GuildID,
Expand All @@ -140,7 +158,7 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
MessageID: data.ID,
MessageType: "guild",
PostType: "message",
SelfID: int64(p.Settings.AppID),
SelfID: selfid64,
UserID: userid64,
SelfTinyID: "0",
Sender: Sender{
Expand Down
Loading

0 comments on commit bab6fe6

Please sign in to comment.