shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 19:17:38 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #151 from takayama-lily/master

Browse Source 
use https for image urls
This commit is contained in:
Mrs4s 2021-04-29 10:59:59 +08:00 committed by GitHub
commit 212c89a266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/image.go
View File

@ -195,13 +195,13 @@ func (c *QQClient) QueryFriendImage(target int64, hash []byte, size int32) (*mes
return &message.FriendImageElement{ return &message.FriendImageElement{
ImageId: rsp.ResourceId, ImageId: rsp.ResourceId,
Md5: hash, Md5: hash,
Url: "http://c2cpicdw.qpic.cn/offpic_new/0/" + rsp.ResourceId + "/0?term=2", Url: "https://c2cpicdw.qpic.cn/offpic_new/0/" + rsp.ResourceId + "/0?term=2",
}, errors.WithStack(ErrNotExists) }, errors.WithStack(ErrNotExists)
} }
return &message.FriendImageElement{ return &message.FriendImageElement{
ImageId: rsp.ResourceId, ImageId: rsp.ResourceId,
Md5: hash, Md5: hash,
Url: "http://c2cpicdw.qpic.cn/offpic_new/0/" + rsp.ResourceId + "/0?term=2", Url: "https://c2cpicdw.qpic.cn/offpic_new/0/" + rsp.ResourceId + "/0?term=2",
}, nil }, nil
} }

2
message/elements.go
View File

@ -203,7 +203,7 @@ func NewGroupImage(id string, md5 []byte, fid int64, size, width, height, imageT
ImageType: imageType, ImageType: imageType,
Width: width, Width: width,
Height: height, Height: height,
Url: "http://gchat.qpic.cn/gchatpic_new/1/0-0-" + strings.ReplaceAll(binary.CalculateImageResourceId(md5)[1:37], "-", "") + "/0?term=2", Url: "https://gchat.qpic.cn/gchatpic_new/1/0-0-" + strings.ReplaceAll(binary.CalculateImageResourceId(md5)[1:37], "-", "") + "/0?term=2",
} }
} }

8
message/message.go
View File

@ -480,9 +480,9 @@ func ParseMessageElems(elems []*msg.Elem) []IMessageElement {
Height: elem.CustomFace.GetHeight(), Height: elem.CustomFace.GetHeight(),
Url: func() string { Url: func() string {
if elem.CustomFace.GetOrigUrl() == "" { if elem.CustomFace.GetOrigUrl() == "" {
return "http://gchat.qpic.cn/gchatpic_new/0/0-0-" + strings.ReplaceAll(binary.CalculateImageResourceId(elem.CustomFace.Md5)[1:37], "-", "") + "/0?term=2" return "https://gchat.qpic.cn/gchatpic_new/0/0-0-" + strings.ReplaceAll(binary.CalculateImageResourceId(elem.CustomFace.Md5)[1:37], "-", "") + "/0?term=2"
} }
return "http://gchat.qpic.cn" + elem.CustomFace.GetOrigUrl() return "https://gchat.qpic.cn" + elem.CustomFace.GetOrigUrl()
}(), }(),
Md5: elem.CustomFace.Md5, Md5: elem.CustomFace.Md5,
}) })
@ -490,9 +490,9 @@ func ParseMessageElems(elems []*msg.Elem) []IMessageElement {
if elem.NotOnlineImage != nil { if elem.NotOnlineImage != nil {
var img string var img string
if elem.NotOnlineImage.GetOrigUrl() != "" { if elem.NotOnlineImage.GetOrigUrl() != "" {
img = "http://c2cpicdw.qpic.cn" + elem.NotOnlineImage.GetOrigUrl() img = "https://c2cpicdw.qpic.cn" + elem.NotOnlineImage.GetOrigUrl()
} else { } else {
img = "http://c2cpicdw.qpic.cn/offpic_new/0/" + elem.NotOnlineImage.GetResId() + "/0?term=2" img = "https://c2cpicdw.qpic.cn/offpic_new/0/" + elem.NotOnlineImage.GetResId() + "/0?term=2"
} }
res = append(res, &ImageElement{ res = append(res, &ImageElement{
Filename: elem.NotOnlineImage.GetFilePath(), Filename: elem.NotOnlineImage.GetFilePath(),