Shamrock: fix #258

Signed-off-by: 白池 <[email protected]>
whitechi73 · Feb 26, 2024 · a9a2e9a · a9a2e9a
1 parent 964c55d
commit a9a2e9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/OtherAction.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/OtherAction.kt
@@ -92,9 +92,10 @@ fun Routing.otherAction() {
  val url = fetchOrNull("url")
  val b64 = fetchOrNull("base64")
  val name = fetchOrNull("name")
+ val root = fetchOrNull("root")
  val threadCnt = fetchOrNull("thread_cnt")?.toInt() ?: 0
  val headers = fetchOrNull("headers") ?: ""
- call.respondText(DownloadFile(url, b64, threadCnt, headers.split("\r\n"), name), ContentType.Application.Json)
+ call.respondText(DownloadFile(url, b64, threadCnt, headers.split("\r\n"), name, root), ContentType.Application.Json)
  }
 
  post("/upload_file") {

diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt
@@ -357,6 +357,8 @@ internal object GlobalEventTransmitter: BaseSvc() {
  type = NoticeType.GroupAdminChange,
  subType = if (setAdmin) NoticeSubType.Set else NoticeSubType.UnSet,
  operatorId = 0,
+ userId = target,
+ userUid = targetUid,
  target = target,
  targetUid = targetUid,
  groupId = groupCode

diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/NoticeEvent.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/NoticeEvent.kt
@@ -32,7 +32,7 @@ internal enum class NoticeSubType {
  @SerialName("lift_ban") LiftBan,
 
  @SerialName("set") Set,
- @SerialName("un_set") UnSet,
+ @SerialName("unset") UnSet,
 
  @SerialName("add") Add,
  @SerialName("invite") Invite,