mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Updated TDesktop sources to 2.8.11

Browse Source
This commit is contained in:
RadRussianRus
2021-07-18 23:19:37 +03:00
parent f28b9ccf0c 77d8c7ce01
commit 315c0264ab
22 changed files with 81 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/uwp/AppX/AppxManifest.xml
View File

@@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="2.8.8.0" />
Version="2.8.11.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

8
Telegram/Resources/winrc/Telegram.rc
View File

@@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,8,8,0
PRODUCTVERSION 2,8,8,0
FILEVERSION 2,8,11,0
PRODUCTVERSION 2,8,11,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "2.8.8.0"
VALUE "FileVersion", "2.8.11.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2021"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "2.8.8.0"
VALUE "ProductVersion", "2.8.11.0"
END
END
BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,8,8,0
PRODUCTVERSION 2,8,8,0
FILEVERSION 2,8,11,0
PRODUCTVERSION 2,8,11,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "2.8.8.0"
VALUE "FileVersion", "2.8.11.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2021"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "2.8.8.0"
VALUE "ProductVersion", "2.8.11.0"
END
END
BLOCK "VarFileInfo"

4
Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
View File

@@ -309,9 +309,9 @@ void FilterChatsPreview::paintEvent(QPaintEvent *e) {
}
if (user->isBot()) {
statuses << tr::lng_status_bot(tr::now);
} else if (flags & MTPDuser::Flag::f_mutual_contact) {
} else if (flags & UserDataFlag::MutualContact) {
statuses << tr::ktg_status_mutual_contact(tr::now);
} else if (flags & MTPDuser::Flag::f_contact) {
} else if (flags & UserDataFlag::Contact) {
statuses << tr::ktg_status_contact(tr::now);
} else {
statuses << tr::ktg_status_non_contact(tr::now);

8
Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
View File

@@ -186,16 +186,16 @@ auto Dependencies(ChatRestrictions)
{ Flag::EmbedLinks, Flag::SendMessages },
// send_games -> send_messages
{ Flag::SendGames, Flag::f_send_messages },
{ Flag::SendGames, Flag::SendMessages },
// send_gifs -> send_messages
{ Flag::SendGifs, Flag::f_send_messages },
{ Flag::SendGifs, Flag::SendMessages },
// send_inline -> send_messages
{ Flag::SendInline, Flag::f_send_messages },
{ Flag::SendInline, Flag::SendMessages },
// send_stickers -> send_messages
{ Flag::SendStickers, Flag::f_send_messages },
{ Flag::SendStickers, Flag::SendMessages },
// send_media -> send_messages
{ Flag::SendMedia, Flag::SendMessages },

2
Telegram/SourceFiles/boxes/sticker_set_box.cpp
View File

@@ -388,7 +388,7 @@ bool StickerSetBox::showMenu(not_null<Ui::IconButton*> button) {
if (!_inner->notInstalled()) {
const auto archive = [=] {
archiveStickers();
_inner->archiveStickers();
closeBox();
};
_menu->addAction(tr::lng_stickers_archive_pack(tr::now), archive);

4
Telegram/SourceFiles/core/version.h
View File

@@ -23,7 +23,7 @@ constexpr auto AppId = "{C4A4AE8F-B9F7-4CC7-8A6C-BF7EEE87ACA5}"_cs;
constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
constexpr auto AppName = "Kotatogram Desktop"_cs;
constexpr auto AppFile = "Kotatogram"_cs;
constexpr auto AppVersion = 2008008;
constexpr auto AppVersionStr = "2.8.8";
constexpr auto AppVersion = 2008011;
constexpr auto AppVersionStr = "2.8.11";
constexpr auto AppBetaVersion = false;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

6
Telegram/SourceFiles/data/data_peer.cpp
View File

@@ -1097,9 +1097,9 @@ std::vector<ChatRestrictions> ListOfRestrictions() {
return {
Flag::SendMessages,
Flag::SendMedia,
Flag::SendStickers
Flag::SendGifs
Flag::SendGames
Flag::SendStickers,
Flag::SendGifs,
Flag::SendGames,
Flag::SendInline,
Flag::EmbedLinks,
Flag::SendPolls,

12
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
View File

@@ -1383,7 +1383,7 @@ void InnerWidget::suggestRestrictUser(not_null<UserData*> user) {
_menu->addAction(tr::lng_context_remove_from_group(tr::now), [=] {
const auto text = tr::lng_profile_sure_kick(tr::now, lt_user, user->firstName);
auto editRestrictions = [=](bool hasAdminRights, const MTPChatBannedRights &currentRights) {
auto editRestrictions = [=](bool hasAdminRights, ChatRestrictionsInfo currentRights) {
auto weak = QPointer<InnerWidget>(this);
auto weakBox = std::make_shared<QPointer<ConfirmBox>>();
auto box = Box<ConfirmBox>(
@@ -1393,7 +1393,7 @@ void InnerWidget::suggestRestrictUser(not_null<UserData*> user) {
if (weak) {
weak->restrictUser(user,
currentRights,
ChannelData::KickedRestrictedRights(user));
ChatRestrictionsInfo());
}
if (*weakBox) {
(*weakBox)->closeBox();
@@ -1404,7 +1404,7 @@ void InnerWidget::suggestRestrictUser(not_null<UserData*> user) {
Ui::LayerOption::KeepOther);
};
if (base::contains(_admins, user)) {
editRestrictions(true, ChannelData::EmptyRestrictedRights(user));
editRestrictions(true, ChatRestrictionsInfo());
} else {
_api.request(MTPchannels_GetParticipant(
_channel->inputChannel,
@@ -1417,15 +1417,15 @@ void InnerWidget::suggestRestrictUser(not_null<UserData*> user) {
auto type = participant.vparticipant().type();
if (type == mtpc_channelParticipantBanned) {
auto &banned = participant.vparticipant().c_channelParticipantBanned();
editRestrictions(false, banned.vbanned_rights());
editRestrictions(false, ChatRestrictionsInfo(banned.vbanned_rights()));
} else {
auto hasAdminRights = (type == mtpc_channelParticipantAdmin)
|| (type == mtpc_channelParticipantCreator);
auto bannedRights = ChannelData::EmptyRestrictedRights(user);
auto bannedRights = ChatRestrictionsInfo();
editRestrictions(hasAdminRights, bannedRights);
}
}).fail([=](const MTP::Error &error) {
auto bannedRights = ChannelData::EmptyRestrictedRights(user);
auto bannedRights = ChatRestrictionsInfo();
editRestrictions(false, bannedRights);
}).send();
}

2
Telegram/SourceFiles/history/history_widget.cpp
View File

@@ -3556,7 +3556,7 @@ bool HistoryWidget::hasDiscussionGroup() const {
const auto channel = _peer ? _peer->asChannel() : nullptr;
return channel
&& channel->isBroadcast()
&& (channel->flags() & MTPDchannel::Flag::f_has_link);
&& (channel->flags() & ChannelDataFlag::HasLink);
}
void HistoryWidget::reportSelectedMessages() {

6
Telegram/SourceFiles/mainwindow.cpp
View File

@@ -709,12 +709,6 @@ void MainWindow::updateTrayMenu() {
}
_updateTrayMenuTextActions.fire({});
auto soundAction = actions.at(2);
auto soundActionText = Core::App().settings().soundNotify()
? tr::ktg_settings_disable_sound_from_tray(tr::now)
: tr::ktg_settings_enable_sound_from_tray(tr::now);
soundAction->setText(soundActionText);
psTrayMenuUpdated();
}

6
Telegram/SourceFiles/mtproto/mtproto_dc_options.cpp
View File

@@ -19,6 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace MTP {
namespace {
constexpr auto kVersion = 2;
using namespace details;
struct BuiltInDc {
@@ -437,8 +439,6 @@ QByteArray DcOptions::serialize() const {
}
}
constexpr auto kVersion = 1;
auto result = QByteArray();
result.reserve(size);
{
@@ -541,7 +541,7 @@ bool DcOptions::constructFromSerialized(const QByteArray &serialized) {
}
// Read CDN config
if (!stream.atEnd()) {
if (!stream.atEnd() && version > 1) {
auto count = qint32(0);
stream >> count;
if (stream.status() != QDataStream::Ok) {

4
Telegram/SourceFiles/platform/win/main_window_win.cpp
View File

@@ -386,10 +386,10 @@ void MainWindow::updateIconCounters() {
// Force Qt to use right icon size, not the larger one.
QIcon forTrayIcon;
auto forTrayIcon16 = cDisableTrayCounter()
? App::pixmapFromImageInPlace(iconWithCounter(16, 0, bg, fg, true))
? Ui::PixmapFromImage(iconWithCounter(16, 0, bg, fg, true))
: iconSmallPixmap16;
auto forTrayIcon32 = cDisableTrayCounter()
? App::pixmapFromImageInPlace(iconWithCounter(32, 0, bg, fg, true))
? Ui::PixmapFromImage(iconWithCounter(32, 0, bg, fg, true))
: iconSmallPixmap32;
forTrayIcon.addPixmap(iconSizeSmall.width() >= 20 ? forTrayIcon32 : forTrayIcon16);
trayIcon->setIcon(forTrayIcon);

19
Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
View File

@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/streaming/media_streaming_instance.h"
#include "media/streaming/media_streaming_loader_local.h"
#include "media/streaming/media_streaming_player.h"
#include "styles/style_boxes.h"
namespace Ui {
namespace {
@@ -87,7 +88,23 @@ ItemSingleMediaPreview::ItemSingleMediaPreview(
session->downloaderTaskFinished()
) | rpl::start_with_next([=] {
const auto computed = computeThumbInfo();
if (computed.loaded) {
if (!computed.image) {
if (_documentMedia && !_documentMedia->owner()->hasThumbnail()) {
const auto size = _documentMedia->owner()->dimensions.scaled(
st::sendMediaPreviewSize,
st::confirmMaxHeight,
Qt::KeepAspectRatio);
if (!size.isEmpty()) {
auto empty = QImage(
size,
QImage::Format_ARGB32_Premultiplied);
empty.fill(Qt::black);
preparePreview(empty);
}
_lifetimeDownload.destroy();
}
return;
} else if (computed.loaded) {
_lifetimeDownload.destroy();
}
preparePreview(computed.image->original());

6
Telegram/build/docker/centos_env/Dockerfile
View File

@@ -29,8 +29,10 @@ ENV LibrariesPath /usr/src/Libraries
WORKDIR $LibrariesPath
FROM builder AS patches
ADD https://api.github.com/repos/desktop-app/patches/git/refs/heads/master patches-version.json
RUN git clone --depth=1 $GIT/desktop-app/patches.git
RUN git clone $GIT/desktop-app/patches.git
WORKDIR patches
RUN git checkout 87a2e9ee07
FROM builder AS extra-cmake-modules

8
Telegram/build/version
View File

@@ -1,7 +1,7 @@
AppVersion 2008008
AppVersion 2008011
AppVersionStrMajor 2.8
AppVersionStrSmall 2.8.8
AppVersionStr 2.8.8
AppVersionStrSmall 2.8.11
AppVersionStr 2.8.11
BetaChannel 0
AlphaVersion 0
AppVersionOriginal 2.8.8
AppVersionOriginal 2.8.11

2
Telegram/lib_base

Submodule Telegram/lib_base updated: 18c33435cd...df2331b996

2
Telegram/lib_ui

Submodule Telegram/lib_ui updated: 075d2ff49a...2f8789f265

14
changelog.txt
View File

@@ -1,3 +1,17 @@
2.8.11 (17.07.21)
- Check shader compilation / linking before using ANGLE.
2.8.10 (16.07.21)
- Fix media loading.
2.8.9 (16.07.21)
- Fix GIF caption edit.
- Fix version on Windows without SetDefaultDllDirectories.
- Fix fonts on Linux.
2.8.8 (15.07.21)
- Added an image editor. Crop photos or highlight parts of screenshots before sending.

4
docs/building-msvc-x64.md
View File

@@ -34,7 +34,7 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd ThirdParty
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 4409bae
git checkout 87a2e9ee07
cd ../
git clone https://chromium.googlesource.com/external/gyp
cd gyp
@@ -55,7 +55,7 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 4409bae
git checkout 87a2e9ee07
cd ..
git clone https://github.com/desktop-app/lzma.git

4
docs/building-msvc.md
View File

@@ -34,7 +34,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd ThirdParty
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 4409bae
git checkout 87a2e9ee07
cd ../
git clone https://chromium.googlesource.com/external/gyp
cd gyp
@@ -55,7 +55,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 4409bae
git checkout 87a2e9ee07
cd ..
git clone https://github.com/desktop-app/lzma.git

4
docs/building-xcode.md
View File

@@ -29,7 +29,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 51a9fc5
git checkout 87a2e9ee07
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -58,7 +58,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 51a9fc5
git checkout 87a2e9ee07
cd ..
git clone https://git.tukaani.org/xz.git