update patch

3 files changed, 67 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d46e9a20aba..9e92dd989497 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kotatogram-dev-git
 	pkgdesc = Kotatogram – experimental Telegram Desktop fork - Dev branch
-	pkgver = k1.4.8.r521.gd35d97355
-	pkgrel = 1
+	pkgver = k1.4.9.r0.ge5dcf48d4
+	pkgrel = 2
 	url = https://kotatogram.github.io
 	arch = x86_64
 	license = GPL3
@@ -133,7 +133,7 @@ pkgbase = kotatogram-dev-git
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = 462900e97b9d7a9d40bc02d3dc7dacd3060cc19af02135065628e38e83835a2fb438581ca78001aaffc27d8b0473a78d39509c35f50e4ebb25607fe9c6bae264
+	b2sums = 63c912c53b7c259d97162f96acdb67a88b625c99ac2144869abc88a08d96e940bfdefcf9478c3c20a95f03c19ac16428e3fa6f6a2fa16a879de29b2856b4b617
 	b2sums = 96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f
 
 pkgname = kotatogram-dev-git
diff --git a/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch b/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch
index c409e1481e36..5698362efc4d 100644
--- a/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch
+++ b/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch
@@ -1,4 +1,4 @@
-From 1a636ab4e3dce29a08a32c5282441076fa199f23 Mon Sep 17 00:00:00 2001
+From 51ec84e88a3c60d6ba65ba2400d76eea97ef7745 Mon Sep 17 00:00:00 2001
 From: Ilya Fedin <fedin-ilja2010@ya.ru>
 Date: Sun, 14 Jun 2020 03:25:53 +0400
 Subject: [PATCH] Add an option to hide messages from blocked users in groups
@@ -6,18 +6,16 @@ Subject: [PATCH] Add an option to hide messages from blocked users in groups
 ---
  Telegram/Resources/langs/rewrites/en.json     |  1 +
  Telegram/Resources/langs/rewrites/ru.json     |  1 +
- .../history/history_item_components.cpp       |  7 +++-
- .../SourceFiles/history/history_widget.cpp    | 29 ++++++++++++++
+ .../history/history_item_components.cpp       |  9 ++++-
+ .../SourceFiles/history/history_widget.cpp    | 30 ++++++++++++++
  .../history/view/history_view_element.cpp     |  7 ++++
- Telegram/SourceFiles/kotato/json_settings.cpp |  5 +++
- Telegram/SourceFiles/kotato/settings.cpp      | 11 +++++
- Telegram/SourceFiles/kotato/settings.h        |  4 ++
- Telegram/SourceFiles/kotato/settings_menu.cpp |  1 +
+ .../SourceFiles/kotato/kotato_settings.cpp    |  3 ++
+ .../kotato/kotato_settings_menu.cpp           |  1 +
  Telegram/SourceFiles/main/main_session.cpp    | 40 +++++++++++++++++++
- 10 files changed, 104 insertions(+), 2 deletions(-)
+ 8 files changed, 90 insertions(+), 2 deletions(-)
 
 diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json
-index 846807a44..3d3f8205d 100644
+index e50ac3e25..bd67e4d27 100644
 --- a/Telegram/Resources/langs/rewrites/en.json
 +++ b/Telegram/Resources/langs/rewrites/en.json
 @@ -167,6 +167,7 @@
@@ -29,7 +27,7 @@ index 846807a44..3d3f8205d 100644
  	"ktg_settings_forward_retain_selection": "Retain selection after forward",
  	"ktg_settings_forward_chat_on_click": "Open chat on click",
 diff --git a/Telegram/Resources/langs/rewrites/ru.json b/Telegram/Resources/langs/rewrites/ru.json
-index be0be9f7e..e8085cb45 100644
+index 5f4c7e775..cb1509722 100644
 --- a/Telegram/Resources/langs/rewrites/ru.json
 +++ b/Telegram/Resources/langs/rewrites/ru.json
 @@ -167,6 +167,7 @@
@@ -41,10 +39,18 @@ index be0be9f7e..e8085cb45 100644
  	"ktg_settings_forward_retain_selection": "Сохранять выделение после пересылки",
  	"ktg_settings_forward_chat_on_click": "Открывать чат по клику",
 diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
-index 563cc4bcf..6535a7ba9 100644
+index 09e2fe34e..1939d3570 100644
 --- a/Telegram/SourceFiles/history/history_item_components.cpp
 +++ b/Telegram/SourceFiles/history/history_item_components.cpp
-@@ -355,7 +355,10 @@ void HistoryMessageReply::paint(
+@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+ */
+ #include "history/history_item_components.h"
+ 
++#include "kotato/kotato_settings.h"
+ #include "kotato/kotato_lang.h"
+ #include "base/qt/qt_key_modifiers.h"
+ #include "lang/lang_keys.h"
+@@ -334,7 +335,11 @@ void HistoryMessageReply::paint(
  	p.fillRect(rbar, bar);
  
  	if (w > st::msgReplyBarSkip) {
@@ -52,28 +58,30 @@ index 563cc4bcf..6535a7ba9 100644
 +		auto blocked = replyToMsg
 +			&& replyToMsg->from()->isUser()
 +			&& replyToMsg->from()->asUser()->isBlocked();
-+		if (replyToMsg && (!blocked || !BlockUsersInGroups())) {
++		const auto blockUsersInGroups = ::Kotato::JsonSettings::GetBool("block_users_in_groups");
++		if (replyToMsg && (!blocked || !blockUsersInGroups)) {
  			auto hasPreview = replyToMsg->media() ? replyToMsg->media()->hasReplyPreview() : false;
  			if (hasPreview && w < st::msgReplyBarSkip + st::msgReplyBarSize.height()) {
  				hasPreview = false;
-@@ -402,7 +405,7 @@ void HistoryMessageReply::paint(
+@@ -380,7 +385,7 @@ void HistoryMessageReply::paint(
  			p.setPen(inBubble
  				? stm->msgDateFg
  				: st->msgDateImgFg());
 -			p.drawTextLeft(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2, w + 2 * x, st::msgDateFont->elided(replyToMsgId ? tr::lng_profile_loading(tr::now) : tr::lng_deleted_message(tr::now), w - st::msgReplyBarSkip));
-+			p.drawTextLeft(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2, w + 2 * x, st::msgDateFont->elided((replyToMsgId && (!blocked || !BlockUsersInGroups())) ? tr::lng_profile_loading(tr::now) : tr::lng_deleted_message(tr::now), w - st::msgReplyBarSkip));
++			p.drawTextLeft(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2, w + 2 * x, st::msgDateFont->elided((replyToMsgId && (!blocked || !blockUsersInGroups)) ? tr::lng_profile_loading(tr::now) : tr::lng_deleted_message(tr::now), w - st::msgReplyBarSkip));
  		}
  	}
  }
 diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
-index 4324c7edc..8466e0055 100644
+index c09939134..79e020277 100644
 --- a/Telegram/SourceFiles/history/history_widget.cpp
 +++ b/Telegram/SourceFiles/history/history_widget.cpp
-@@ -641,6 +641,35 @@ HistoryWidget::HistoryWidget(
+@@ -682,6 +682,36 @@ HistoryWidget::HistoryWidget(
  		});
  	}, lifetime());
  
-+	BlockUsersInGroupsChanges(
++	::Kotato::JsonSettings::Events(
++		"block_users_in_groups"
 +	) | rpl::start_with_next([=] {
 +		crl::on_main(this, [=] {
 +			if (_history) {
@@ -102,26 +110,26 @@ index 4324c7edc..8466e0055 100644
 +		});
 +	}, lifetime());
 +
- 	HoverEmojiPanelChanges(
- 	) | rpl::start_with_next([=] {
- 		crl::on_main(this, [=] {
+ 	session().data().animationPlayInlineRequest(
+ 	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+ 		if (const auto view = item->mainView()) {
 diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
-index e588bdb92..ee8133474 100644
+index f6938da0c..975d502ae 100644
 --- a/Telegram/SourceFiles/history/view/history_view_element.cpp
 +++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
-@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
  #include "ui/toast/toast.h"
  #include "ui/toasts/common_toasts.h"
  #include "data/data_session.h"
 +#include "data/data_user.h"
  #include "data/data_groups.h"
  #include "data/data_media_types.h"
- #include "lang/lang_keys.h"
-@@ -477,6 +478,12 @@ bool Element::isHiddenByGroup() const {
+ #include "data/data_sponsored_messages.h"
+@@ -521,6 +522,12 @@ bool Element::isHiddenByGroup() const {
  }
  
  bool Element::isHidden() const {
-+	if (BlockUsersInGroups()
++	if (::Kotato::JsonSettings::GetBool("block_users_in_groups")
 +		&& data()->from()->isUser()
 +		&& data()->from()->asUser()->isBlocked()) {
 +		return true;
@@ -130,80 +138,34 @@ index e588bdb92..ee8133474 100644
  	return isHiddenByGroup();
  }
  
-diff --git a/Telegram/SourceFiles/kotato/json_settings.cpp b/Telegram/SourceFiles/kotato/json_settings.cpp
-index 7b1fab50a..37f657bd4 100644
---- a/Telegram/SourceFiles/kotato/json_settings.cpp
-+++ b/Telegram/SourceFiles/kotato/json_settings.cpp
-@@ -366,6 +366,7 @@ QByteArray GenerateSettingsJson(bool areDefault = false) {
- 	settings.insert(qsl("sticker_scale_both"), StickerScaleBoth());
- 	settings.insert(qsl("adaptive_bubbles"), AdaptiveBubbles());
- 	settings.insert(qsl("big_emoji_outline"), BigEmojiOutline());
-+	settings.insert(qsl("block_users_in_groups"), BlockUsersInGroups());
- 	settings.insert(qsl("always_show_scheduled"), cAlwaysShowScheduled());
- 	settings.insert(qsl("show_chat_id"), ShowChatId());
- 	settings.insert(qsl("show_phone_in_drawer"), cShowPhoneInDrawer());
-@@ -529,6 +530,10 @@ bool Manager::readCustomFile() {
- 		SetBigEmojiOutline(v);
- 	});
- 
-+	ReadBoolOption(settings, "block_users_in_groups", [&](auto v) {
-+		SetBlockUsersInGroups(v);
-+	});
-+
- 	ReadBoolOption(settings, "always_show_scheduled", [&](auto v) {
- 		cSetAlwaysShowScheduled(v);
- 	});
-diff --git a/Telegram/SourceFiles/kotato/settings.cpp b/Telegram/SourceFiles/kotato/settings.cpp
-index e073d96f6..0b2dd5241 100644
---- a/Telegram/SourceFiles/kotato/settings.cpp
-+++ b/Telegram/SourceFiles/kotato/settings.cpp
-@@ -79,6 +79,17 @@ rpl::producer<bool> MonospaceLargeBubblesChanges() {
- 	return gMonospaceLargeBubbles.changes();
- }
- 
-+rpl::variable<bool> gBlockUsersInGroups = false;
-+void SetBlockUsersInGroups(bool enabled) {
-+	gBlockUsersInGroups = enabled;
-+}
-+bool BlockUsersInGroups() {
-+	return gBlockUsersInGroups.current();
-+}
-+rpl::producer<bool> BlockUsersInGroupsChanges() {
-+	return gBlockUsersInGroups.changes();
-+}
-+
- bool gAlwaysShowScheduled = false;
- 
- rpl::variable<int> gShowChatId = 2;
-diff --git a/Telegram/SourceFiles/kotato/settings.h b/Telegram/SourceFiles/kotato/settings.h
-index 6d3a82d9d..dcc98b319 100644
---- a/Telegram/SourceFiles/kotato/settings.h
-+++ b/Telegram/SourceFiles/kotato/settings.h
-@@ -62,6 +62,10 @@ void SetMonospaceLargeBubbles(bool enabled);
- [[nodiscard]] bool MonospaceLargeBubbles();
- [[nodiscard]] rpl::producer<bool> MonospaceLargeBubblesChanges();
- 
-+void SetBlockUsersInGroups(bool enabled);
-+[[nodiscard]] bool BlockUsersInGroups();
-+[[nodiscard]] rpl::producer<bool> BlockUsersInGroupsChanges();
-+
- DeclareSetting(bool, AlwaysShowScheduled);
- 
- void SetShowChatId(int chatIdType);
-diff --git a/Telegram/SourceFiles/kotato/settings_menu.cpp b/Telegram/SourceFiles/kotato/settings_menu.cpp
-index 6c9ab475b..d7760b729 100644
---- a/Telegram/SourceFiles/kotato/settings_menu.cpp
-+++ b/Telegram/SourceFiles/kotato/settings_menu.cpp
-@@ -444,6 +444,7 @@ void SetupKotatoMessages(not_null<Ui::VerticalLayout*> container) {
+diff --git a/Telegram/SourceFiles/kotato/kotato_settings.cpp b/Telegram/SourceFiles/kotato/kotato_settings.cpp
+index 9b0513d82..ebceb4f8f 100644
+--- a/Telegram/SourceFiles/kotato/kotato_settings.cpp
++++ b/Telegram/SourceFiles/kotato/kotato_settings.cpp
+@@ -326,6 +326,9 @@ const std::map<QString, Definition, std::greater<QString>> DefinitionMap {
+ 	{ "big_emoji_outline", {
+ 		.type = SettingType::BoolSetting,
+ 		.defaultValue = true, }},
++	{ "block_users_in_groups", {
++		.type = SettingType::BoolSetting,
++		.defaultValue = true, }},
+ 	{ "sticker_height", {
+ 		.type = SettingType::IntSetting,
+ 		.defaultValue = 170,
+diff --git a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp
+index 88249d0d3..73ef1f8a2 100644
+--- a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp
++++ b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp
+@@ -472,6 +472,7 @@ void SetupKotatoMessages(not_null<Ui::VerticalLayout*> container) {
  	}
  
- 	SettingsMenuSwitch(ktg_settings_emoji_outline, BigEmojiOutline);
-+	SettingsMenuSwitch(ktg_settings_block_users_in_groups, BlockUsersInGroups);
+ 	SettingsMenuJsonSwitch(ktg_settings_emoji_outline, big_emoji_outline);
++	SettingsMenuJsonSwitch(ktg_settings_block_users_in_groups, block_users_in_groups);
  
  	AddSkip(container);
  }
 diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
-index 99e02e2aa..40d4f8fa1 100644
+index 084137b82..cf882a238 100644
 --- a/Telegram/SourceFiles/main/main_session.cpp
 +++ b/Telegram/SourceFiles/main/main_session.cpp
 @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -214,7 +176,7 @@ index 99e02e2aa..40d4f8fa1 100644
  #include "main/main_account.h"
  #include "main/main_domain.h"
  #include "main/main_session_settings.h"
-@@ -61,6 +62,43 @@ constexpr auto kTmpPasswordReserveTime = TimeId(10);
+@@ -68,6 +69,43 @@ constexpr auto kTmpPasswordReserveTime = TimeId(10);
  	return MTP::ConfigFields().internalLinksDomain;
  }
  
@@ -258,7 +220,7 @@ index 99e02e2aa..40d4f8fa1 100644
  } // namespace
  
  Session::Session(
-@@ -149,6 +187,8 @@ Session::Session(
+@@ -158,6 +196,8 @@ Session::Session(
  	_api->requestNotifySettings(MTP_inputNotifyUsers());
  	_api->requestNotifySettings(MTP_inputNotifyChats());
  	_api->requestNotifySettings(MTP_inputNotifyBroadcasts());
@@ -268,5 +230,5 @@ index 99e02e2aa..40d4f8fa1 100644
  
  void Session::setTmpPassword(const QByteArray &password, TimeId validUntil) {
 -- 
-2.33.1
+2.35.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 0f91b7827cd5..d455a6397ed8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=kotatogram-dev-git
 _pkgname=kotatogram-desktop
-pkgver=k1.4.8.r521.gd35d97355
-pkgrel=1
+pkgver=k1.4.9.r0.ge5dcf48d4
+pkgrel=2
 pkgdesc='Kotatogram – experimental Telegram Desktop fork - Dev branch'
 arch=('x86_64')
 url="https://kotatogram.github.io"
@@ -61,7 +61,6 @@ source=("${_pkgname}::git+https://github.com/kotatogram/${_pkgname}.git#branch=d
         "block-sponsored_messages.patch"
         )
 
-
 b2sums=('SKIP'
         'SKIP'
         'SKIP'
@@ -95,9 +94,8 @@ b2sums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        '462900e97b9d7a9d40bc02d3dc7dacd3060cc19af02135065628e38e83835a2fb438581ca78001aaffc27d8b0473a78d39509c35f50e4ebb25607fe9c6bae264'
-        '96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f'
-)
+        '63c912c53b7c259d97162f96acdb67a88b625c99ac2144869abc88a08d96e940bfdefcf9478c3c20a95f03c19ac16428e3fa6f6a2fa16a879de29b2856b4b617'
+        '96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -145,7 +143,7 @@ prepare() {
     git submodule update --init
 
     #patches
-    #patch -p1 < "${srcdir}/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch"
+    patch -p1 < "${srcdir}/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch"
     patch -p1 < "${srcdir}/block-sponsored_messages.patch"
 }