FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-25 06:54:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.15.0' into dev

Browse Source 
# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/dialogs/dialogs_row.cpp
#	Telegram/SourceFiles/dialogs/dialogs_widget.cpp
#	Telegram/SourceFiles/history/view/history_view_message.cpp
#	Telegram/SourceFiles/info/profile/info_profile_actions.cpp
#	Telegram/lib_ui
#	snap/snapcraft.yaml
This commit is contained in:
ZavaruKitsu
2024-02-18 21:37:55 +03:00
parent b8dda54e04 cb065146c2
commit 43b0df3f94
200 changed files with 3605 additions and 1270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+10 -10
View File
@@ -532,6 +532,16 @@ void Widget::chosenRow(const ChosenRow &row) {
topic,
row.message.fullId.msg,
Window::SectionShow::Way::ClearStack);
} else if (history
&& row.userpicClick
&& (row.message.fullId.msg == ShowAtUnreadMsgId)
&& history->peer->hasActiveStories()
&& !history->peer->isSelf()) {
const auto settings = &AyuSettings::getInstance();
if (!settings->disableStories) {
controller()->openPeerStories(history->peer->id);
}
return;
} else if (history
&& history->isForum()
&& !row.message.fullId
@@ -561,17 +571,7 @@ void Widget::chosenRow(const ChosenRow &row) {
}
return;
} else if (history) {
const auto settings = &AyuSettings::getInstance();
const auto peer = history->peer;
if (row.message.fullId.msg == ShowAtUnreadMsgId) {
if (row.userpicClick
&& peer->hasActiveStories()
&& !peer->isSelf()
&& !settings->disableStories) {
controller()->openPeerStories(peer->id);
return;
}
}
const auto showAtMsgId = controller()->uniqueChatsInSearchResults()
? ShowAtUnreadMsgId
: row.message.fullId.msg;