Skip to content

Commit 75a83f2

Browse files
committed
fix: resolve permission-granting conflict with LuckPerms
1 parent 015b1ee commit 75a83f2

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ Social preview的图片来自 [AliceSoft](https://www.alicesoft.com) 制作的
1212
在群内随机发送来自 [Lolicon API v2](https://api.lolicon.app/#/setu) 的图片(默认30s自动撤回+60s冷却),支持标签检索和JSON高级检索
1313
<br>
1414
适配 [mirai-console](https://github.com/mamoe/mirai-console)
15-
[![Version](https://img.shields.io/badge/version-2.7.1-blue)](https://github.com/mamoe/mirai/releases/tag/v2.7.1)
15+
[![Version](https://img.shields.io/badge/version-2.8.2-blue)](https://github.com/mamoe/mirai/releases/tag/v2.8.2)
1616
<br>
1717
使用文档已经移到了 [Wiki](https://github.com/Samarium150/mirai-console-lolicon/wiki) 页面

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ plugins {
55
kotlin("jvm") version kotlinVersion
66
kotlin("plugin.serialization") version kotlinVersion
77

8-
id("net.mamoe.mirai-console") version "2.7.1"
8+
id("net.mamoe.mirai-console") version "2.8.2"
99
id("org.jetbrains.dokka") version "1.5.0"
1010
id("com.geoffgranum.gradle-conventional-changelog") version "0.3.1"
1111
}
1212

1313
group = "com.github.samarium150"
14-
version = "4.1.2"
14+
version = "4.1.3"
1515

1616
repositories {
1717
mavenLocal()

src/main/kotlin/Main.kt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import java.net.Proxy
4141
object Main: KotlinPlugin(
4242
JvmPluginDescription(
4343
id = "com.github.samarium150.mirai-console-lolicon",
44-
version = "4.1.2",
44+
version = "4.1.3",
4545
name = "mirai-console-lolicon"
4646
)
4747
) {
@@ -101,7 +101,12 @@ object Main: KotlinPlugin(
101101
* <br>
102102
* 授予权限
103103
*/
104-
AbstractPermitteeId.AnyContact.permit(Lolicon.permission)
104+
try {
105+
AbstractPermitteeId.AnyContact.permit(Lolicon.permission)
106+
} catch (e: Exception) {
107+
logger.warning(e)
108+
logger.warning("无法自动授予权限,请自行使用权限管理来授予权限")
109+
}
105110

106111
logger.info("Plugin mirai-console-lolicon loaded")
107112
}
@@ -117,7 +122,12 @@ object Main: KotlinPlugin(
117122
* <br>
118123
* 撤销权限
119124
*/
120-
AbstractPermitteeId.AnyContact.cancel(Lolicon.permission, true)
125+
try {
126+
AbstractPermitteeId.AnyContact.cancel(Lolicon.permission, true)
127+
} catch (e: Exception) {
128+
logger.warning(e)
129+
logger.warning("无法自动撤销权限,请自行使用权限管理来撤销权限")
130+
}
121131

122132
/**
123133
* Unregister commands

0 commit comments

Comments
 (0)