Skip to content

Commit 18c1f62

Browse files
evgeny-nadymovevgeny-nadymov
committed
Replace sender with sender_id
1 parent 12ae0b8 commit 18c1f62

File tree

20 files changed

+108
-107
lines changed

20 files changed

+108
-107
lines changed

‎src/Actions/Message.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function unblockSender(sender) {
3939
function toggleMessageSenderIsBlocked(sender, isBlocked) {
4040
TdLibController.send({
4141
'@type': 'toggleMessageSenderIsBlocked',
42-
sender,
42+
sender_id: sender,
4343
is_blocked: isBlocked
4444
});
4545
}

‎src/Components/Actions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ class Actions extends React.PureComponent {
9696
};
9797

9898
onClientUpdateBlockSender = update => {
99-
const { sender } = update;
99+
const { sender_id } = update;
100100

101-
this.setState({ requestBlockSenderAlert: { sender }});
101+
this.setState({ requestBlockSenderAlert: { sender: sender_id }});
102102
}
103103

104104
onClientUpdateInputPasswordAlert = update => {

‎src/Components/Calls/Button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ class Button extends React.Component {
875875
const { left, right, top, bottom, scale } = this;
876876

877877
return (
878-
<div id='button' className='button' style={{ height: bottom / scale, borderRadius: 12, position: 'relative', transform: 'translateY(-14px)' }}>
878+
<div id='button' className='button' style={{ height: bottom / scale, borderRadius: 12, position: 'relative', transform: 'translateY(-28px)' }}>
879879
<canvas id='button-canvas' width={right} height={bottom} style={{ width: right / scale, height: bottom / scale }}/>
880880
<div style={{
881881
position: 'absolute',

‎src/Components/ColumnLeft/Search/Search.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ class Search extends React.Component {
290290
const users = new Map();
291291
for (let i = 0; i < messages.messages.length; i++) {
292292
chats.set(messages.messages[i].chat_id, messages.messages[i].chat_id);
293-
if (messages.messages[i].sender.user_id) {
294-
users.set(messages.messages[i].sender.user_id, messages.messages[i].sender.user_id);
293+
if (messages.messages[i].sender_id.user_id) {
294+
users.set(messages.messages[i].sender_id.user_id, messages.messages[i].sender_id.user_id);
295295
}
296296
}
297297

@@ -300,9 +300,9 @@ class Search extends React.Component {
300300

301301
chats.set(chat_id, chat_id);
302302
if (message) {
303-
const { sender } = message;
304-
if (sender && sender.user_id) {
305-
users.set(sender.user_id, sender.user_id);
303+
const { sender_id } = message;
304+
if (sender_id && sender_id.user_id) {
305+
users.set(sender_id.user_id, sender_id.user_id);
306306
}
307307
}
308308
}
@@ -477,8 +477,8 @@ class Search extends React.Component {
477477
const users = new Map();
478478
for (let i = 0; i < result.messages.length; i++) {
479479
chats.set(result.messages[i].chat_id, result.messages[i].chat_id);
480-
if (result.messages[i].sender.user_id) {
481-
users.set(result.messages[i].sender.user_id, result.messages[i].sender.user_id);
480+
if (result.messages[i].sender_id.user_id) {
481+
users.set(result.messages[i].sender_id.user_id, result.messages[i].sender_id.user_id);
482482
}
483483
}
484484

‎src/Components/ColumnMiddle/MessagesList.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ class MessagesList extends React.Component {
14981498
showMessageTitle(message, prevMessage, isFirst, isFirstUnread) {
14991499
if (!message) return false;
15001500

1501-
const { chat_id, date, is_outgoing, sender, content, forward_info } = message;
1501+
const { chat_id, date, is_outgoing, sender_id, content, forward_info } = message;
15021502

15031503
if (isFirst) {
15041504
return true;
@@ -1517,7 +1517,7 @@ class MessagesList extends React.Component {
15171517
(isServiceMessage(prevMessage) ||
15181518
prevMessage.content['@type'] === 'messageSticker' ||
15191519
prevMessage.content['@type'] === 'messageVideoNote' ||
1520-
!senderEquals(sender, prevMessage.sender) ||
1520+
!senderEquals(sender_id, prevMessage.sender_id) ||
15211521
is_outgoing !== prevMessage.is_outgoing ||
15221522
(isMeChat(chat_id) && !forwardInfoEquals(forward_info, prevMessage.forward_info)) ||
15231523
date - prevMessage.date > MESSAGE_SPLIT_MAX_TIME_S)
@@ -1585,7 +1585,7 @@ class MessagesList extends React.Component {
15851585
|| isServiceMessage(nextMessage)
15861586
|| nextMessage.content['@type'] === 'messageSticker'
15871587
|| nextMessage.content['@type'] === 'messageVideoNote'
1588-
|| !senderEquals(x.sender, nextMessage.sender)
1588+
|| !senderEquals(x.sender_id, nextMessage.sender_id)
15891589
|| (isMeChat(x.chat_id) && !forwardInfoEquals(x.forward_info, nextMessage.forward_info))
15901590
|| x.is_outgoing !== nextMessage.is_outgoing
15911591
|| nextShowTitle;
@@ -1631,7 +1631,7 @@ class MessagesList extends React.Component {
16311631
|| isServiceMessage(nextMessage)
16321632
|| nextMessage.content['@type'] === 'messageSticker'
16331633
|| nextMessage.content['@type'] === 'messageVideoNote'
1634-
|| !senderEquals(x.sender, nextMessage.sender)
1634+
|| !senderEquals(x.sender_id, nextMessage.sender_id)
16351635
|| (isMeChat(x.chat_id) && !forwardInfoEquals(x.forward_info, nextMessage.forward_info))
16361636
|| x.is_outgoing !== nextMessage.is_outgoing
16371637
|| nextShowTitle;
@@ -1689,7 +1689,7 @@ class MessagesList extends React.Component {
16891689
|| isServiceMessage(nextMessage)
16901690
|| nextMessage.content['@type'] === 'messageSticker'
16911691
|| nextMessage.content['@type'] === 'messageVideoNote'
1692-
|| !senderEquals(x.sender, nextMessage.sender)
1692+
|| !senderEquals(x.sender_id, nextMessage.sender_id)
16931693
|| isMeChat(x.chat_id) && !forwardInfoEquals(x.forward_info, nextMessage.forward_info)
16941694
|| x.is_outgoing !== nextMessage.is_outgoing
16951695
|| nextShowTitle;

‎src/Components/Message/Album/Album.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class Album extends React.Component {
189189
const message = MessageStore.get(chatId, messageId);
190190
if (!message) return <div>[empty message]</div>;
191191

192-
const { content, is_outgoing, date, reply_to_message_id, forward_info, sender } = message;
192+
const { content, is_outgoing, date, reply_to_message_id, forward_info, sender_id } = message;
193193

194194
const isOutgoing = is_outgoing && !isChannelChat(chatId);
195195

@@ -263,8 +263,8 @@ class Album extends React.Component {
263263
tile = <EmptyTile small />
264264
} else if (is_outgoing) {
265265
tile = <EmptyTile small />
266-
} else if (sender.user_id) {
267-
tile = <UserTile small userId={sender.user_id} onSelect={this.handleSelectUser} />;
266+
} else if (sender_id.user_id) {
267+
tile = <UserTile small userId={sender_id.user_id} onSelect={this.handleSelectUser} />;
268268
} else {
269269
tile = <ChatTile small chatId={chatId} onSelect={this.handleSelectChat} />;
270270
}
@@ -322,7 +322,7 @@ class Album extends React.Component {
322322
{withBubble && ((showTitle && !suppressTitle) || showForward) && (
323323
<div className='message-title'>
324324
{showTitle && !showForward && (
325-
<MessageAuthor sender={sender} forwardInfo={forward_info} openChat openUser />
325+
<MessageAuthor sender={sender_id} forwardInfo={forward_info} openChat openUser />
326326
)}
327327
{showForward && <Forward forwardInfo={forward_info} />}
328328
</div>

‎src/Components/Message/Markup/KeyboardButton.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class KeyboardButton extends React.Component {
3131

3232
handleCallbackQueryAnswer = (type, result, message) => {
3333
const { chatId } = this.props;
34-
const { sender, content, via_bot_user_id } = message;
34+
const { sender_id, content, via_bot_user_id } = message;
3535
const { text, show_alert, url } = result;
3636
const { game } = content;
3737

@@ -68,7 +68,7 @@ class KeyboardButton extends React.Component {
6868
}
6969
} else if (url) {
7070
if (type['@type'] === 'inlineKeyboardButtonTypeCallbackGame') {
71-
const userId = via_bot_user_id ? via_bot_user_id : sender.user_id;
71+
const userId = via_bot_user_id ? via_bot_user_id : sender_id.user_id;
7272
const user = UserStore.get(userId);
7373

7474
showOpenGameAlert(game, { message, url, userId, isVerified: user && user.is_verified });
@@ -102,7 +102,7 @@ class KeyboardButton extends React.Component {
102102
const message = MessageStore.get(chatId, messageId);
103103
if (!message) break;
104104

105-
const { sender, content, via_bot_user_id } = message;
105+
const { sender_id, content, via_bot_user_id } = message;
106106
if (!content) break;
107107

108108
let payload = null;
@@ -218,8 +218,8 @@ class KeyboardButton extends React.Component {
218218
const message = MessageStore.get(chatId, messageId);
219219
if (!message) break;
220220

221-
const { sender, via_bot_user_id } = message;
222-
let userId = sender.user_id;
221+
const { sender_id, via_bot_user_id } = message;
222+
let userId = sender_id.user_id;
223223
if (via_bot_user_id !== 0) {
224224
userId = via_bot_user_id;
225225
}

‎src/Components/Message/Media/Call.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class Call extends React.Component {
2525
if (!message) return null;
2626

2727
const { duration, is_video, discard_reason } = call;
28-
const { sender, content, is_outgoing } = message;
28+
const { sender_id, content, is_outgoing } = message;
2929

30-
const callTitle = getCallContent(sender, content);
30+
const callTitle = getCallContent(sender_id, content);
3131
const durationString = duration > 0 ? ', ' + LStore.formatCallDuration(Math.floor(duration || 0)) : '';
3232

3333
return (

‎src/Components/Message/Message.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ class Message extends Component {
378378
const message = MessageStore.get(chatId, messageId);
379379
if (!message) return <div>[empty message]</div>;
380380

381-
const { content, is_outgoing, date, reply_to_message_id, forward_info, sender, reply_markup } = message;
381+
const { content, is_outgoing, date, reply_to_message_id, forward_info, sender_id, reply_markup } = message;
382382

383383
const isOutgoing = is_outgoing && !isChannelChat(chatId);
384384
const inlineMeta = (
@@ -438,8 +438,8 @@ class Message extends Component {
438438
tile = <EmptyTile small />
439439
} else if (is_outgoing) {
440440
tile = <EmptyTile small />
441-
} else if (sender.user_id) {
442-
tile = <UserTile small userId={sender.user_id} onSelect={this.handleSelectUser} />;
441+
} else if (sender_id.user_id) {
442+
tile = <UserTile small userId={sender_id.user_id} onSelect={this.handleSelectUser} />;
443443
} else {
444444
tile = <ChatTile small chatId={chatId} onSelect={this.handleSelectChat} />;
445445
}
@@ -510,7 +510,7 @@ class Message extends Component {
510510
{withBubble && ((showTitle && !suppressTitle) || showForward) && (
511511
<div className='message-title'>
512512
{showTitle && !showForward && (
513-
<MessageAuthor sender={sender} forwardInfo={forward_info} openChat openUser/>
513+
<MessageAuthor sender={sender_id} forwardInfo={forward_info} openChat openUser/>
514514
)}
515515
{showForward && <Forward forwardInfo={forward_info} />}
516516
</div>

‎src/Components/Message/MessageGroup.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class MessageGroup extends Component {
8888
let messages = this.props.messages;
8989
if (!messages) return <div>[empty group]</div>;
9090

91-
let user = UserStore.get(this.props.messages[0].sender.user_id);
91+
let user = UserStore.get(this.props.messages[0].sender_id.user_id);
9292

9393
const groupContent = this.props.messages.map(x => (
9494
<Message
@@ -104,7 +104,7 @@ class MessageGroup extends Component {
104104
{user && (
105105
<div className='group-sender'>
106106
<div className='group-tile'>
107-
<UserTile userId={this.props.messages[0].sender.user_id} />
107+
<UserTile userId={this.props.messages[0].sender_id.user_id} />
108108
</div>
109109
</div>
110110
)}

0 commit comments

Comments
 (0)