mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-03 07:56:03 +00:00
Code Issues Releases Wiki Activity

Comment out non-folder feed code.

Browse Source
This commit is contained in:
John Preston
2019-04-15 15:54:03 +04:00
parent 905a024aed
commit 9bf8a8108d
57 changed files with 1392 additions and 1459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Telegram/SourceFiles/window/window_controller.cpp
View File

@@ -14,10 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h"
#include "history/history_item.h"
#include "history/view/history_view_element.h"
#include "history/feed/history_feed_section.h"
//#include "history/feed/history_feed_section.h" // #feed
#include "data/data_media_types.h"
#include "data/data_session.h"
#include "data/data_feed.h"
#include "data/data_folder.h"
#include "data/data_channel.h"
#include "data/data_chat.h"
#include "passport/passport_form_controller.h"
@@ -160,12 +160,12 @@ bool Controller::jumpToChatListEntry(Dialogs::RowDescriptor row) {
if (const auto history = row.key.history()) {
Ui::showPeerHistory(history, row.fullId.msg);
return true;
} else if (const auto feed = row.key.feed()) {
if (const auto item = App::histItemById(row.fullId)) {
showSection(HistoryFeed::Memento(feed, item->position()));
} else {
showSection(HistoryFeed::Memento(feed));
}
//} else if (const auto feed = row.key.feed()) { // #feed
// if (const auto item = App::histItemById(row.fullId)) {
// showSection(HistoryFeed::Memento(feed, item->position()));
// } else {
// showSection(HistoryFeed::Memento(feed));
// }
}
return false;
}
@@ -465,12 +465,12 @@ void Controller::showJumpToDate(Dialogs::Key chat, QDate requestedDate) {
} else if (history->chatListTimeId() != 0) {
return ParseDateTime(history->chatListTimeId()).date();
}
} else if (const auto feed = chat.feed()) {
/*if (chatScrollPosition(feed)) { // #TODO feeds save position
//} else if (const auto feed = chat.feed()) { // #feed
// if (chatScrollPosition(feed)) { // #TODO feeds save position
} else */if (feed->chatListTimeId() != 0) {
return ParseDateTime(feed->chatListTimeId()).date();
}
// } else if (feed->chatListTimeId() != 0) {
// return ParseDateTime(feed->chatListTimeId()).date();
// }
}
return QDate::currentDate();
};
@@ -482,10 +482,10 @@ void Controller::showJumpToDate(Dialogs::Key chat, QDate requestedDate) {
if (history && history->chatListTimeId() != 0) {
return ParseDateTime(history->chatListTimeId()).date();
}
} else if (const auto feed = chat.feed()) {
if (feed->chatListTimeId() != 0) {
return ParseDateTime(feed->chatListTimeId()).date();
}
//} else if (const auto feed = chat.feed()) { // #feed
// if (feed->chatListTimeId() != 0) {
// return ParseDateTime(feed->chatListTimeId()).date();
// }
}
return QDate::currentDate();
};
@@ -512,8 +512,8 @@ void Controller::showJumpToDate(Dialogs::Key chat, QDate requestedDate) {
}
return QDate::currentDate();
}
} else if (const auto feed = chat.feed()) {
return startDate();
//} else if (const auto feed = chat.feed()) { // #feed
// return startDate();
}
return startDate();
};