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
ed467809
Commit
ed467809
authored
Mar 24, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clear all deprecated functions which are for binary compatibility
parent
c6a72ba6
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
7 additions
and
186 deletions
+7
-186
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
...ommonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
+0
-20
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
...mmonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
+0
-7
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt
+0
-22
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt
...src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt
+0
-5
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt
...e/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt
+0
-5
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt
.../src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt
+4
-5
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt
...core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt
+0
-5
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
+0
-21
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotImpl.kt
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotImpl.kt
+1
-0
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt
.../src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt
+0
-4
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt
.../commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt
+0
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
...re/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
+0
-5
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
...e/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
+0
-6
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt
...-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt
+0
-5
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/internal/InternalEventListeners.kt
.../net.mamoe.mirai/event/internal/InternalEventListeners.kt
+0
-17
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt
...c/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt
+0
-4
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/RichMessage.kt
...onMain/kotlin/net.mamoe.mirai/message/data/RichMessage.kt
+1
-10
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt
+0
-22
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt
...ore/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt
+1
-6
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt
...-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt
+0
-5
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt
...core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt
+0
-5
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt
+0
-5
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
View file @
ed467809
...
...
@@ -38,7 +38,6 @@ import net.mamoe.mirai.utils.io.toUHexString
import
kotlin.contracts.ExperimentalContracts
import
kotlin.contracts.contract
import
kotlin.coroutines.CoroutineContext
import
kotlin.jvm.JvmName
import
kotlin.jvm.JvmSynthetic
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.FriendInfo
as
JceFriendInfo
...
...
@@ -81,12 +80,6 @@ internal class QQImpl(
return
MessageReceipt
(
source
,
this
,
null
)
}
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
QQ
>
{
return
this
.
sendMessage
(
message
as
Message
)
}
@JvmSynthetic
@OptIn
(
MiraiInternalAPI
::
class
)
override
suspend
fun
uploadImage
(
image
:
ExternalImage
):
OfflineFriendImage
=
try
{
...
...
@@ -241,12 +234,6 @@ internal class MemberImpl(
return
MessageReceipt
(
source
,
this
,
null
)
}
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
QQ
>
{
return
this
.
sendMessage
(
message
as
Message
)
}
@JvmSynthetic
override
suspend
fun
uploadImage
(
image
:
ExternalImage
):
OfflineFriendImage
=
qq
.
uploadImage
(
image
)
// endregion
...
...
@@ -647,13 +634,6 @@ internal class GroupImpl(
return
MessageReceipt
(
source
,
this
,
botAsMember
)
}
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
Group
>
{
return
this
.
sendMessage
(
message
as
Message
)
}
@JvmSynthetic
override
suspend
fun
uploadImage
(
image
:
ExternalImage
):
OfflineGroupImage
=
try
{
if
(
BeforeImageUploadEvent
(
this
,
image
).
broadcast
().
isCancelled
)
{
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
View file @
ed467809
...
...
@@ -69,13 +69,6 @@ internal abstract class QQAndroidBotBase constructor(
val
json
=
Json
(
JsonConfiguration
(
ignoreUnknownKeys
=
true
,
encodeDefaults
=
true
))
}
@Deprecated
(
"use friends instead"
,
level
=
DeprecationLevel
.
ERROR
,
replaceWith
=
ReplaceWith
(
"this.friends"
)
)
override
val
qqs
:
ContactList
<
QQ
>
get
()
=
friends
override
val
friends
:
ContactList
<
QQ
>
=
ContactList
(
LockFreeLinkedList
())
override
val
selfQQ
:
QQ
by
lazy
{
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/Bot.kt
View file @
ed467809
...
...
@@ -77,33 +77,11 @@ actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIA
actual
abstract
val
selfQQ
:
QQ
/**
* 机器人的好友列表. 它将与服务器同步更新
*/
@Deprecated
(
"use friends instead"
,
level
=
DeprecationLevel
.
ERROR
,
replaceWith
=
ReplaceWith
(
"this.friends"
)
)
actual
abstract
val
qqs
:
ContactList
<
QQ
>
/**
* 机器人的好友列表. 它将与服务器同步更新
*/
actual
abstract
val
friends
:
ContactList
<
QQ
>
/**
* 获取一个好友或一个群.
*/
@Deprecated
(
"use getFriend or getGroup instead"
,
level
=
DeprecationLevel
.
ERROR
,
replaceWith
=
ReplaceWith
(
"this.qqs.getOrNull(id) ?: this.groups.getOrNull(id) ?: throw NoSuchElementException(\"contact id \$id\")"
)
)
actual
operator
fun
get
(
id
:
Long
):
Contact
{
return
this
.
friends
.
getOrNull
(
id
)
?:
this
.
groups
.
getOrNull
(
id
)
?:
throw
NoSuchElementException
(
"contact id $id"
)
}
/**
* 判断是否有这个 id 的好友或群.
* 在一些情况下这可能会造成歧义. 请考虑后使用.
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt
View file @
ed467809
...
...
@@ -19,7 +19,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.OfflineImage
import
net.mamoe.mirai.message.data.id
import
net.mamoe.mirai.utils.ExternalImage
...
...
@@ -66,10 +65,6 @@ actual abstract class Contact : CoroutineScope, ContactJavaHappyAPI() {
@JvmSynthetic
actual
abstract
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
out
Contact
>
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
actual
abstract
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
Contact
>
/**
* 上传一个图片以备发送.
*
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt
View file @
ed467809
...
...
@@ -17,7 +17,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.OfflineGroupImage
import
net.mamoe.mirai.utils.ExternalImage
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
...
...
@@ -181,10 +180,6 @@ actual abstract class Group : Contact(), CoroutineScope {
@JvmSynthetic
actual
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
Group
>
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
@JvmSynthetic
actual
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
Group
>
/**
* 上传一个图片以备发送.
*
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Member.kt
View file @
ed467809
...
...
@@ -18,7 +18,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.WeakRefProperty
...
...
@@ -33,12 +32,14 @@ actual abstract class Member : MemberJavaHappyAPI() {
*/
@WeakRefProperty
actual
abstract
val
group
:
Group
/**
* 成员的权限, 动态更新.
*
* @see MemberPermissionChangeEvent 权限变更事件. 由群主或机器人的操作触发.
*/
actual
abstract
val
permission
:
MemberPermission
/**
* 群名片. 可能为空.
*
...
...
@@ -52,6 +53,7 @@ actual abstract class Member : MemberJavaHappyAPI() {
* @throws PermissionDeniedException 无权限修改时
*/
actual
abstract
var
nameCard
:
String
/**
* 群头衔.
*
...
...
@@ -63,6 +65,7 @@ actual abstract class Member : MemberJavaHappyAPI() {
* @throws PermissionDeniedException 无权限修改时
*/
actual
abstract
var
specialTitle
:
String
/**
* 被禁言剩余时长. 单位为秒.
*
...
...
@@ -118,10 +121,6 @@ actual abstract class Member : MemberJavaHappyAPI() {
@JvmSynthetic
actual
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
Member
>
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
actual
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
QQ
>
/**
* 踢出该成员.
*
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt
View file @
ed467809
...
...
@@ -14,7 +14,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.OfflineFriendImage
import
net.mamoe.mirai.utils.ExternalImage
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
...
...
@@ -90,10 +89,6 @@ actual abstract class QQ : Contact(), CoroutineScope {
@JvmSynthetic
actual
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
out
QQ
>
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
actual
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
QQ
>
/**
* 上传一个图片以备发送.
*
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
View file @
ed467809
...
...
@@ -98,32 +98,11 @@ expect abstract class Bot() : CoroutineScope, LowLevelBotAPIAccessor {
*/
abstract
val
selfQQ
:
QQ
/**
* 机器人的好友列表. 它将与服务器同步更新
*/
@Deprecated
(
"use friends instead"
,
level
=
DeprecationLevel
.
ERROR
,
replaceWith
=
ReplaceWith
(
"this.friends"
)
)
abstract
val
qqs
:
ContactList
<
QQ
>
/**
* 机器人的好友列表. 它将与服务器同步更新
*/
abstract
val
friends
:
ContactList
<
QQ
>
/**
* 获取一个好友或一个群.
* 在一些情况下这可能会造成歧义. 请考虑后使用.
*/
@Deprecated
(
"use getFriend or getGroup instead"
,
level
=
DeprecationLevel
.
ERROR
,
replaceWith
=
ReplaceWith
(
"this.qqs.getOrNull(id) ?: this.groups.getOrNull(id) ?: throw NoSuchElementException(\"contact id \$id\")"
)
)
operator
fun
get
(
id
:
Long
):
Contact
/**
* 判断是否有这个 id 的好友或群.
*/
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotImpl.kt
View file @
ed467809
...
...
@@ -52,6 +52,7 @@ abstract class BotImpl<N : BotNetworkHandler> constructor(
@OptIn
(
RawAccountIdUse
::
class
)
override
val
uin
:
Long
get
()
=
this
.
account
.
id
final
override
val
logger
:
MiraiLogger
by
lazy
{
configuration
.
botLoggerSupplier
(
this
)
}
init
{
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Contact.kt
View file @
ed467809
...
...
@@ -69,10 +69,6 @@ expect abstract class Contact() : CoroutineScope, ContactJavaHappyAPI {
@JvmSynthetic
abstract
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
out
Contact
>
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
@JvmSynthetic
abstract
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
Contact
>
/**
* 上传一个图片以备发送.
*
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/ContactList.kt
View file @
ed467809
...
...
@@ -33,8 +33,6 @@ class ContactList<C : Contact>(@MiraiInternalAPI val delegate: LockFreeLinkedLis
operator
fun
get
(
id
:
Long
):
C
=
delegate
[
id
]
fun
getOrNull
(
id
:
Long
):
C
?
=
delegate
.
getOrNull
(
id
)
@Deprecated
(
"Use contains instead"
,
ReplaceWith
(
"contains(id)"
))
fun
containsId
(
id
:
Long
):
Boolean
=
contains
(
id
)
val
size
:
Int
get
()
=
delegate
.
size
operator
fun
contains
(
element
:
C
):
Boolean
=
delegate
.
contains
(
element
)
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
View file @
ed467809
...
...
@@ -19,7 +19,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.OfflineGroupImage
import
net.mamoe.mirai.utils.ExternalImage
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
...
...
@@ -181,10 +180,6 @@ expect abstract class Group() : Contact, CoroutineScope {
@JvmSynthetic
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
Group
>
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
@JvmSynthetic
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
Group
>
/**
* 上传一个图片以备发送.
*
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
View file @
ed467809
...
...
@@ -16,7 +16,6 @@ import net.mamoe.mirai.JavaHappyAPI
import
net.mamoe.mirai.event.events.*
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.WeakRefProperty
import
kotlin.jvm.JvmSynthetic
...
...
@@ -143,11 +142,6 @@ expect abstract class Member() : MemberJavaHappyAPI {
*/
@JvmSynthetic
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
Member
>
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
QQ
>
}
/**
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt
View file @
ed467809
...
...
@@ -23,7 +23,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.OfflineFriendImage
import
net.mamoe.mirai.utils.ExternalImage
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
...
...
@@ -99,10 +98,6 @@ expect abstract class QQ() : Contact, CoroutineScope {
@JvmSynthetic
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
out
QQ
>
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
QQ
>
/**
* 上传一个图片以备发送.
*
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/internal/InternalEventListeners.kt
View file @
ed467809
...
...
@@ -35,14 +35,6 @@ fun <L : Listener<E>, E : Event> KClass<out E>.subscribeInternal(listener: L): L
return
listener
}
@PublishedApi
@Suppress
(
"FunctionName"
,
"unused"
)
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
internal
fun
<
E
:
Event
>
CoroutineScope
.
Handler
(
coroutineContext
:
CoroutineContext
,
handler
:
suspend
(
E
)
->
ListeningStatus
):
Handler
<
E
>
=
Handler
(
coroutineContext
,
concurrencyKind
=
Listener
.
ConcurrencyKind
.
LOCKED
,
handler
=
handler
)
@PublishedApi
@Suppress
(
"FunctionName"
)
internal
fun
<
E
:
Event
>
CoroutineScope
.
Handler
(
...
...
@@ -68,15 +60,6 @@ internal class Handler<in E : Event>
)
:
Listener
<
E
>,
CompletableJob
by
Job
(
parentJob
)
{
@Suppress
(
"unused"
)
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
@PublishedApi
internal
constructor
(
parentJob
:
Job
?,
subscriberContext
:
CoroutineContext
,
handler
:
suspend
(
E
)
->
ListeningStatus
)
:
this
(
parentJob
,
subscriberContext
,
handler
,
Listener
.
ConcurrencyKind
.
LOCKED
)
@MiraiInternalAPI
val
lock
:
Mutex
?
=
when
(
concurrencyKind
)
{
Listener
.
ConcurrencyKind
.
CONCURRENT
->
null
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt
View file @
ed467809
...
...
@@ -115,7 +115,6 @@ suspend fun Image.queryUrl(): String {
* 不能直接获取它在服务器上的链接. 需要通过 [Bot.queryImageUrl] 查询
*
* 一般由 [Contact.uploadImage] 得到
* @see queryOriginUrl
*/
interface
OfflineImage
:
Image
{
companion
object
Key
:
Message
.
Key
<
OfflineImage
>
...
...
@@ -130,9 +129,6 @@ suspend fun OfflineImage.queryUrl(): String {
return
BotImpl
.
instances
.
peekFirst
().
get
()
?.
queryImageUrl
(
this
)
?:
error
(
"No Bot available to query image url"
)
}
@Deprecated
(
"use queryUrl() instead"
,
ReplaceWith
(
"queryUrl()"
),
level
=
DeprecationLevel
.
ERROR
)
@JvmSynthetic
suspend
inline
fun
OfflineImage
.
queryOriginUrl
():
String
=
queryUrl
()
// endregion 离线图片
// region 群图片
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/RichMessage.kt
View file @
ed467809
...
...
@@ -182,13 +182,4 @@ class XmlMessageBuilder(
this
.
builder
.
append
(
"<picture cover='$coverUrl'/>"
)
}
}
}
@Deprecated
(
"for source compatibility"
,
replaceWith
=
ReplaceWith
(
"RichMessage.Templates"
,
"net.mamoe.mirai.message.data.RichMessage"
),
level
=
DeprecationLevel
.
ERROR
)
@Suppress
(
"unused"
)
// in bytecode it's public
internal
typealias
XmlMessageHelper
=
RichMessage
.
Templates
\ No newline at end of file
}
\ No newline at end of file
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt
View file @
ed467809
...
...
@@ -87,33 +87,11 @@ actual abstract class Bot actual constructor() : CoroutineScope, LowLevelBotAPIA
actual
abstract
val
selfQQ
:
QQ
/**
* 机器人的好友列表. 它将与服务器同步更新
*/
@Deprecated
(
"use friends instead"
,
level
=
DeprecationLevel
.
ERROR
,
replaceWith
=
ReplaceWith
(
"this.friends"
)
)
actual
abstract
val
qqs
:
ContactList
<
QQ
>
/**
* 机器人的好友列表. 它将与服务器同步更新
*/
actual
abstract
val
friends
:
ContactList
<
QQ
>
/**
* 获取一个好友或一个群.
*/
@Deprecated
(
"use getFriend or getGroup instead"
,
level
=
DeprecationLevel
.
ERROR
,
replaceWith
=
ReplaceWith
(
"this.qqs.getOrNull(id) ?: this.groups.getOrNull(id) ?: throw NoSuchElementException(\"contact id \$id\")"
)
)
actual
operator
fun
get
(
id
:
Long
):
Contact
{
return
this
.
friends
.
getOrNull
(
id
)
?:
this
.
groups
.
getOrNull
(
id
)
?:
throw
NoSuchElementException
(
"contact id $id"
)
}
/**
* 判断是否有这个 id 的好友或群.
* 在一些情况下这可能会造成歧义. 请考虑后使用.
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt
View file @
ed467809
...
...
@@ -19,7 +19,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.OfflineImage
import
net.mamoe.mirai.message.data.id
import
net.mamoe.mirai.utils.ExternalImage
...
...
@@ -62,13 +61,9 @@ actual abstract class Contact : CoroutineScope, ContactJavaHappyAPI() {
*
* @return 消息回执. 可 [引用回复][MessageReceipt.quote](仅群聊)或 [撤回][MessageReceipt.recall] 这条消息.
*/
@JvmSynthetic
@JvmSynthetic
//
actual
abstract
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
out
Contact
>
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
actual
abstract
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
Contact
>
/**
* 上传一个图片以备发送.
*
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt
View file @
ed467809
...
...
@@ -17,7 +17,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.OfflineGroupImage
import
net.mamoe.mirai.utils.ExternalImage
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
...
...
@@ -182,10 +181,6 @@ actual abstract class Group : Contact(), CoroutineScope {
@JvmSynthetic
actual
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
Group
>
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
@JvmSynthetic
actual
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
Group
>
/**
* 上传一个图片以备发送.
*
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Member.kt
View file @
ed467809
...
...
@@ -18,7 +18,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.WeakRefProperty
...
...
@@ -129,10 +128,6 @@ actual abstract class Member : MemberJavaHappyAPI() {
@JvmSynthetic
actual
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
Member
>
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
actual
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
QQ
>
/**
* 当且仅当 `[other] is [Member] && [other].id == this.id && [other].group == this.group` 时为 true
*/
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt
View file @
ed467809
...
...
@@ -14,7 +14,6 @@ import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.OfflineFriendImage
import
net.mamoe.mirai.utils.ExternalImage
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
...
...
@@ -90,10 +89,6 @@ actual abstract class QQ : Contact(), CoroutineScope {
@JvmSynthetic
actual
abstract
override
suspend
fun
sendMessage
(
message
:
Message
):
MessageReceipt
<
out
QQ
>
@JvmSynthetic
@Deprecated
(
"for binary compatibility"
,
level
=
DeprecationLevel
.
HIDDEN
)
actual
abstract
override
suspend
fun
sendMessage
(
message
:
MessageChain
):
MessageReceipt
<
out
QQ
>
/**
* 上传一个图片以备发送.
*
...
...
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