Skip to content

Commit 0f8b76f

Browse files
BurhanverseBurhanverse
committed
Merge tdesktop v6.3.10.beta
Signed-off-by: Burhanverse <contact@burhanverse.eu.org>
1 parent 905fdba commit 0f8b76f

205 files changed

Lines changed: 1711 additions & 1071 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/linux.yml renamed to .github/workflows/build-linux.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
name: Linux
1+
name: Build Linux
22

33
on:
44
workflow_dispatch:
55
inputs:
66
tagname:
7-
description: 'tagname'
7+
description: "tagname"
88
type: string
99
required: true
1010
build_type:
11-
description: 'Build type'
11+
description: "Build type"
1212
type: choice
1313
required: true
14-
default: 'ci'
14+
default: "ci"
1515
options:
1616
- ci
1717
- rel
@@ -64,7 +64,7 @@ jobs:
6464
run: |
6565
cd out/install
6666
tar -czvf fagram-${{ env.TAGNAME }}.tar.gz usr
67-
67+
6868
- name: Extract changelog for release
6969
if: github.event.inputs.build_type == 'rel'
7070
run: |
@@ -78,10 +78,10 @@ jobs:
7878
}
7979
found && /^-/ { print; }
8080
found && /^—/ { print; }' changelog.txt > body.txt
81-
81+
8282
echo "Release body:"
8383
cat body.txt
84-
84+
8585
- name: Upload artifact
8686
uses: actions/upload-artifact@v6
8787
with:
@@ -111,4 +111,4 @@ jobs:
111111
with:
112112
token: ${{ secrets.PAT }}
113113
repository: burhancodes/fagram-rpm
114-
event-type: new-release
114+
event-type: new-release

‎.github/workflows/win.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
SDK="$(grep "SDK version" $DOCPATH | sed -r 's/.*\*\*(.*)\*\* SDK version.*/\1/')"
4949
echo "SDK=$SDK" >> $GITHUB_ENV
5050
51+
sed -i '/CMAKE_${lang}_FLAGS_DEBUG_INIT/s/${_Zi}//' "$PROGRAMFILES"/CMake/share/cmake*/Modules/Platform/Windows-MSVC.cmake
52+
5153
echo "$(sha256sum $TBUILD/$REPO_NAME/$PREPARE_PATH | awk '{ print $1 }')" >> CACHE_KEY.txt
5254
echo "$SDK" >> CACHE_KEY.txt
5355
echo "CACHE_KEY=$(sha256sum CACHE_KEY.txt | awk '{ print $1 }')" >> $GITHUB_ENV
@@ -102,14 +104,14 @@ jobs:
102104
*) ARCH="${{ matrix.arch }}";;
103105
esac
104106
echo "Architecture from matrix: $ARCH"
105-
ARTIFACT_NAME="${ARTIFACT_NAME}_${{ matrix.arch }}"
107+
ARTIFACT_NAME="${ARTIFACT_NAME} ${{ matrix.arch }}"
106108
fi
107109
108110
GENERATOR=""
109111
if [ -n "${{ matrix.generator }}" ]; then
110112
GENERATOR="-G \"${{ matrix.generator }}\""
111113
echo "Generator from matrix: $GENERATOR"
112-
ARTIFACT_NAME="${ARTIFACT_NAME}_${{ matrix.generator }}"
114+
ARTIFACT_NAME="${ARTIFACT_NAME} ${{ matrix.generator }}"
113115
fi
114116
echo "TDESKTOP_BUILD_GENERATOR=$GENERATOR" >> $GITHUB_ENV
115117
@@ -120,7 +122,7 @@ jobs:
120122
if [ -n "${{ matrix.defines }}" ]; then
121123
DEFINE="-D ${{ matrix.defines }}=ON"
122124
echo "Define from matrix: $DEFINE"
123-
ARTIFACT_NAME="${ARTIFACT_NAME}_${{ matrix.defines }}"
125+
ARTIFACT_NAME="${ARTIFACT_NAME} ${{ matrix.defines }}"
124126
fi
125127
echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV
126128
@@ -134,11 +136,8 @@ jobs:
134136
echo "TDESKTOP_BUILD_API=$API" >> $GITHUB_ENV
135137
136138
- name: Free up some disk space.
137-
run: |
138-
cd %TBUILD%
139-
del /S Libraries\*.pdb
140-
del /S Libraries\*.pch
141-
del /S Libraries\*.obj
139+
shell: bash
140+
run: find TBuild/Libraries '(' '(' ! '(' -name '*.lib' -o -name '*.a' -o -name '*.exe' -o -name '*.h' -o -name '*.hpp' -o -name '*.inc' -o -name '*.cmake' -o -path '*/include/*' -o -path '*/objects-*' -o -path '*/cache_keys/*' -o -path '*/patches/*' ')' -type f ')' -o -empty ')' -delete
142141

143142
- name: FAgram Desktop build.
144143
if: env.ONLY_CACHE == 'false'

‎Telegram/Resources/animations/ban.tgs‎

2.23 KB
Binary file not shown.

‎Telegram/Resources/langs/lang.strings‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,6 +2662,7 @@ https://github.com/fajox1/fagramdesktop/blob/master/LEGAL
26622662
"lng_forwarded_story" = "Story from {user}";
26632663
"lng_forwarded_story_expired" = "This story has expired.";
26642664
"lng_forwarded_date" = "Original: {date}";
2665+
"lng_forwarded_saved_date" = "Saved date: {date}";
26652666
"lng_forwarded_channel" = "Forwarded from {channel}";
26662667
"lng_forwarded_psa_default" = "Forwarded from {channel}";
26672668
"lng_forwarded_via" = "Forwarded from {user} via {inline_bot}";
@@ -3834,6 +3835,8 @@ https://github.com/fajox1/fagramdesktop/blob/master/LEGAL
38343835
"lng_gift_unique_backdrop" = "Backdrop";
38353836
"lng_gift_unique_symbol" = "Symbol";
38363837
"lng_gift_unique_rarity" = "Only {percent} of such collectibles have this attribute.";
3838+
"lng_gift_unique_sender" = "{from} sent you this gift on {date}";
3839+
"lng_gift_unique_sender_you" = "You bought this gift on {date}";
38373840
"lng_gift_unique_availability_label" = "Quantity";
38383841
"lng_gift_unique_availability#one" = "{count} of {amount} issued";
38393842
"lng_gift_unique_availability#other" = "{count} of {amount} issued";
@@ -7432,6 +7435,7 @@ https://github.com/fajox1/fagramdesktop/blob/master/LEGAL
74327435
"lng_mac_menu_player_resume" = "Resume";
74337436
"lng_mac_menu_player_next" = "Next";
74347437
"lng_mac_menu_player_previous" = "Previous";
7438+
"lng_mac_menu_profiles" = "Profiles";
74357439

74367440
"lng_mac_touchbar_favorite_stickers" = "Favorite stickers";
74377441

‎Telegram/Resources/qrc/telegram/animations.qrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<file alias="show_or_premium_lastseen.tgs">../../animations/show_or_premium_lastseen.tgs</file>
5252
<file alias="show_or_premium_readtime.tgs">../../animations/show_or_premium_readtime.tgs</file>
5353
<file alias="passkeys.tgs">../../animations/passkeys.tgs</file>
54+
<file alias="ban.tgs">../../animations/ban.tgs</file>
5455

5556
<file alias="profile_muting.tgs">../../animations/profile/profile_muting.tgs</file>
5657
<file alias="profile_unmuting.tgs">../../animations/profile/profile_unmuting.tgs</file>

‎Telegram/SourceFiles/api/api_blocked_peers.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void BlockedPeers::block(not_null<PeerData*> peer) {
8383
}
8484
const auto requestId = _api.request(MTPcontacts_Block(
8585
MTP_flags(0),
86-
peer->input
86+
peer->input()
8787
)).done([=] {
8888
const auto data = _blockRequests.take(peer);
8989
peer->setIsBlocked(true);
@@ -127,7 +127,7 @@ void BlockedPeers::unblock(
127127
}
128128
const auto requestId = _api.request(MTPcontacts_Unblock(
129129
MTP_flags(0),
130-
peer->input
130+
peer->input()
131131
)).done([=] {
132132
const auto data = _blockRequests.take(peer);
133133
peer->setIsBlocked(false);

‎Telegram/SourceFiles/api/api_bot.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void SendBotCallbackData(
9191
const auto show = controller->uiShow();
9292
button->requestId = api->request(MTPmessages_GetBotCallbackAnswer(
9393
MTP_flags(flags),
94-
history->peer->input,
94+
history->peer->input(),
9595
MTP_int(item->id),
9696
MTP_bytes(sendData),
9797
password ? password->result : MTP_inputCheckPasswordEmpty()
@@ -421,13 +421,13 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
421421
const auto id = int32(button->buttonId);
422422
const auto chosen = [=](std::vector<not_null<PeerData*>> result) {
423423
peer->session().api().request(MTPmessages_SendBotRequestedPeer(
424-
peer->input,
424+
peer->input(),
425425
MTP_int(itemId),
426426
MTP_int(id),
427427
MTP_vector_from_range(
428428
result | ranges::views::transform([](
429429
not_null<PeerData*> peer) {
430-
return MTPInputPeer(peer->input);
430+
return MTPInputPeer(peer->input());
431431
}))
432432
)).done([=](const MTPUpdates &result) {
433433
peer->session().api().applyUpdates(result);

‎Telegram/SourceFiles/api/api_chat_filters.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ void ImportInvite(
237237
fail(error.type());
238238
};
239239
auto inputs = peers | ranges::views::transform([](auto peer) {
240-
return MTPInputPeer(peer->input);
240+
return MTPInputPeer(peer->input());
241241
}) | ranges::to<QVector<MTPInputPeer>>();
242242
if (!slug.isEmpty()) {
243243
api->request(MTPchatlists_JoinChatlistInvite(

‎Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void RemoveChatFilter(
4444
MTP_vector<MTPInputPeer>(ranges::views::all(
4545
leave
4646
) | ranges::views::transform([](not_null<PeerData*> peer) {
47-
return MTPInputPeer(peer->input);
47+
return MTPInputPeer(peer->input());
4848
}) | ranges::to<QVector<MTPInputPeer>>())
4949
)).done([=](const MTPUpdates &result) {
5050
api->applyUpdates(result);

‎Telegram/SourceFiles/api/api_chat_participants.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ void ChatParticipants::requestForAdd(
422422

423423
_forAdd.channel = channel;
424424
_forAdd.requestId = _api.request(MTPchannels_GetParticipants(
425-
channel->inputChannel,
425+
channel->inputChannel(),
426426
MTP_channelParticipantsRecent(),
427427
MTP_int(offset),
428428
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -450,7 +450,7 @@ void ChatParticipants::requestLast(not_null<ChannelData*> channel) {
450450
const auto offset = 0;
451451
const auto participantsHash = uint64(0);
452452
const auto requestId = _api.request(MTPchannels_GetParticipants(
453-
channel->inputChannel,
453+
channel->inputChannel(),
454454
MTP_channelParticipantsRecent(),
455455
MTP_int(offset),
456456
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -480,7 +480,7 @@ void ChatParticipants::requestBots(not_null<ChannelData*> channel) {
480480
const auto offset = 0;
481481
const auto participantsHash = uint64(0);
482482
const auto requestId = _api.request(MTPchannels_GetParticipants(
483-
channel->inputChannel,
483+
channel->inputChannel(),
484484
MTP_channelParticipantsBots(),
485485
MTP_int(offset),
486486
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -516,7 +516,7 @@ void ChatParticipants::requestAdmins(not_null<ChannelData*> channel) {
516516
const auto offset = 0;
517517
const auto participantsHash = uint64(0);
518518
const auto requestId = _api.request(MTPchannels_GetParticipants(
519-
channel->inputChannel,
519+
channel->inputChannel(),
520520
MTP_channelParticipantsAdmins(),
521521
MTP_int(offset),
522522
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -555,8 +555,8 @@ void ChatParticipants::add(
555555
if (const auto chat = peer->asChat()) {
556556
for (const auto &user : users) {
557557
_api.request(MTPmessages_AddChatUser(
558-
chat->inputChat,
559-
user->inputUser,
558+
chat->inputChat(),
559+
user->inputUser(),
560560
MTP_int(passGroupHistory ? kForwardMessagesOnAdd : 0)
561561
)).done([=](const MTPmessages_InvitedUsers &result) {
562562
const auto &data = result.data();
@@ -587,7 +587,7 @@ void ChatParticipants::add(
587587
const auto send = [&] {
588588
const auto callback = base::take(done);
589589
_api.request(MTPchannels_InviteToChannel(
590-
channel->inputChannel,
590+
channel->inputChannel(),
591591
MTP_vector<MTPInputUser>(list)
592592
)).done([=](const MTPmessages_InvitedUsers &result) {
593593
const auto &data = result.data();
@@ -606,7 +606,7 @@ void ChatParticipants::add(
606606
}).afterDelay(kSmallDelayMs).send();
607607
};
608608
for (const auto &user : users) {
609-
list.push_back(user->inputUser);
609+
list.push_back(user->inputUser());
610610
if (list.size() == kMaxUsersPerInvite) {
611611
send();
612612
list.clear();
@@ -653,8 +653,8 @@ void ChatParticipants::Restrict(
653653
Fn<void()> onDone,
654654
Fn<void()> onFail) {
655655
channel->session().api().request(MTPchannels_EditBanned(
656-
channel->inputChannel,
657-
participant->input,
656+
channel->inputChannel(),
657+
participant->input(),
658658
RestrictionsToMTP(newRights)
659659
)).done([=](const MTPUpdates &result) {
660660
channel->session().api().applyUpdates(result);
@@ -692,7 +692,7 @@ void ChatParticipants::requestSelf(not_null<ChannelData*> channel) {
692692
};
693693
_selfParticipantRequests.emplace(channel);
694694
_api.request(MTPchannels_GetParticipant(
695-
channel->inputChannel,
695+
channel->inputChannel(),
696696
MTP_inputPeerSelf()
697697
)).done([=](const MTPchannels_ChannelParticipant &result) {
698698
_selfParticipantRequests.erase(channel);
@@ -742,8 +742,8 @@ void ChatParticipants::kick(
742742

743743
_api.request(MTPmessages_DeleteChatUser(
744744
MTP_flags(0),
745-
chat->inputChat,
746-
participant->asUser()->inputUser
745+
chat->inputChat(),
746+
participant->asUser()->inputUser()
747747
)).done([=](const MTPUpdates &result) {
748748
chat->session().api().applyUpdates(result);
749749
}).send();
@@ -758,8 +758,8 @@ void ChatParticipants::kick(
758758

759759
const auto rights = ChannelData::KickedRestrictedRights(participant);
760760
const auto requestId = _api.request(MTPchannels_EditBanned(
761-
channel->inputChannel,
762-
participant->input,
761+
channel->inputChannel(),
762+
participant->input(),
763763
RestrictionsToMTP(rights)
764764
)).done([=](const MTPUpdates &result) {
765765
channel->session().api().applyUpdates(result);
@@ -782,8 +782,8 @@ void ChatParticipants::unblock(
782782
}
783783

784784
const auto requestId = _api.request(MTPchannels_EditBanned(
785-
channel->inputChannel,
786-
participant->input,
785+
channel->inputChannel(),
786+
participant->input(),
787787
MTP_chatBannedRights(MTP_flags(0), MTP_int(0))
788788
)).done([=](const MTPUpdates &result) {
789789
channel->session().api().applyUpdates(result);
@@ -814,7 +814,7 @@ void ChatParticipants::loadSimilarPeers(not_null<PeerData*> peer) {
814814
_similar[peer].requestId = _api.request(
815815
MTPchannels_GetChannelRecommendations(
816816
MTP_flags(Flag::f_channel),
817-
channel->inputChannel)
817+
channel->inputChannel())
818818
).done([=](const MTPmessages_Chats &result) {
819819
auto &similar = _similar[channel];
820820
similar.requestId = 0;
@@ -832,7 +832,7 @@ void ChatParticipants::loadSimilarPeers(not_null<PeerData*> peer) {
832832
}).send();
833833
} else if (const auto bot = peer->asBot()) {
834834
_similar[peer].requestId = _api.request(
835-
MTPbots_GetBotRecommendations(bot->inputUser)
835+
MTPbots_GetBotRecommendations(bot->inputUser())
836836
).done([=](const MTPusers_Users &result) {
837837
auto &similar = _similar[peer];
838838
similar.requestId = 0;

0 commit comments

Comments
 (0)