build: 1.2.0

cssxsh · Mar 17, 2023 · 1cb9952 · 1cb9952
1 parent 411674c
commit 1cb9952
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,33 @@
+name: "build"
+on:
+  push:
+    paths-ignore:
+      - '**/*.md'
+  pull_request:
+    paths-ignore:
+      - '**/*.md'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+
+      - name: chmod -R 777 *
+        run: chmod -R 777 *
+
+      - name: Build Plugin
+        run: ./gradlew buildPlugin
+
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-${{ github.run_id }}
+          path: build/mirai/*
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,12 +2,12 @@ plugins {
     kotlin("jvm") version "1.7.22"
     kotlin("plugin.serialization") version "1.7.22"
 
-    id("net.mamoe.mirai-console") version "2.14.0-RC"
+    id("net.mamoe.mirai-console") version "2.14.0"
     id("me.him188.maven-central-publish") version "1.0.0-dev-3"
 }
 
 group = "xyz.cssxsh"
-version = "1.1.7"
+version = "1.2.0"
 
 repositories {
     mavenLocal()
@@ -28,18 +28,17 @@ mavenCentralPublish {
 dependencies {
     compileOnly("xyz.cssxsh:bilibili-helper:1.6.6")
     compileOnly("xyz.cssxsh:weibo-helper:1.5.8")
-    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.5.2")
-    compileOnly("xyz.cssxsh.mirai:mirai-skia-plugin:1.2.4")
+    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.7.1")
+    compileOnly("xyz.cssxsh.mirai:mirai-skia-plugin:1.3.0")
     testImplementation(kotlin("test"))
-    testImplementation("xyz.cssxsh.mirai:mirai-skia-plugin:1.2.4")
     //
-    implementation(platform("net.mamoe:mirai-bom:2.14.0-RC"))
+    implementation(platform("net.mamoe:mirai-bom:2.14.0"))
     compileOnly("net.mamoe:mirai-core")
     compileOnly("net.mamoe:mirai-core-utils")
     compileOnly("net.mamoe:mirai-console-compiler-common")
     testImplementation("net.mamoe:mirai-core-utils")
     //
-    implementation(platform("io.ktor:ktor-bom:2.2.2"))
+    implementation(platform("io.ktor:ktor-bom:2.2.3"))
     implementation("io.ktor:ktor-client-okhttp")
     implementation("io.ktor:ktor-client-encoding")
     //

diff --git a/src/main/kotlin/MemeHelperPlugin.kt b/src/main/kotlin/MemeHelperPlugin.kt
@@ -12,7 +12,7 @@ public object MemeHelperPlugin : KotlinPlugin(
     JvmPluginDescription(
         id = "xyz.cssxsh.mirai.plugin.meme-helper",
         name = "meme-helper",
-        version = "1.1.7",
+        version = "1.2.0",
     ) {
         author("cssxsh")
         dependsOn("xyz.cssxsh.mirai.plugin.mirai-skia-plugin", ">= 1.1.0", false)

diff --git a/src/main/kotlin/face/ItemInfo.kt b/src/main/kotlin/face/ItemInfo.kt
@@ -2,6 +2,9 @@ package xyz.cssxsh.mirai.meme.face
 
 import kotlinx.serialization.*
 
+/**
+ * @property appId 1. 表情
+ */
 @Serializable
 public data class ItemInfo(
     @SerialName("appid")

diff --git a/src/main/kotlin/face/MarketFaceHelper.kt b/src/main/kotlin/face/MarketFaceHelper.kt
@@ -244,7 +244,7 @@ public object MarketFaceHelper {
             val delegate = ImMsgBody.MarketFace(
                 faceName = "[${image.name}]".toByteArray(),
                 itemType = 6,
-                faceInfo = data.feeType.toInt(),
+                faceInfo = data.feeType,
                 faceId = image.id.hexToBytes(),
                 tabId = data.id.toInt(),
                 subType = data.type,