|
|
@ -320,7 +320,7 @@ func (c *Client) getMessageReply(message *client.Message) (reply *gateway.Reply,
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
reply = &gateway.Reply {
|
|
|
|
reply = &gateway.Reply{
|
|
|
|
Author: fmt.Sprintf("%v@%s", c.getSenderId(replyMsg), gateway.Jid.Full()),
|
|
|
|
Author: fmt.Sprintf("%v@%s", c.getSenderId(replyMsg), gateway.Jid.Full()),
|
|
|
|
Id: strconv.FormatInt(message.ReplyToMessageId, 10),
|
|
|
|
Id: strconv.FormatInt(message.ReplyToMessageId, 10),
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -770,8 +770,8 @@ func (c *Client) messageToPrefix(message *client.Message, previewString string,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// reply to
|
|
|
|
// reply to
|
|
|
|
if message.ReplyToMessageId != 0 {
|
|
|
|
if message.ReplyToMessageId != 0 {
|
|
|
|
replyStart = c.countCharsInLines(&prefix) + (len(prefix) - 1) * len(messageHeaderSeparator)
|
|
|
|
replyStart = c.countCharsInLines(&prefix) + (len(prefix)-1)*len(messageHeaderSeparator)
|
|
|
|
replyLine := "reply: "+c.formatMessage(message.ChatId, message.ReplyToMessageId, true, replyMsg)
|
|
|
|
replyLine := "reply: " + c.formatMessage(message.ChatId, message.ReplyToMessageId, true, replyMsg)
|
|
|
|
prefix = append(prefix, replyLine)
|
|
|
|
prefix = append(prefix, replyLine)
|
|
|
|
replyEnd = replyStart + len(replyLine) + len(messageHeaderSeparator)
|
|
|
|
replyEnd = replyStart + len(replyLine) + len(messageHeaderSeparator)
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -891,7 +891,7 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
|
|
|
|
isOutgoing := isPM && message.IsOutgoing
|
|
|
|
isOutgoing := isPM && message.IsOutgoing
|
|
|
|
if isOutgoing {
|
|
|
|
if isOutgoing {
|
|
|
|
for resource := range c.resourcesRange() {
|
|
|
|
for resource := range c.resourcesRange() {
|
|
|
|
jids = append(jids, c.jid + "/" + resource)
|
|
|
|
jids = append(jids, c.jid+"/"+resource)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
jids = []string{c.jid}
|
|
|
|
jids = []string{c.jid}
|
|
|
|