Skip to content

fix(koishi): fix session.channel overwritten #1505

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

Open
Hieuzest wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(koishi): fix session.channel overwritten #1505

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10a23d5
fix(koishi): fix `session.channel` overwriten
Hieuzest May 30, 2025
dc1a0ce
Update session.ts
Hieuzest May 30, 2025
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
34 changes: 22 additions & 12 deletions packages/core/src/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,28 +247,38 @@ class KoishiSession<U, G, C> {
}
}

async _observeChannelLike<K extends Channel.Field = never>(channelId: string, fields: Iterable<K> = []) {
async _observeChannelLike<K extends Channel.Field = never>(channelId: string, fields: Iterable<K> = [], type: 'channel' | 'guild' = 'channel') {
const fieldSet = new Set<Channel.Field>(fields)
const { platform } = this
const key = `${platform}:${channelId}`

let cache = this[type]
if (cache) {
for (const key in cache) {
fieldSet.delete(key as any)
}
if (!fieldSet.size) return cache
}
const data = await this.getChannel(channelId, [...fieldSet])
const cache = observe(data, async (diff) => {
// https://github.com/koishijs/koishi/issues/1267
if (data['$detached']) return
await this.app.database.setChannel(platform, channelId, diff as any)
}, `channel ${key}`)
return cache
cache = this[type]
if (cache) {
cache.$merge(data)
} else {
cache = observe(data, async (diff) => {
// https://github.com/koishijs/koishi/issues/1267
if (data['$detached']) return
await this.app.database.setChannel(platform, channelId, diff as any)
}, `channel ${key}`)
}
return this[type] = cache as any
}

async observeChannel<T extends Channel.Field = never>(fields: Iterable<T>): Promise<Channel.Observed<T | G>> {
const tasks = [this._observeChannelLike(this.channelId, fields)]
const tasks = [this._observeChannelLike(this.channelId, fields, 'channel')]
if (this.channelId !== this.guildId) {
tasks.push(this._observeChannelLike(this.guildId, fields))
tasks.push(this._observeChannelLike(this.guildId, fields, 'guild'))
}
const [channel, guild = channel] = await Promise.all(tasks)
this.guild = guild
this.channel = channel
const [channel] = await Promise.all(tasks)
return channel
}

Expand Down