remove repeat code

jianmj · Dec 5, 2023 · e43ec2f · e43ec2f
1 parent 1d5440f
commit e43ec2f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/FriendWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/FriendWrapper.kt
@@ -89,14 +89,14 @@ class FriendWrapper(
     }
 
     override suspend fun uploadImage(resource: ExternalResource): Image {
-        return Image.fromId(FileService.instance!!.upload(resource))
+        return OnebotMessages.imageFromFile(FileService.instance!!.upload(resource))
     }
 
     override suspend fun uploadShortVideo(
         thumbnail: ExternalResource,
         video: ExternalResource,
         fileName: String?
     ): ShortVideo {
-        return WrappedVideo(FileService.instance!!.upload(video))
+        return OnebotMessages.videoFromFile(FileService.instance!!.upload(video))
     }
 }
diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/GroupWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/GroupWrapper.kt
@@ -199,15 +199,15 @@ class GroupWrapper(
     }
 
     override suspend fun uploadImage(resource: ExternalResource): Image {
-        return Image.fromId(FileService.instance!!.upload(resource))
+        return OnebotMessages.imageFromFile(FileService.instance!!.upload(resource))
     }
 
     override suspend fun uploadShortVideo(
         thumbnail: ExternalResource,
         video: ExternalResource,
         fileName: String?
     ): ShortVideo {
-        return WrappedVideo(FileService.instance!!.upload(video))
+        return OnebotMessages.videoFromFile(FileService.instance!!.upload(video))
     }
 
     @Suppress("DEPRECATION_ERROR")

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/MemberWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/MemberWrapper.kt
@@ -133,14 +133,14 @@ class MemberWrapper(
     }
 
     override suspend fun uploadImage(resource: ExternalResource): Image {
-        return Image.fromId(FileService.instance!!.upload(resource))
+        return OnebotMessages.imageFromFile(FileService.instance!!.upload(resource))
     }
 
     override suspend fun uploadShortVideo(
         thumbnail: ExternalResource,
         video: ExternalResource,
         fileName: String?
     ): ShortVideo {
-        return WrappedVideo(FileService.instance!!.upload(video))
+        return OnebotMessages.videoFromFile(FileService.instance!!.upload(video))
     }
 }
diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/OtherClientWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/OtherClientWrapper.kt
@@ -8,6 +8,7 @@ import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.message.data.*
 import net.mamoe.mirai.utils.ExternalResource
 import net.mamoe.mirai.utils.MiraiInternalApi
+import top.mrxiaom.overflow.internal.message.OnebotMessages
 import top.mrxiaom.overflow.internal.message.data.WrappedVideo
 import top.mrxiaom.overflow.spi.FileService
 import kotlin.coroutines.CoroutineContext
@@ -31,7 +32,7 @@ class OtherClientWrapper(
         video: ExternalResource,
         fileName: String?
     ): ShortVideo {
-        return WrappedVideo(FileService.instance!!.upload(video))
+        return OnebotMessages.videoFromFile(FileService.instance!!.upload(video))
     }
 
 }
diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/StrangerWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/StrangerWrapper.kt
@@ -75,14 +75,14 @@ class StrangerWrapper(
     }
 
     override suspend fun uploadImage(resource: ExternalResource): Image {
-        return Image.fromId(FileService.instance!!.upload(resource))
+        return OnebotMessages.imageFromFile(FileService.instance!!.upload(resource))
     }
 
     override suspend fun uploadShortVideo(
         thumbnail: ExternalResource,
         video: ExternalResource,
         fileName: String?
     ): ShortVideo {
-        return WrappedVideo(FileService.instance!!.upload(video))
+        return OnebotMessages.videoFromFile(FileService.instance!!.upload(video))
     }
 }