Merge pull request #48 from sysnapse/voice-silk

use back upload group ppt

Author: eric2788

cmd/voice.go

@@ -42,15 +42,10 @@ func voiceGenshin(args []string, source *command.MessageSource) error {
 	if err != nil {
 		return err
 	}
-
-	/*
-		voice, err := qq.NewVoiceByBytes(data)
-		if err != nil {
-			return err
-		}
-	*/
-
-	voice := &message.VoiceElement{Data: data}
+	voice, err := qq.NewVoiceByBytes(data)
+	if err != nil {
+		return err
+	}
 	return qq.SendGroupMessage(message.NewSendingMessage().Append(voice))
 }
 

qq/msg.go

@@ -38,16 +38,16 @@ func NewTts(text string) (*message.GroupVoiceElement, error) {
 	return NewTtsWithGroup(ValGroupInfo.Uin, text)
 }
 
-func NewVoiceByUrl(url string) (*message.VoiceElement, error){
+func NewVoiceByUrl(url string) (*message.GroupVoiceElement, error){
 	data, err := request.GetBytesByUrl(url)
 	if err != nil{
 		return nil, err
 	}
 	return NewVoiceByBytes(data)
 }
 
-func NewVoiceByBytes(b []byte) (*message.VoiceElement, error){
-	return &message.VoiceElement{Data: b}, nil
+func NewVoiceByBytes(b []byte) (*message.GroupVoiceElement, error){
+	return NewVoiceByBytesWithGroup(ValGroupInfo.Uin, b)
 }
 
 func NewVoiceByBytesWithGroup(gp int64, b []byte) (*message.GroupVoiceElement, error){

qq/sending.go

@@ -210,9 +210,8 @@ func GetRandomMessageByTry(try int) []*message.TextElement {
 		random, err := GetRandomGroupMessage(ValGroupInfo.Uin)
 
 		if try > 2 { // 發送多一則隨機消息
-			for _, element := range GetRandomMessageByTry(1) { // 使用 1 確保不無限套娃
-				extras = append(extras, element)
-			}
+			// 使用 1 確保不無限套娃
+			extras = append(extras, GetRandomMessageByTry(1)...)
 		}
 
 		if err == nil && random != nil {