Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
cfd5b2e8
Commit
cfd5b2e8
authored
Oct 21, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Image uploading is now available
parent
d6201a14
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BufferedImageJvm.kt
.../jvmMain/kotlin/net/mamoe/mirai/utils/BufferedImageJvm.kt
+1
-1
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/PlatformUtilsJvm.kt
.../jvmMain/kotlin/net/mamoe/mirai/utils/PlatformUtilsJvm.kt
+1
-1
mirai-core/src/jvmTest/kotlin/TestGroupImage.kt
mirai-core/src/jvmTest/kotlin/TestGroupImage.kt
+1
-1
mirai-demos/mirai-demo-1/src/main/java/demo1/Main.kt
mirai-demos/mirai-demo-1/src/main/java/demo1/Main.kt
+2
-2
No files found.
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BufferedImageJvm.kt
View file @
cfd5b2e8
...
@@ -10,7 +10,7 @@ import java.security.MessageDigest
...
@@ -10,7 +10,7 @@ import java.security.MessageDigest
import
javax.imageio.ImageIO
import
javax.imageio.ImageIO
import
java.awt.image.BufferedImage
as
JavaBufferedImage
import
java.awt.image.BufferedImage
as
JavaBufferedImage
fun
JavaBufferedImage
.
toMiraiImage
(
formatName
:
String
=
"
png
"
):
BufferedImage
{
fun
JavaBufferedImage
.
toMiraiImage
(
formatName
:
String
=
"
gif
"
):
BufferedImage
{
val
digest
=
MessageDigest
.
getInstance
(
"md5"
)
val
digest
=
MessageDigest
.
getInstance
(
"md5"
)
digest
.
reset
()
digest
.
reset
()
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/PlatformUtilsJvm.kt
View file @
cfd5b2e8
...
@@ -72,7 +72,7 @@ private suspend fun Connection.postImage(image: ByteReadPacket): Boolean = this
...
@@ -72,7 +72,7 @@ private suspend fun Connection.postImage(image: ByteReadPacket): Boolean = this
.
requestBody
(
String
(
image
.
readBytes
(),
Charsets
.
ISO_8859_1
))
.
requestBody
(
String
(
image
.
readBytes
(),
Charsets
.
ISO_8859_1
))
.
method
(
Connection
.
Method
.
POST
)
.
method
(
Connection
.
Method
.
POST
)
.
postDataCharset
(
"ISO_8859_1"
)
.
postDataCharset
(
"ISO_8859_1"
)
.
header
(
"Content-type"
,
"image/
png
"
)
.
header
(
"Content-type"
,
"image/
gif
"
)
.
ignoreContentType
(
true
)
.
ignoreContentType
(
true
)
.
suspendExecute
()
.
suspendExecute
()
.
statusCode
()
==
200
.
statusCode
()
==
200
...
...
mirai-core/src/jvmTest/kotlin/TestGroupImage.kt
View file @
cfd5b2e8
...
@@ -11,7 +11,7 @@ import javax.imageio.ImageIO
...
@@ -11,7 +11,7 @@ import javax.imageio.ImageIO
val
sessionKey
:
ByteArray
=
"F1 ED F2 BC 55 17 7B FE CC CC F3 08 D1 8D A7 0E"
.
hexToBytes
()
val
sessionKey
:
ByteArray
=
"F1 ED F2 BC 55 17 7B FE CC CC F3 08 D1 8D A7 0E"
.
hexToBytes
()
fun
main
()
=
println
({
fun
main
()
=
println
({
val
image
=
ImageIO
.
read
(
File
(
"C:\\Users\\Him18\\Desktop\\test2.
png
"
).
readBytes
().
inputStream
()).
toMiraiImage
(
"png"
)
val
image
=
ImageIO
.
read
(
File
(
"C:\\Users\\Him18\\Desktop\\test2.
gif
"
).
readBytes
().
inputStream
()).
toMiraiImage
(
"png"
)
// File("C:\\Users\\Him18\\Desktop\\test2.jpg").writeBytes(image.fileData.readBytes())
// File("C:\\Users\\Him18\\Desktop\\test2.jpg").writeBytes(image.fileData.readBytes())
GroupImageIdRequestPacket
(
GroupImageIdRequestPacket
(
...
...
mirai-demos/mirai-demo-1/src/main/java/demo1/Main.kt
View file @
cfd5b2e8
...
@@ -87,14 +87,14 @@ suspend fun main() {
...
@@ -87,14 +87,14 @@ suspend fun main() {
"上传好友图片"
in
it
.
message
->
withTimeoutOrNull
(
5000
)
{
"上传好友图片"
in
it
.
message
->
withTimeoutOrNull
(
5000
)
{
val
id
=
QQ
(
bot
,
1040400290
u
)
val
id
=
QQ
(
bot
,
1040400290
u
)
.
uploadImage
(
withContext
(
Dispatchers
.
IO
)
{
ImageIO
.
read
(
File
(
"C:\\Users\\Him18\\Desktop\\${it.message.toString().substringAfter("
上传好友图片
")}"
).
readBytes
().
inputStream
())
}.
toMiraiImage
(
"png
"
))
.
uploadImage
(
withContext
(
Dispatchers
.
IO
)
{
ImageIO
.
read
(
File
(
"C:\\Users\\Him18\\Desktop\\${it.message.toString().substringAfter("
上传好友图片
")}"
).
inputStream
())
}.
toMiraiImage
(
"gif
"
))
it
.
reply
(
id
.
value
)
it
.
reply
(
id
.
value
)
delay
(
1000
)
delay
(
1000
)
it
.
reply
(
Image
(
id
))
it
.
reply
(
Image
(
id
))
}
}
"上传群图片"
in
it
.
message
->
withTimeoutOrNull
(
5000
)
{
"上传群图片"
in
it
.
message
->
withTimeoutOrNull
(
5000
)
{
val
image
=
withContext
(
Dispatchers
.
IO
)
{
ImageIO
.
read
(
File
(
"C:\\Users\\Him18\\Desktop\\${it.message.toString().substringAfter("
上传群图片
")}"
).
readBytes
().
inputStream
())
}.
toMiraiImage
(
"png
"
)
val
image
=
withContext
(
Dispatchers
.
IO
)
{
ImageIO
.
read
(
File
(
"C:\\Users\\Him18\\Desktop\\${it.message.toString().substringAfter("
上传群图片
")}"
).
inputStream
())
}.
toMiraiImage
(
"gif
"
)
Group
(
bot
,
580266363
u
).
uploadImage
(
image
)
Group
(
bot
,
580266363
u
).
uploadImage
(
image
)
it
.
reply
(
image
.
groupImageId
.
value
)
it
.
reply
(
image
.
groupImageId
.
value
)
delay
(
1000
)
delay
(
1000
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment