shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 11:33:48 +08:00
Code Issues Projects Releases Wiki Activity
267 Commits 8 Branches 97 Tags
Commit Graph

267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
scjtqs
e2073f5371 Merge branch 'master-Mrs4s' into master 
* master-Mrs4s:
  feature: send netease with json
  fix: fit onebot
 2020-09-05 23:40:24 +08:00
scjtqs
b1fcfc6f97 添加 说明文档 2020-09-05 23:30:43 +08:00
scjtqs
6a14998928 添加 说明文档 2020-09-05 23:29:41 +08:00
scjtqs
24dad3d6f9 fix 2020-09-05 23:19:24 +08:00
scjtqs
5024cc08a7 暂存 2020-09-05 22:22:57 +08:00
Mrs4s
3c73769db3
Merge pull request #243 from wdvxdr1123/master 
send netease music with json
 2020-09-05 22:08:32 +08:00
wdvxdr
d79cb0b536 feature: send netease with json 2020-09-05 18:49:32 +08:00
wdvxdr
2b00b49755 fix: fit onebot 
适配onebot标准
 2020-09-05 17:47:30 +08:00
wdvxdr1123
a77977b12e
Merge pull request #7 from Mrs4s/master 
2
 2020-09-05 11:17:26 +08:00
Mrs4s
6565a19aaa fix #238. 2020-09-05 08:16:50 +08:00
Mrs4s
a9001d5c9e fix ci. 2020-09-05 08:10:45 +08:00
Mrs4s
a991add799 update default heartbeat value. close #232 2020-09-05 08:09:07 +08:00
Mrs4s
42434956d9 fix light app. 2020-09-05 08:06:52 +08:00
Mrs4s
49e3995129 move reply pos. close #220 2020-09-05 08:02:31 +08:00
wdvxdr1123
8c1770318c
Merge pull request #6 from Mrs4s/master 
1
 2020-09-03 22:57:01 +08:00
Mrs4s
7d3265b6d4
Merge pull request #221 from scjtqs/master 
初步支持 `[CQ:json]` .
 2020-09-03 22:05:05 +08:00
scjtqs
4c65859608 Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp 
# Conflicts:
#	coolq/cqcode.go
 2020-09-03 20:31:53 +08:00
Mrs4s
0100b85fb1 update qq music content. 2020-09-03 18:05:31 +08:00
scjtqs
3bd557d7a0 fmt 2020-09-03 00:37:57 +08:00
scjtqs
05d8e773f2 配合 最新的MiraiGo调整代码 2020-09-03 00:34:20 +08:00
scjtqs
b2f46b4bbe Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp into master 2020-09-03 00:09:14 +08:00
Mrs4s
9fa1b7727e
Merge pull request #235 from wdvxdr1123/master 
feature [cq:music] send qqmusic share with json
 2020-09-02 23:18:29 +08:00
wdvxdr
9e43d9c2bb change into NewLightApp 2020-09-02 22:52:57 +08:00
wdvxdr
ad5e87c4c7 Revert "Auto stash before merge of "master" and "origin/master"" 
This reverts commit ff8fd92a26ef86f005781038d55023bcacda1ae7.
 2020-09-02 22:50:01 +08:00
wdvxdr
ff8fd92a26 Auto stash before merge of "master" and "origin/master" 2020-09-02 22:45:17 +08:00
wdvxdr1123
0f96950757
Merge branch 'master' into master 2020-09-02 22:39:17 +08:00
wdvxdr
993f05bfa6 feature [cq:music] send qqmusic share with json 
用json代替qq音乐的分享
 2020-09-02 22:26:56 +08:00
Mrs4s
d309a10fba
Merge pull request #229 from rMuchan/master 
反向WS连接时发送connect元事件
 2020-09-02 15:26:24 +08:00
Muchan
755949fb33 反向WS连接时发送connect元事件 2020-09-02 14:22:56 +08:00
Mrs4s
7f103a7f9a
Merge pull request #227 from shitianshiwa/master 
补充关于“是否强制分片发送群长消息”开关说明
 2020-09-01 22:34:05 +08:00
是甜食哇
f487d12b83
Update config.md 2020-09-01 21:12:45 +09:00
是甜食哇
df1cb3de87
Merge pull request #1 from Mrs4s/master 
跟进
 2020-09-01 20:55:33 +09:00
Mrs4s
7d62db2ec0
Merge pull request #223 from F0ur/master 
feat(api): make json response [] instead of null(empty list)
 2020-08-31 23:46:27 +08:00
F0ur
9b5358351f feat(api): make GetFriendList/GetGroupList/GetGroupMemberList/GetForwardMessage json response data as [] instead of null 2020-08-31 22:58:03 +08:00
scjtqs
a048353067 json cq 码 添加 说明 2020-08-31 00:45:36 +08:00
scjtqs
a455aeea39 去掉不需要的方法 2020-08-31 00:36:42 +08:00
scjtqs
710a8588b7 cq:json 消息的初步支持 2020-08-31 00:34:38 +08:00
scjtqs
d25674a9ef json 初步支持 2020-08-30 03:00:18 +08:00
scjtqs
0133944c0b Merge remote-tracking branch 'upstream/master' into master 
# Conflicts:
#	global/net.go
 2020-08-30 02:43:26 +08:00
scjtqs
bcdbefb355 go fmt 2020-08-30 02:29:29 +08:00
scjtqs
fc18b84d4b 添加 [CQ:json,data={json代码}]的支持 2020-08-30 02:28:01 +08:00
Mrs4s
e55b7d846f
Merge pull request #219 from Ink-33/master 
Fix #218
 2020-08-29 22:30:48 +08:00
Ink-33
1f7c4cab50
Update 2020-08-29 22:24:53 +08:00
Ink-33
d35ad66adf
拒绝空Token 2020-08-29 20:24:11 +08:00
Ink-33
047b5208f4
Builder更换为1.14.7 2020-08-29 17:55:08 +08:00
Ink-33
804bd9a711
升级依赖 2020-08-29 17:54:39 +08:00
Ink-33
f569225305
加载配置失败后备份源配置文件 
配置结构升级不备份，我配置没了
 2020-08-29 17:49:40 +08:00
Ink-33
9c65ff4dcd
尝试修复正向WebSocket下的鉴权panic 2020-08-29 17:24:09 +08:00
Ink-33
d0398f30c6
Revert "Update websocket.go" 
This reverts commit 33120b249625061f15c19b601f43436bd72662d7.

revert
 2020-08-29 17:06:25 +08:00
Ink33
517e2ea3d4
Merge pull request #1 from Ink-33/patch-1 
Update websocket.go
 2020-08-29 16:46:14 +08:00