fix: private reply id error, fix #1608

Mrs4s · Sep 9, 2022 · bc9c6c4 · bc9c6c4
1 parent bae00b5
commit bc9c6c4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/coolq/cqcode.go b/coolq/cqcode.go
@@ -84,14 +84,14 @@ func (e *PokeElement) Type() message.ElementType {
 func replyID(r *message.ReplyElement, source message.Source) int32 {
  id := source.PrimaryID
  seq := r.ReplySeq
- if source.SourceType == message.SourcePrivate {
+ if r.GroupID != 0 {
+ id = r.GroupID
+ }
+ if source.SourceType == message.SourcePrivate && r.Sender == source.PrimaryID {
  // 私聊似乎腾讯服务器有bug?
  seq = int32(uint16(seq))
  id = r.Sender
  }
- if r.GroupID != 0 {
- id = r.GroupID
- }
  return db.ToGlobalID(id, seq)
 }