teidesu/mtcute
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity Actions

refactor: normalizeToInput* now throws an error by itself, never returning null

Browse source
This commit is contained in:
teidesu 2022-08-29 16:15:37 +03:00
parent 1cc3594f09
commit e7219ed2de
28 changed files with 45 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/client/src/methods/bots/get-bot-menu-button.ts
View file

@ -13,13 +13,8 @@ export async function getBotMenuButton(
this: TelegramClient,
user: InputPeerLike
): Promise<tl.TypeBotMenuButton> {
const userId = normalizeToInputUser(await this.resolvePeer(user))
if (!userId) {
throw new MtInvalidPeerTypeError(user, 'user')
}
return await this.call({
_: 'bots.getBotMenuButton',
userId,
userId: normalizeToInputUser(await this.resolvePeer(user), user),
})
}

10
packages/client/src/methods/bots/get-game-high-scores.ts
View file

@ -27,10 +27,7 @@ export async function getGameHighScores(
let user: tl.TypeInputUser
if (userId) {
const res = normalizeToInputUser(await this.resolvePeer(userId))
if (!res) throw new MtInvalidPeerTypeError(userId, 'user')
user = res
user = normalizeToInputUser(await this.resolvePeer(userId), userId)
} else {
user = { _: 'inputUserEmpty' }
}
@ -63,10 +60,7 @@ export async function getInlineGameHighScores(
let user: tl.TypeInputUser
if (userId) {
const res = normalizeToInputUser(await this.resolvePeer(userId))
if (!res) throw new MtInvalidPeerTypeError(userId, 'user')
user = res
user = normalizeToInputUser(await this.resolvePeer(userId), userId)
} else {
user = { _: 'inputUserEmpty' }
}

7
packages/client/src/methods/bots/normalize-command-scope.ts
View file

@ -26,12 +26,11 @@ export async function _normalizeCommandScope(
}
}
case 'member': {
const chat = await this.resolvePeer(scope.chat)
const user = normalizeToInputUser(
await this.resolvePeer(scope.user)
await this.resolvePeer(scope.user),
scope.user
)
if (!user) throw new MtInvalidPeerTypeError(scope.user, 'user')
const chat = await this.resolvePeer(scope.chat)
return {
_: 'botCommandScopePeerUser',

7
packages/client/src/methods/bots/set-bot-menu-button.ts
View file

@ -14,14 +14,9 @@ export async function setBotMenuButton(
user: InputPeerLike,
button: tl.TypeBotMenuButton
): Promise<void> {
const userId = normalizeToInputUser(await this.resolvePeer(user))
if (!userId) {
throw new MtInvalidPeerTypeError(user, 'user')
}
await this.call({
_: 'bots.setBotMenuButton',
userId,
userId: normalizeToInputUser(await this.resolvePeer(user), user),
button,
})
}

6
packages/client/src/methods/bots/set-game-score.ts
View file

@ -37,9 +37,8 @@ export async function setGameScore(
): Promise<Message> {
if (!params) params = {}
const user = normalizeToInputUser(await this.resolvePeer(userId), userId)
const chat = await this.resolvePeer(chatId)
const user = normalizeToInputUser(await this.resolvePeer(userId))
if (!user) throw new MtInvalidPeerTypeError(userId, 'user')
const res = await this.call({
_: 'messages.setGameScore',
@ -85,8 +84,7 @@ export async function setInlineGameScore(
): Promise<void> {
if (!params) params = {}
const user = normalizeToInputUser(await this.resolvePeer(userId))
if (!user) throw new MtInvalidPeerTypeError(userId, 'user')
const user = normalizeToInputUser(await this.resolvePeer(userId), userId)
const [id, connection] = await this._normalizeInline(messageId)

1
packages/client/src/methods/chats/add-chat-members.ts
View file

@ -32,7 +32,6 @@ export async function addChatMembers(
if (isInputPeerChat(chat)) {
for (const user of users) {
const p = normalizeToInputUser(await this.resolvePeer(user))
if (!p) continue
const updates = await this.call({
_: 'messages.addChatUser',

5
packages/client/src/methods/chats/ban-chat-member.ts
View file

@ -44,13 +44,10 @@ export async function banChatMember(
},
})
} else if (isInputPeerChat(chat)) {
const normUser = normalizeToInputUser(user)
if (!normUser) throw new MtInvalidPeerTypeError(userId, 'user')
res = await this.call({
_: 'messages.deleteChatUser',
chatId: chat.chatId,
userId: normUser,
userId: normalizeToInputUser(user),
})
} else throw new MtInvalidPeerTypeError(chatId, 'chat or channel')

5
packages/client/src/methods/chats/delete-channel.ts
View file

@ -13,12 +13,9 @@ export async function deleteChannel(
this: TelegramClient,
chatId: InputPeerLike
): Promise<void> {
const peer = normalizeToInputChannel(await this.resolvePeer(chatId))
if (!peer) throw new MtInvalidPeerTypeError(chatId, 'channel')
const res = await this.call({
_: 'channels.deleteChannel',
channel: peer,
channel: normalizeToInputChannel(await this.resolvePeer(chatId), chatId),
})
this._handleUpdate(res)
}

7
packages/client/src/methods/chats/delete-history.ts
View file

@ -2,7 +2,7 @@ import { tl } from '@mtcute/tl'
import { TelegramClient } from '../../client'
import { InputPeerLike } from '../../types'
import { normalizeToInputChannel } from '../../utils/peer-utils'
import { isInputPeerChannel, normalizeToInputChannel } from "../../utils/peer-utils";
import { createDummyUpdate } from '../../utils/updates-utils'
/**
@ -36,13 +36,12 @@ export async function deleteHistory(
maxId,
})
const channel = normalizeToInputChannel(peer)
if (channel) {
if (isInputPeerChannel(peer)) {
this._handleUpdate(
createDummyUpdate(
res.pts,
res.ptsCount,
(channel as tl.RawInputChannel).channelId
peer.channelId
)
)
} else {

10
packages/client/src/methods/chats/delete-user-history.ts
View file

@ -2,10 +2,7 @@ import { tl } from '@mtcute/tl'
import { TelegramClient } from '../../client'
import { InputPeerLike, MtInvalidPeerTypeError } from '../../types'
import {
normalizeToInputChannel,
normalizeToInputPeer,
} from '../../utils/peer-utils'
import { normalizeToInputChannel } from '../../utils/peer-utils'
import { createDummyUpdate } from '../../utils/updates-utils'
/**
@ -20,10 +17,9 @@ export async function deleteUserHistory(
chatId: InputPeerLike,
participantId: InputPeerLike
): Promise<void> {
const channel = normalizeToInputChannel(await this.resolvePeer(chatId))
if (!channel) throw new MtInvalidPeerTypeError(chatId, 'channel')
const channel = normalizeToInputChannel(await this.resolvePeer(chatId), chatId)
const peer = normalizeToInputPeer(await this.resolvePeer(participantId))
const peer = await this.resolvePeer(participantId)
const res = await this.call({
_: 'channels.deleteParticipantHistory',

7
packages/client/src/methods/chats/edit-admin-rights.ts
View file

@ -23,11 +23,8 @@ export async function editAdminRights(
rights: Omit<tl.RawChatAdminRights, '_'>,
rank = ''
): Promise<void> {
const chat = normalizeToInputChannel(await this.resolvePeer(chatId))
if (!chat) throw new MtInvalidPeerTypeError(chatId, 'channel')
const user = normalizeToInputUser(await this.resolvePeer(userId))
if (!user) throw new MtInvalidPeerTypeError(userId, 'user')
const chat = normalizeToInputChannel(await this.resolvePeer(chatId), chatId)
const user = normalizeToInputUser(await this.resolvePeer(userId), userId)
const res = await this.call({
_: 'channels.editAdmin',

3
packages/client/src/methods/chats/get-chat-event-log.ts
View file

@ -86,8 +86,7 @@ export async function* getChatEventLog(
): AsyncIterableIterator<ChatEvent> {
if (!params) params = {}
const channel = normalizeToInputChannel(await this.resolvePeer(chatId))
if (!channel) throw new MtInvalidPeerTypeError(chatId, 'channel')
const channel = normalizeToInputChannel(await this.resolvePeer(chatId), chatId)
let current = 0
let maxId = params.maxId ?? Long.ZERO

5
packages/client/src/methods/chats/join-chat.ts
View file

@ -37,12 +37,9 @@ export async function joinChat(
}
}
const peer = normalizeToInputChannel(await this.resolvePeer(chatId))
if (!peer) throw new MtNotFoundError()
const res = await this.call({
_: 'channels.joinChannel',
channel: peer,
channel: normalizeToInputChannel(await this.resolvePeer(chatId), chatId),
})
assertIsUpdatesGroup('channels.joinChannel', res)

5
packages/client/src/methods/chats/set-chat-username.ts
View file

@ -16,12 +16,9 @@ export async function setChatUsername(
chatId: InputPeerLike,
username: string | null
): Promise<void> {
const chat = normalizeToInputChannel(await this.resolvePeer(chatId))
if (!chat) throw new MtInvalidPeerTypeError(chatId, 'channel')
await this.call({
_: 'channels.updateUsername',
channel: chat,
channel: normalizeToInputChannel(await this.resolvePeer(chatId), chatId),
username: username || '',
})
}

5
packages/client/src/methods/chats/set-slow-mode.ts
View file

@ -17,12 +17,9 @@ export async function setSlowMode(
chatId: InputPeerLike,
seconds = 0
): Promise<void> {
const chat = normalizeToInputChannel(await this.resolvePeer(chatId))
if (!chat) throw new MtInvalidPeerTypeError(chatId, 'channel')
const res = await this.call({
_: 'channels.toggleSlowMode',
channel: chat,
channel: normalizeToInputChannel(await this.resolvePeer(chatId), chatId),
seconds,
})
this._handleUpdate(res)

3
packages/client/src/methods/contacts/add-contact.ts
View file

@ -36,8 +36,7 @@ export async function addContact(
sharePhone?: boolean
}
): Promise<User> {
const peer = normalizeToInputUser(await this.resolvePeer(userId))
if (!peer) throw new MtInvalidPeerTypeError(userId, 'user')
const peer = normalizeToInputUser(await this.resolvePeer(userId), userId)
const res = await this.call({
_: 'contacts.addContact',

4
packages/client/src/methods/invite-links/get-invite-links.ts
View file

@ -53,9 +53,7 @@ export async function* getInviteLinks(
const chunkSize = Math.min(params.chunkSize ?? 100, total)
const peer = await this.resolvePeer(chatId)
const admin = normalizeToInputUser(await this.resolvePeer(adminId))
if (!admin) throw new MtInvalidPeerTypeError(adminId, 'user')
const admin = normalizeToInputUser(await this.resolvePeer(adminId), adminId)
let offsetDate: number | undefined = undefined
let offsetLink: string | undefined = undefined

5
packages/client/src/methods/invite-links/hide-all-join-requests.ts
View file

@ -18,10 +18,7 @@ export async function hideAllJoinRequests(
action: 'approve' | 'deny',
link?: string
): Promise<void> {
const userId = normalizeToInputUser(await this.resolvePeer(user))
if (!userId) {
throw new MtInvalidPeerTypeError(user, 'user')
}
const userId = normalizeToInputUser(await this.resolvePeer(user), user)
await this.call({
_: 'messages.hideAllChatJoinRequests',

5
packages/client/src/methods/invite-links/hide-join-request.ts
View file

@ -16,10 +16,7 @@ export async function hideJoinRequest(
user: InputPeerLike,
action: 'approve' | 'deny'
): Promise<void> {
const userId = normalizeToInputUser(await this.resolvePeer(user))
if (!userId) {
throw new MtInvalidPeerTypeError(user, 'user')
}
const userId = normalizeToInputUser(await this.resolvePeer(user), user)
await this.call({
_: 'messages.hideChatJoinRequest',

2
packages/client/src/methods/messages/get-messages.ts
View file

@ -74,7 +74,7 @@ export async function getMessages(
? {
_: 'channels.getMessages',
id: ids,
channel: normalizeToInputChannel(peer)!,
channel: normalizeToInputChannel(peer),
}
: {
_: 'messages.getMessages',

3
packages/client/src/methods/messages/parse-entities.ts
View file

@ -41,7 +41,8 @@ export async function _parseEntities(
if (ent._ === 'messageEntityMentionName') {
try {
const inputPeer = normalizeToInputUser(
await this.resolvePeer(ent.userId)
await this.resolvePeer(ent.userId),
ent.userId
)
// not a user

3
packages/client/src/methods/stickers/create-sticker-set.ts
View file

@ -106,8 +106,7 @@ export async function createStickerSet(
)
}
const owner = normalizeToInputUser(await this.resolvePeer(params.owner))
if (!owner) throw new MtInvalidPeerTypeError(params.owner, 'user')
const owner = normalizeToInputUser(await this.resolvePeer(params.owner), params.owner)
const inputStickers: tl.TypeInputStickerSetItem[] = []

2
packages/client/src/methods/updates.ts
View file

@ -1800,7 +1800,7 @@ async function _fetchChannelDifference(
try {
channel = normalizeToInputChannel(
await this.resolvePeer(toggleChannelIdMark(channelId))
)!
)
} catch (e) {
this._updsLog.warn(
'fetchChannelDifference failed for channel %d: input peer not found',

5
packages/client/src/methods/users/get-common-chats.ts
View file

@ -14,12 +14,9 @@ export async function getCommonChats(
this: TelegramClient,
userId: InputPeerLike
): Promise<Chat[]> {
const peer = normalizeToInputUser(await this.resolvePeer(userId))
if (!peer) throw new MtInvalidPeerTypeError(userId, 'user')
return this.call({
_: 'messages.getCommonChats',
userId: peer,
userId: normalizeToInputUser(await this.resolvePeer(userId), userId),
maxId: 0,
limit: 100,
}).then((res) => res.chats.map((it) => new Chat(this, it)))

5
packages/client/src/methods/users/get-profile-photos.ts
View file

@ -33,12 +33,9 @@ export async function getProfilePhotos(
): Promise<Photo[]> {
if (!params) params = {}
const peer = normalizeToInputUser(await this.resolvePeer(userId))
if (!peer) throw new MtInvalidPeerTypeError(userId, 'user')
const res = await this.call({
_: 'photos.getUserPhotos',
userId: peer,
userId: normalizeToInputUser(await this.resolvePeer(userId), userId),
offset: params.offset ?? 0,
limit: params.limit ?? 100,
maxId: Long.ZERO,

3
packages/client/src/methods/users/iter-profile-photos.ts
View file

@ -46,8 +46,7 @@ export async function* iterProfilePhotos(
): AsyncIterableIterator<Photo> {
if (!params) params = {}
const peer = normalizeToInputUser(await this.resolvePeer(userId))
if (!peer) throw new MtInvalidPeerTypeError(userId, 'user')
const peer = normalizeToInputUser(await this.resolvePeer(userId), userId)
let offset = params.offset || 0
let current = 0

7
packages/client/src/types/bots/keyboards.ts
View file

@ -362,15 +362,10 @@ export namespace BotKeyboard {
text: string,
user: tl.TypeInputPeer
): tl.RawInputKeyboardButtonUserProfile {
const userId = normalizeToInputUser(user)
if (!userId) {
throw new MtInvalidPeerTypeError(user, 'user')
}
return {
_: 'inputKeyboardButtonUserProfile',
text,
userId,
userId: normalizeToInputUser(user),
}
}

34
packages/client/src/utils/peer-utils.ts
View file

@ -1,6 +1,7 @@
import Long from 'long'
import { tl } from '@mtcute/tl'
import { assertNever } from '@mtcute/core'
import { InputPeerLike, MtInvalidPeerTypeError } from '../types'
export const INVITE_LINK_REGEX =
/^(?:https?:\/\/)?(?:www\.)?(?:t(?:elegram)?\.(?:org|me|dog)\/(?:joinchat\/|\+))([\w-]+)$/i
@ -50,18 +51,9 @@ export function normalizeToInputPeer(
}
export function normalizeToInputUser(
res:
| tl.TypeInputUser
| tl.RawInputPeerUser
| tl.RawInputPeerUserFromMessage
| tl.RawInputPeerSelf
): tl.TypeInputUser
export function normalizeToInputUser(
res: tl.TypeInputPeer | tl.TypeInputUser | tl.TypeInputChannel
): tl.TypeInputUser | null
export function normalizeToInputUser(
res: tl.TypeInputPeer | tl.TypeInputUser | tl.TypeInputChannel
): tl.TypeInputUser | null {
res: tl.TypeInputPeer | tl.TypeInputUser | tl.TypeInputChannel,
input?: InputPeerLike
): tl.TypeInputUser {
if (tl.isAnyInputUser(res)) return res
switch (res._) {
@ -82,21 +74,13 @@ export function normalizeToInputUser(
}
}
return null
throw new MtInvalidPeerTypeError(input ?? res, 'user')
}
export function normalizeToInputChannel(
res:
| tl.TypeInputChannel
| tl.RawInputPeerChannel
| tl.RawInputPeerChannelFromMessage
): tl.TypeInputChannel
export function normalizeToInputChannel(
res: tl.TypeInputPeer | tl.TypeInputUser | tl.TypeInputChannel
): tl.TypeInputChannel | null
export function normalizeToInputChannel(
res: tl.TypeInputPeer | tl.TypeInputUser | tl.TypeInputChannel
): tl.TypeInputChannel | null {
res: tl.TypeInputPeer | tl.TypeInputUser | tl.TypeInputChannel,
input?: InputPeerLike
): tl.TypeInputChannel {
if (tl.isAnyInputChannel(res)) return res
switch (res._) {
@ -115,7 +99,7 @@ export function normalizeToInputChannel(
}
}
return null
throw new MtInvalidPeerTypeError(input ?? res, 'user')
}
export function isInputPeerUser(