Skip to content

Remove MessageUserQueryFilter #1931

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

Merged
merged 11 commits into from
Mar 20, 2020
Merged

Remove MessageUserQueryFilter #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dfc8e3b
remove MessageUserQueryFilter (#1929)
huan Mar 19, 2020
a312dc8
restore
huan Mar 19, 2020
e2b47f3
0.35.7
huan Mar 19, 2020
90387ea
0.35.8
huan Mar 19, 2020
d14373c
ci
huan Mar 19, 2020
fa27d51
0.35.12
huan Mar 19, 2020
19ee40d
Merge branch 'master' into remove_user_filter
huan Mar 19, 2020
4a02792
restore
huan Mar 19, 2020
7d5a092
0.35.13
huan Mar 19, 2020
2e9386e
Merge branch 'remove_user_filter' of github.com:wechaty/wechaty into …
huan Mar 19, 2020
a21f732
0.35.14
huan Mar 19, 2020
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wechaty",
"version": "0.35.8",
"version": "0.35.14",
"description": "Wechaty is a Bot SDK for Individual Account, Powered by TypeScript, Docker, and 💖",
"main": "dist/src/index.js",
"typings": "dist/src/index.d.ts",
Expand Down
40 changes: 10 additions & 30 deletions src/user/message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@ import {
} from './mini-program'
import { Image } from './image'

export interface MessageUserQueryFilter {
from? : Contact,
text? : string | RegExp
room? : Room
type? : MessageType
to? : Contact
}

/**
* All wechat messages will be encapsulated as a Message.
*
Expand All @@ -87,16 +79,16 @@ export class Message extends Accessory implements Sayable {
* Find message in cache
*/
public static async find<T extends typeof Message> (
this : T,
userQuery : string | MessageUserQueryFilter,
this : T,
query : string | MessageQueryFilter,
): Promise<T['prototype'] | null> {
log.verbose('Message', 'find(%s)', JSON.stringify(userQuery))
log.verbose('Message', 'find(%s)', JSON.stringify(query))

if (typeof userQuery === 'string') {
userQuery = { text: userQuery }
if (typeof query === 'string') {
query = { text: query }
}

const messageList = await this.findAll(userQuery)
const messageList = await this.findAll(query)
if (messageList.length < 1) {
return null
}
Expand All @@ -112,27 +104,15 @@ export class Message extends Accessory implements Sayable {
* Find messages in cache
*/
public static async findAll<T extends typeof Message> (
this : T,
userQuery? : MessageUserQueryFilter,
this : T,
query? : MessageQueryFilter,
): Promise<Array<T['prototype']>> {
log.verbose('Message', 'findAll(%s)', JSON.stringify(userQuery) || '')

let puppetQuery: undefined | MessageQueryFilter

if (userQuery) {
puppetQuery = {
fromId : userQuery.from && userQuery.from.id,
roomId : userQuery.room && userQuery.room.id,
text : userQuery.text,
toId : userQuery.to && userQuery.to.id,
type : userQuery.type,
}
}
log.verbose('Message', 'findAll(%s)', JSON.stringify(query) || '')

const invalidDict: { [id: string]: true } = {}

try {
const MessageIdList = await this.puppet.messageSearch(puppetQuery)
const MessageIdList = await this.puppet.messageSearch(query)
const messageList = MessageIdList.map(id => this.load(id))
await Promise.all(
messageList.map(
Expand Down