Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: essence message setting #2314

Merged
merged 19 commits into from
Mar 21, 2023
Merged

feat: essence message setting #2314

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
fae51ee
feat: remove essence message
cssxsh Oct 29, 2022
277c3ed
feat: Essences
cssxsh Oct 29, 2022
31682c7
add: share and remove
cssxsh Nov 26, 2022
4611c95
fix: impl
cssxsh Nov 26, 2022
5112282
fix: arguments
cssxsh Nov 26, 2022
3f38c43
feat: image url to image
cssxsh Dec 17, 2022
35b20c9
add: doc
cssxsh Dec 21, 2022
2649bb1
fix: doc
cssxsh Jan 4, 2023
73e7079
Merge remote-tracking branch 'origin/dev' into feat_em
cssxsh Jan 4, 2023
45e9dd2
Copyright: 2023
cssxsh Jan 8, 2023
1dcd727
Merge remote-tracking branch 'origin/dev' into feat_em
cssxsh Feb 19, 2023
5d2ecd3
remove: method removeEssenceMessage
cssxsh Feb 19, 2023
055bc13
Merge remote-tracking branch 'origin/dev' into feat_em
cssxsh Feb 19, 2023
d0a35dc
feat: lazy load source
cssxsh Feb 19, 2023
ecf4f44
add: no parse
cssxsh Mar 6, 2023
cd3ce5e
add: sendAndExpect try
cssxsh Mar 6, 2023
f2a2119
fix: remove throw
cssxsh Mar 21, 2023
9e2a776
Merge remote-tracking branch 'origin/dev' into feat_em
cssxsh Mar 21, 2023
408935f
fix: parse IMAGE_MD5_REGEX
cssxsh Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions mirai-core/src/commonMain/kotlin/contact/essence/EssencesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package net.mamoe.mirai.internal.contact.essence

import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
Expand All @@ -22,6 +23,7 @@ import net.mamoe.mirai.contact.checkBotPermission
import net.mamoe.mirai.contact.essence.EssenceMessageRecord
import net.mamoe.mirai.contact.essence.Essences
import net.mamoe.mirai.internal.contact.GroupImpl
import net.mamoe.mirai.internal.network.protocol.packet.chat.TroopEssenceMsgManager
import net.mamoe.mirai.message.data.*
import net.mamoe.mirai.utils.*
import net.mamoe.mirai.utils.ExternalResource.Companion.toExternalResource
Expand Down Expand Up @@ -129,11 +131,23 @@ internal class EssencesImpl(

override suspend fun remove(source: MessageSource) {
group.checkBotPermission(MemberPermission.ADMINISTRATOR)
group.bot.cancelDigest(
groupCode = group.id,
msgSeq = source.ids.first(),
msgRandom = source.internalIds.first()
)
try {
val result = group.bot.network.sendAndExpect(
TroopEssenceMsgManager.RemoveEssence(
group.bot.client,
group.uin,
source.internalIds.first(),
source.ids.first()
), 5000, 2
)
check(result.success) { result.msg ?: "移除精华消息失败" }
} catch (_: CancellationException) {
group.bot.cancelDigest(
groupCode = group.id,
msgSeq = source.ids.first(),
msgRandom = source.internalIds.first()
)
}
}

override fun asFlow(): Flow<EssenceMessageRecord> {
Expand Down