Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: yyuueexxiinngg/onebot-kotlin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.2.1
Choose a base ref
...
head repository: yyuueexxiinngg/onebot-kotlin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 4,555 additions and 2,517 deletions.
  1. +10 −0 .github/ISSUE_TEMPLATE/-------.md
  2. +10 −0 .github/ISSUE_TEMPLATE/-----.md
  3. +43 −0 .github/ISSUE_TEMPLATE/bug--.md
  4. +15 −4 .github/workflows/gradle-ci.yml
  5. +46 −0 .gitignore
  6. +322 −0 CHANGELOG.md
  7. +165 −126 README.md
  8. +14 −93 build.gradle.kts
  9. +7 −0 buildSrc/build.gradle.kts
  10. +43 −0 buildSrc/src/main/kotlin/Versions.kt
  11. +1 −6 gradle.properties
  12. BIN gradle/wrapper/gradle-wrapper.jar
  13. +5 −0 gradle/wrapper/gradle-wrapper.properties
  14. +47 −0 onebot-kotlin/build.gradle.kts
  15. +101 −0 onebot-kotlin/src/main/kotlin/com/github/yyuueexxiinngg/onebot/Main.kt
  16. +113 −0 onebot-mirai/build.gradle.kts
  17. +826 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/MiraiApi.kt
  18. +252 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/PluginBase.kt
  19. +74 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/PluginSettings.kt
  20. +138 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/Session.kt
  21. +181 −24 ...mirai → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/data/common/BotEventDTO.kt
  22. +23 −14 .../mirai → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/data/common/ContactDTO.kt
  23. +1 −1 .../mihoyo/mirai → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/data/common/DTO.kt
  24. +83 −61 .../mirai → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/data/common/MessageDTO.kt
  25. +380 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/data/common/ResponseDTO.kt
  26. +232 −97 ...oyo/mirai → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/util/CQMessgeParser.kt
  27. +37 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/util/DatabaseUtils.kt
  28. +221 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/util/EventFilter.kt
  29. +110 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/util/HttpClient.kt
  30. +49 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/util/Json.kt
  31. +72 −25 .../tech/mihoyo/mirai → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/util/Music.kt
  32. +15 −10 .../mirai → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/util/RichMessageHelper.kt
  33. +5 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/util/TimeUtils.kt
  34. +13 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/web/HeartbeatScope.kt
  35. +111 −72 .../mirai → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/web/http/HttpApiModule.kt
  36. +38 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/web/http/HttpApiServer.kt
  37. +195 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/web/http/ReportService.kt
  38. +6 −1 ...i → onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/web/queue/CacheRequestQueue.kt
  39. +30 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/web/queue/CacheSourceQueue.kt
  40. +13 −16 ... onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot}/web/websocket/WebsocketActions.kt
  41. +313 −0 ...ot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/web/websocket/WebsocketReverseClient.kt
  42. +178 −0 onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/web/websocket/WebsocketServer.kt
  43. +13 −0 onebot-mirai/src/test/kotlin/mirai/RunMirai.kt
  44. +4 −1 settings.gradle.kts
  45. +0 −499 src/main/kotlin/tech/mihoyo/mirai/MiraiApi.kt
  46. +0 −133 src/main/kotlin/tech/mihoyo/mirai/PluginBase.kt
  47. +0 −150 src/main/kotlin/tech/mihoyo/mirai/data/common/ResponseDTO.kt
  48. +0 −36 src/main/kotlin/tech/mihoyo/mirai/util/FaceMap.kt
  49. +0 −20 src/main/kotlin/tech/mihoyo/mirai/util/HttpClient.kt
  50. +0 −115 src/main/kotlin/tech/mihoyo/mirai/util/ImgUtil.kt
  51. +0 −63 src/main/kotlin/tech/mihoyo/mirai/util/Json.kt
  52. +0 −49 src/main/kotlin/tech/mihoyo/mirai/util/Logger.kt
  53. +0 −28 src/main/kotlin/tech/mihoyo/mirai/util/PokeMap.kt
  54. +0 −38 src/main/kotlin/tech/mihoyo/mirai/web/HttpApiService.kt
  55. +0 −29 src/main/kotlin/tech/mihoyo/mirai/web/HttpApiServices.kt
  56. +0 −72 src/main/kotlin/tech/mihoyo/mirai/web/Session.kt
  57. +0 −44 src/main/kotlin/tech/mihoyo/mirai/web/http/HttpApiServer.kt
  58. +0 −13 src/main/kotlin/tech/mihoyo/mirai/web/http/HttpApiServerConfig.kt
  59. +0 −33 src/main/kotlin/tech/mihoyo/mirai/web/http/ReportConfig.kt
  60. +0 −155 src/main/kotlin/tech/mihoyo/mirai/web/http/ReportService.kt
  61. +0 −29 src/main/kotlin/tech/mihoyo/mirai/web/queue/CacheSourceQueue.kt
  62. +0 −221 src/main/kotlin/tech/mihoyo/mirai/web/websocket/WebsocketReverseClient.kt
  63. +0 −56 src/main/kotlin/tech/mihoyo/mirai/web/websocket/WebsocketReverseClientConfig.kt
  64. +0 −145 src/main/kotlin/tech/mihoyo/mirai/web/websocket/WebsocketServer.kt
  65. +0 −15 src/main/kotlin/tech/mihoyo/mirai/web/websocket/WebsocketServerConfig.kt
  66. +0 −7 src/main/resources/plugin.yml
  67. +0 −16 src/test/kotlin/mirai/RunMirai.kt
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/-------.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: 疑问 / 帮助
about: 询问一个问题
title: "[Question]"
labels: ''
assignees: ''

---


10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/-----.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: 新特性申请
about: 请求添加一个功能
title: "[Feature]"
labels: ''
assignees: ''

---


43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/bug--.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
name: BUG反馈
about: 提交一个 bug
title: "[BUG]"
labels: ''
assignees: ''

---
<!--注意, 如果是`mirai`框架本身的问题, 将会被打上`mirai`的Issue标签并关闭, 请尝试在`mirai`官方仓库提交Issue-->
<!--在下面空白处简略描述你遇到的问题-->




<!--如果有控制台报错,请尽量在下面空白处附加全面的日志. (不建议截图)-->
```
```


#### 复现
<!--在这里简略说明如何让这个问题再次发生-->
<!--可使用 1. 2. 3. 的列表格式,或其他任意恰当的格式-->




#### 版本
onebot-` `- ` ` <!--在``中填写你正在使用的版本,如`kotlin`-`0.3.0`-->

<!--如使用Actions中下载的版本, 请在下方填写插件Commit版本-->


<!--如使用onebot-kotlin (Embedded)版本, 以下版本信息可不填-->
mirai-core-` `

mirai-console-` `



<!--如有必要,你可以在下文继续添加其他信息-->
19 changes: 15 additions & 4 deletions .github/workflows/gradle-ci.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,13 @@ name: Gradle CI

on:
push:
branches: [ master, embedded ]
branches: [ master, dev ]
paths-ignore:
- '**.md'
pull_request:
branches: [ master, embedded ]
branches: [ master, dev ]
paths-ignore:
- '**.md'

jobs:
build:
@@ -31,7 +35,14 @@ jobs:
gradle wrapper
bash gradlew shadow
- name: Upload articact
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
path: build/libs
name: onebot-mirai
path: onebot-mirai/build/libs/onebot-mirai-*-all.jar

- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: onebot-kotlin
path: onebot-kotlin/build/libs/onebot-kotlin-*-all.jar
46 changes: 46 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/test
/.idea

# Created by .ignore support plugin (hsz.mobi)
### Kotlin template
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

### Gradle template
.gradle
**/build/
!src/**/build/

# Ignore Gradle GUI config
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

# Cache of project
.gradletasknamecache

# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties

Loading