update

LaoLittle · Jun 20, 2022 · 15989b1 · 15989b1
1 parent b032e32
commit 15989b1
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 49 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
-    val kotlinVersion = "1.6.21"
+    val kotlinVersion = "1.7.0"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
     id("net.mamoe.mirai-console") version "2.10.3"
 }
 
 group = "org.laolittle.plugin.draw"
-version = "1.2.2"
+version = "1.2.3"
 
 repositories {
     mavenCentral()
@@ -20,6 +20,24 @@ dependencies {
     val smVer = "1.0.8"
     compileOnly("com.github.LaoLittle:SkikoMirai:$smVer")
     testImplementation("com.github.LaoLittle:SkikoMirai:$smVer")
-    testImplementation("org.jetbrains.skiko:skiko-awt-runtime-linux-x64:0.7.18")
     testImplementation(kotlin("test"))
+
+    val osName = System.getProperty("os.name")
+    val targetOs = when {
+        osName == "Mac OS X" -> "macos"
+        osName.startsWith("Win") -> "windows"
+        osName.startsWith("Linux") -> "linux"
+        else -> error("Unsupported OS: $osName")
+    }
+
+    val targetArch = when (val osArch = System.getProperty("os.arch")) {
+        "x86_64", "amd64" -> "x64"
+        "aarch64" -> "arm64"
+        else -> error("Unsupported arch: $osArch")
+    }
+
+    val version = "0.7.22"
+    val target = "${targetOs}-${targetArch}"
+
+    testImplementation("org.jetbrains.skiko:skiko-awt-runtime-$target:$version")
 }
diff --git a/src/main/kotlin/DrawMeme.kt b/src/main/kotlin/DrawMeme.kt
@@ -15,6 +15,7 @@ import net.mamoe.mirai.utils.info
 import org.laolittle.plugin.draw.custom.initCustomMemes
 import org.laolittle.plugin.draw.extension.Emoji.EmojiUtil.fullEmojiRegex
 import org.laolittle.plugin.draw.extension.Emoji.EmojiUtil.toEmoji
+import org.laolittle.plugin.draw.extension.findUserOrNull
 import org.laolittle.plugin.draw.meme.*
 import org.laolittle.plugin.sendImage
 import org.laolittle.plugin.toExternalResource
@@ -24,7 +25,7 @@ object DrawMeme : KotlinPlugin(
     JvmPluginDescription(
         id = "org.laolittle.plugin.draw.DrawMeme",
         name = "DrawMeme",
-        version = "1.2.2",
+        version = "1.2.3",
     ) {
         author("LaoLittle")
 
@@ -67,8 +68,8 @@ object DrawMeme : KotlinPlugin(
                 val sp = msg.split("--")
                 val content = sp.first()
                 val filter = sp.getOrElse(1) { "" }
-                    blackWhite(content.trim(), image, filter).toExternalResource().use {
-                        subject.sendImage(it)
+                blackWhite(content.trim(), image, filter).toExternalResource().use {
+                    subject.sendImage(it)
                 }
             }
 
@@ -231,7 +232,11 @@ object DrawMeme : KotlinPlugin(
                 val y = getFloatOrNull(1) ?: (foo * .1f)
                 val i = getFloatOrNull(2) ?: 1f
 
-                subject.sendImage(marble(skImage, MarbleFilter(x,y,i)).use { bitmap -> SkImage.makeFromBitmap(bitmap) })
+                subject.sendImage(
+                    marble(
+                        skImage,
+                        MarbleFilter(x, y, i)
+                    ).use { bitmap -> SkImage.makeFromBitmap(bitmap) })
             }
 
             finding(emojiReg) {

diff --git a/src/main/kotlin/General.kt b/src/main/kotlin/General.kt
@@ -48,7 +48,8 @@ internal fun String.splitSpace(): List<String>? {
 }
 
 internal fun SkImage.Companion.makeFromResource(name: String) = makeFromEncoded(
-    DrawMeme::class.java.getResourceAsStream(name)?.readBytes() ?: throw IllegalStateException("无法找到资源文件: $name")
+    DrawMeme::class.java.getResourceAsStream(name)?.readBytes()
+        ?: throw IllegalStateException("无法找到资源文件: $name")
 )
 
 fun Rect.Companion.makeFromImage(image: SkImage) = Rect(0f, 0f, image.width.toFloat(), image.height.toFloat())
@@ -57,7 +58,7 @@ fun Path.toExternalResource(formatName: String? = null) = readBytes().toExternal
 
 internal suspend fun MessageEvent.getOrWaitImage(): ByteArray? {
     message.forEach { m ->
-        when(m) {
+        when (m) {
             is Image -> return httpClient.get(m.queryUrl())
             is At -> return httpClient.get(m.avatarUrl)
             is QuoteReply -> m.source.originalMessage.firstIsInstanceOrNull<Image>()?.let { img ->

diff --git a/src/main/kotlin/custom/DrawCustom.kt b/src/main/kotlin/custom/DrawCustom.kt
@@ -28,12 +28,12 @@ internal fun initCustomMemes() {
             startsWith("#${meme.name}") {
                 val avatars = arrayListOf<Deferred<Image>>()
                 message.forEach { m ->
-                   if (m is At) {
-                       avatars.add(DrawMeme.async {
-                           val id = m.target
-                           Image.makeFromEncoded(httpClient.get("https://q1.qlogo.cn/g?b=qq&nk=$id&s=640"))
-                       })
-                   }
+                    if (m is At) {
+                        avatars.add(DrawMeme.async {
+                            val id = m.target
+                            Image.makeFromEncoded(httpClient.get("https://q1.qlogo.cn/g?b=qq&nk=$id&s=640"))
+                        })
+                    }
                 }
 
                 meme.makeImage(*avatars.awaitAll().toTypedArray())

diff --git a/src/main/kotlin/extension/Match.kt b/src/main/kotlin/extension/Match.kt
@@ -1,4 +1,4 @@
-package org.laolittle.plugin.draw
+package org.laolittle.plugin.draw.extension
 
 import net.mamoe.mirai.contact.*
 import kotlin.math.max

diff --git a/src/main/kotlin/meme/BlackWhite.kt b/src/main/kotlin/meme/BlackWhite.kt
@@ -56,6 +56,7 @@ internal val customFilter by lazy {
 
                 ColorFilter.makeMatrix(ColorMatrix(*arr))
             }
+
             else -> {
                 DrawMeme.logger.error("Unknown Type: $type at $it")
                 return@m
@@ -68,13 +69,13 @@ internal val customFilter by lazy {
     customs
 }
 private val defaultFilter = ColorFilter.makeMatrix(
-        ColorMatrix(
-            0.33F, 0.38F, 0.29F, 0F, 0F,
-            0.33F, 0.38F, 0.29F, 0F, 0F,
-            0.33F, 0.38F, 0.29F, 0F, 0F,
-            0.33F, 0.38F, 0.29F, 1F, 0F,
-        )
+    ColorMatrix(
+        0.33F, 0.38F, 0.29F, 0F, 0F,
+        0.33F, 0.38F, 0.29F, 0F, 0F,
+        0.33F, 0.38F, 0.29F, 0F, 0F,
+        0.33F, 0.38F, 0.29F, 1F, 0F,
     )
+)
 
 private val paintFilter = Paint()
 

diff --git a/src/main/kotlin/meme/FlashImage.kt b/src/main/kotlin/meme/FlashImage.kt
@@ -13,7 +13,7 @@ fun flashImage(image: ByteArray): Image {
 
     val foo = min(w, h) * .30f
     val bar = foo * .5f
-    return Surface.makeRasterN32Premul(w,h).apply {
+    return Surface.makeRasterN32Premul(w, h).apply {
         writePixels(b, 0, 0)
         canvas.apply {
             drawPaint(Paint().apply {
@@ -23,12 +23,12 @@ fun flashImage(image: ByteArray): Image {
             translate(w * .5f - bar, h * .5f - bar)
 
             drawPath(Path().apply {
-                val x1 = foo *.65f
+                val x1 = foo * .65f
 
-                val p1 = Point(bar*.85f, bar*.85f)
-                val p4 = Point(bar*1.15f, bar*1.15f)
-                val p2 = Point(p4.x,p1.y)
-                val p3 = Point(p1.x,p4.y)
+                val p1 = Point(bar * .85f, bar * .85f)
+                val p4 = Point(bar * 1.15f, bar * 1.15f)
+                val p2 = Point(p4.x, p1.y)
+                val p3 = Point(p1.x, p4.y)
                 moveTo(x1, 0f)
                 lineTo(foo * .2f, p3.y)
                 lineTo(p3)

diff --git a/src/main/kotlin/meme/Message.kt b/src/main/kotlin/meme/Message.kt
@@ -163,6 +163,7 @@ class MessageImageNode(
                             drawImageRect(m.image, Rect.makeFromImage(m.image), Rect(0f, 0f, w, h))
                             translate(0f, 5f)
                         }
+
                         is Message.Plain -> {
                             m.content.paint(this, 0f, -10f)
                         }

diff --git a/src/main/kotlin/meme/Osu.kt b/src/main/kotlin/meme/Osu.kt
@@ -20,7 +20,7 @@ fun osu(text: String = "osu!"): Image {
 
     if (textWidth <= 250) {
         yPos = 137.5F + osuText.height / 2
-    }else {
+    } else {
         yPos = 210 - (textWidth - 255) / 20
         osuText = TextLine.make(text, font.makeWithSize(250F / textWidth * 112.5F))
     }

diff --git a/src/main/kotlin/meme/Utils.kt b/src/main/kotlin/meme/Utils.kt
@@ -23,7 +23,7 @@ fun Bitmap.mosaic(size: Int) {
     val h = height
 
     for (y in 0 until h step size) for (x in 0 until w step size) {
-        val color = getColor(x,y)
-        erase(color, IRect.makeXYWH(x,y,size,size))
+        val color = getColor(x, y)
+        erase(color, IRect.makeXYWH(x, y, size, size))
     }
 }
diff --git a/src/test/kotlin/Tests.kt b/src/test/kotlin/Tests.kt
@@ -53,7 +53,7 @@ class Tests {
         val image = Image.makeFromEncoded(Path("atri.jpg").readBytes())
 
         fun random(): Float {
-            return Random.nextDouble(-15.0,15.0).toFloat()
+            return Random.nextDouble(-15.0, 15.0).toFloat()
         }
 
         Surface.makeRaster(image.imageInfo).apply {
@@ -62,12 +62,14 @@ class Tests {
                 drawImage(image, 0f, 0f)
                 drawImage(image, random(), random(), Paint().apply {
                     alpha = 100
-                    colorFilter = ColorFilter.makeMatrix(ColorMatrix(
-                        1F,0F,0.2F,0.3F,0F,
-                        0F,0F,0F,0F,0F,
-                        0F,0F,0F,0F,0F,
-                        0F,0F,0F,1F,0F,
-                    ))
+                    colorFilter = ColorFilter.makeMatrix(
+                        ColorMatrix(
+                            1F, 0F, 0.2F, 0.3F, 0F,
+                            0F, 0F, 0F, 0F, 0F,
+                            0F, 0F, 0F, 0F, 0F,
+                            0F, 0F, 0F, 1F, 0F,
+                        )
+                    )
                 })
             }
         }.makeImageSnapshot().encodeToData()?.let {
@@ -83,13 +85,15 @@ class Tests {
 
             canvas.apply {
                 drawImage(image, 0f, 0f, Paint().apply {
-                    colorFilter = ColorFilter.makeMatrix(ColorMatrix(
-                      //R  G  B  A  ?
-                        1F,0F,0F,0F,0F,       // R
-                        0F,1F,0F,0F,0F,       // G
-                        0.5F,0.6F,1F,.3F,0F, // B
-                        0F,0F,0F,1F,0F,       // A
-                    ))
+                    colorFilter = ColorFilter.makeMatrix(
+                        ColorMatrix(
+                            //R  G  B  A  ?
+                            1F, 0F, 0F, 0F, 0F,       // R
+                            0F, 1F, 0F, 0F, 0F,       // G
+                            0.5F, 0.6F, 1F, .3F, 0F, // B
+                            0F, 0F, 0F, 1F, 0F,       // A
+                        )
+                    )
                 })
             }
         }.makeImageSnapshot().encodeToData()?.let {
@@ -105,18 +109,18 @@ class Tests {
         }
 
         recorder.recordingCanvas?.apply {
-            drawCircle(0f,0f,100f, Paint())
-            drawImage(image, 0f,0f)
+            drawCircle(0f, 0f, 100f, Paint())
+            drawImage(image, 0f, 0f)
 
         }
 
         val pic = recorder.finishRecordingAsPicture()
         pic.serializeToData().bytes.also(Path("pic.bin")::writeBytes)
 
         Surface.makeRaster(image.imageInfo).apply {
-            canvas.drawImage(image,0f,0f)
+            canvas.drawImage(image, 0f, 0f)
             canvas.drawPicture(pic)
-           // pic.playback(canvas)
+            // pic.playback(canvas)
         }.makeImageSnapshot().bytes.also(Path("outpic.png")::writeBytes)
     }