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.

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

refactor: remove remaining circular dependencies #28

Merged
merged 12 commits into from
Nov 20, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Small fixes
  • Loading branch information
rojvv committed Nov 19, 2022
commit 928e83a7a926d415c1a1295b33430d6facdfd7f5
37 changes: 25 additions & 12 deletions src/client/message_parse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export function _getResponseMessage(
return;
}
const randomToId = new Map<string, number>();
const idToMessage = new Map<number, Api.Message>();
const idToMessage = new Map<number, CustomMessage>();
let schedMessage;
for (const update of updates) {
if (update instanceof Api.UpdateMessageID) {
Expand All @@ -112,36 +112,43 @@ export function _getResponseMessage(
update instanceof Api.UpdateNewChannelMessage ||
update instanceof Api.UpdateNewMessage
) {
new CustomMessage(update.message as unknown as Api.Message)._finishInit(
const message = new CustomMessage(
update.message as unknown as Api.Message,
);

message._finishInit(
client,
entities,
inputChat,
);
if ("randomId" in request || isArrayLike(request)) {
idToMessage.set(
update.message.id,
update.message as unknown as Api.Message,
message,
);
} else {
return update.message as unknown as Api.Message;
return message;
}
} else if (
update instanceof Api.UpdateEditMessage &&
"peer" in request &&
entityType_(request.peer) !== EntityType_.CHANNEL
) {
new CustomMessage(update.message as unknown as Api.Message)._finishInit(
const message = new CustomMessage(
update.message as unknown as Api.Message,
);
message._finishInit(
client,
entities,
inputChat,
);
if ("randomId" in request) {
idToMessage.set(
update.message.id,
update.message as unknown as Api.Message,
message,
);
} else if ("id" in request && request.id === update.message.id) {
return update.message;
return message;
}
} else if (
update instanceof Api.UpdateEditChannelMessage &&
Expand All @@ -150,23 +157,29 @@ export function _getResponseMessage(
getPeerId((update.message as unknown as Api.Message).peerId!)
) {
if (request.id === update.message.id) {
new CustomMessage(update.message as unknown as Api.Message)._finishInit(
const message = new CustomMessage(
update.message as unknown as Api.Message,
);
message._finishInit(
client,
entities,
inputChat,
);
return update.message;
return message;
}
} else if (update instanceof Api.UpdateNewScheduledMessage) {
new CustomMessage(update.message as unknown as Api.Message)._finishInit(
const message = new CustomMessage(
update.message as unknown as Api.Message,
);
message._finishInit(
client,
entities,
inputChat,
);
schedMessage = update.message as unknown as Api.Message;
schedMessage = message;
idToMessage.set(
update.message.id,
update.message as unknown as Api.Message,
message,
);
} else if (update instanceof Api.UpdateMessagePoll) {
if (request.media.poll.id === update.pollId) {
Expand Down
4 changes: 2 additions & 2 deletions src/client/telegram_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,8 @@ export class TelegramClient extends TelegramBaseClient
):
| CustomMessage
| Api.TypeMessage
| Map<number, Api.Message>
| (Api.Message | undefined)[]
| Map<number, CustomMessage>
| (CustomMessage | undefined)[]
| undefined {
return parseMethods._getResponseMessage(this, req, result, inputChat);
}
Expand Down