New media type Game added. Display of Game partially supported.

2025-08-31 14:45:14 +00:00 · 2016-09-27 16:37:18 +03:00
parent da49d8440a
commit 90a4b66366
23 changed files with 2241 additions and 812 deletions
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -30,6 +30,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "data/data_abstract_structure.h"
 #include "history/history_service_layout.h"
+#include "history/history_location_manager.h"
 #include "media/media_audio.h"
 #include "inline_bots/inline_bot_layout_item.h"
 #include "application.h"
@@ -44,47 +45,51 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 namespace {
 	App::LaunchState _launchState = App::Launched;

-	UserData *self = 0;
+	UserData *self = nullptr;

-	typedef QHash<PeerId, PeerData*> PeersData;
+	using PeersData = QHash<PeerId, PeerData*>;
 	PeersData peersData;

-	typedef QMap<PeerData*, bool> MutedPeers;
+	using MutedPeers = QMap<PeerData*, bool>;
 	MutedPeers mutedPeers;

-	typedef QMap<PeerData*, bool> UpdatedPeers;
+	using UpdatedPeers = QMap<PeerData*, bool>;
 	UpdatedPeers updatedPeers;

 	PhotosData photosData;
 	DocumentsData documentsData;

-	typedef QHash<LocationCoords, LocationData*> LocationsData;
+	using LocationsData = QHash<LocationCoords, LocationData*>;
 	LocationsData locationsData;

-	typedef QHash<WebPageId, WebPageData*> WebPagesData;
+	using WebPagesData = QHash<WebPageId, WebPageData*>;
 	WebPagesData webPagesData;

+	using GamesData = QHash<GameId, GameData*>;
+	GamesData gamesData;
+
 	PhotoItems photoItems;
 	DocumentItems documentItems;
 	WebPageItems webPageItems;
+	GameItems gameItems;
 	SharedContactItems sharedContactItems;
 	GifItems gifItems;

-	typedef OrderedSet<HistoryItem*> DependentItemsSet;
-	typedef QMap<HistoryItem*, DependentItemsSet> DependentItems;
+	using DependentItemsSet = OrderedSet<HistoryItem*>;
+	using DependentItems = QMap<HistoryItem*, DependentItemsSet>;
 	DependentItems dependentItems;

 	Histories histories;

-	typedef QHash<MsgId, HistoryItem*> MsgsData;
+	using MsgsData = QHash<MsgId, HistoryItem*>;
 	MsgsData msgsData;
-	typedef QMap<ChannelId, MsgsData> ChannelMsgsData;
+	using ChannelMsgsData = QMap<ChannelId, MsgsData>;
 	ChannelMsgsData channelMsgsData;

-	typedef QMap<uint64, FullMsgId> RandomData;
+	using RandomData = QMap<uint64, FullMsgId>;
 	RandomData randomData;

-	typedef QMap<uint64, QPair<PeerId, QString> > SentData;
+	using SentData = QMap<uint64, QPair<PeerId, QString>>;
 	SentData sentData;

 	HistoryItem *hoveredItem = nullptr,
@@ -94,7 +99,7 @@ namespace {
 		*contextItem = nullptr,
 		*mousedItem = nullptr;

-	QPixmap *emoji = 0, *emojiLarge = 0;
+	QPixmap *emoji = nullptr, *emojiLarge = nullptr;
 	style::font monofont;

 	struct CornersPixmaps {
@@ -104,19 +109,19 @@ namespace {
 		QPixmap *p[4];
 	};
 	CornersPixmaps corners[RoundCornersCount];
-	typedef QMap<uint32, CornersPixmaps> CornersMap;
+	using CornersMap = QMap<uint32, CornersPixmaps>;
 	CornersMap cornersMap;
-	QImage *cornersMaskLarge[4] = { 0 }, *cornersMaskSmall[4] = { 0 };
+	QImage *cornersMaskLarge[4] = { nullptr }, *cornersMaskSmall[4] = { nullptr };

-	typedef QMap<uint64, QPixmap> EmojiMap;
+	using EmojiMap = QMap<uint64, QPixmap>;
 	EmojiMap mainEmojiMap;
 	QMap<int32, EmojiMap> otherEmojiMap;

 	int32 serviceImageCacheSize = 0;

-	typedef QLinkedList<PhotoData*> LastPhotosList;
+	using LastPhotosList = QLinkedList<PhotoData*>;
 	LastPhotosList lastPhotos;
-	typedef QHash<PhotoData*, LastPhotosList::iterator> LastPhotosMap;
+	using LastPhotosMap = QHash<PhotoData*, LastPhotosList::iterator>;
 	LastPhotosMap lastPhotosMap;

 	style::color _msgServiceBg;
@@ -1472,7 +1477,7 @@ namespace {
 	DocumentData *feedDocument(const MTPdocument &document, const QPixmap &thumb) {
 		switch (document.type()) {
 		case mtpc_document: {
-			const auto &d(document.c_document());
+			auto &d = document.c_document();
 			return App::documentSet(d.vid.v, 0, d.vaccess_hash.v, d.vversion.v, d.vdate.v, d.vattributes.c_vector().v, qs(d.vmime_type), ImagePtr(thumb, "JPG"), d.vdc_id.v, d.vsize.v, StorageImageLocation());
 		} break;
 		case mtpc_documentEmpty: return App::document(document.c_documentEmpty().vid.v);
@@ -1514,7 +1519,11 @@ namespace {
 		} break;
 		case mtpc_webPagePending: return App::feedWebPage(webpage.c_webPagePending());
 		}
-		return 0;
+		return nullptr;
+	}
+
+	GameData *feedGame(const MTPDgame &game, GameData *convert) {
+		return App::gameSet(game.vid.v, convert, game.vaccess_hash.v, qs(game.vshort_name), qs(game.vtitle), qs(game.vdescription), qs(game.vurl), App::feedPhoto(game.vphoto), game.has_document() ? App::feedDocument(game.vdocument) : nullptr);
 	}

 	UserData *curUser() {
@@ -1754,8 +1763,8 @@ namespace {
 			auto &items = App::documentItems();
 			auto i = items.constFind(result);
 			if (i != items.cend()) {
-				for (auto j = i->cbegin(), e = i->cend(); j != e; ++j) {
-					j.key()->setPendingInitDimensions();
+				for_const (auto item, i.value()) {
+					item->setPendingInitDimensions();
 				}
 			}
 		}
@@ -1763,7 +1772,7 @@ namespace {
 	}

 	WebPageData *webPage(const WebPageId &webPage) {
-		WebPagesData::const_iterator i = webPagesData.constFind(webPage);
+		auto i = webPagesData.constFind(webPage);
 		if (i == webPagesData.cend()) {
 			i = webPagesData.insert(webPage, new WebPageData(webPage));
 		}
@@ -1773,7 +1782,7 @@ namespace {
 	WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const QString &description, PhotoData *photo, DocumentData *document, int32 duration, const QString &author, int32 pendingTill) {
 		if (convert) {
 			if (convert->id != webPage) {
-				WebPagesData::iterator i = webPagesData.find(convert->id);
+				auto i = webPagesData.find(convert->id);
 				if (i != webPagesData.cend() && i.value() == convert) {
 					webPagesData.erase(i);
 				}
@@ -1795,7 +1804,7 @@ namespace {
 				if (App::main()) App::main()->webPageUpdated(convert);
 			}
 		}
-		WebPagesData::const_iterator i = webPagesData.constFind(webPage);
+		auto i = webPagesData.constFind(webPage);
 		WebPageData *result;
 		if (i == webPagesData.cend()) {
 			if (convert) {
@@ -1830,8 +1839,63 @@ namespace {
 		return result;
 	}

+	GameData *game(const GameId &game) {
+		auto i = gamesData.constFind(game);
+		if (i == gamesData.cend()) {
+			i = gamesData.insert(game, new GameData(game));
+		}
+		return i.value();
+	}
+
+	GameData *gameSet(const GameId &game, GameData *convert, const uint64 &accessHash, const QString &shortName, const QString &title, const QString &description, const QString &url, PhotoData *photo, DocumentData *document) {
+		if (convert) {
+			if (convert->id != game) {
+				auto i = gamesData.find(convert->id);
+				if (i != gamesData.cend() && i.value() == convert) {
+					gamesData.erase(i);
+				}
+				convert->id = game;
+			}
+			if (convert->url.isEmpty() && !url.isEmpty()) {
+				convert->accessHash = accessHash;
+				convert->shortName = shortName;
+				convert->title = title;
+				convert->description = description;
+				convert->url = url;
+				convert->photo = photo;
+				convert->document = document;
+				if (App::main()) App::main()->gameUpdated(convert);
+			}
+		}
+		auto i = gamesData.constFind(game);
+		GameData *result;
+		if (i == gamesData.cend()) {
+			if (convert) {
+				result = convert;
+			} else {
+				result = new GameData(game, accessHash, shortName, title, description, url, photo, document);
+			}
+			gamesData.insert(game, result);
+		} else {
+			result = i.value();
+			if (result != convert) {
+				if (result->url.isEmpty() && !url.isEmpty()) {
+					result->accessHash = accessHash;
+					result->shortName = shortName;
+					result->title = title;
+					result->description = description;
+					result->url = url;
+					result->photo = photo;
+					result->document = document;
+					if (App::main()) App::main()->gameUpdated(result);
+				}
+			}
+		}
+		return result;
+	}
+
 	LocationData *location(const LocationCoords &coords) {
-		LocationsData::const_iterator i = locationsData.constFind(coords);
+		auto i = locationsData.constFind(coords);
 		if (i == locationsData.cend()) {
 			i = locationsData.insert(coords, new LocationData(coords));
 		}
@@ -1841,14 +1905,14 @@ namespace {
 	void forgetMedia() {
 		lastPhotos.clear();
 		lastPhotosMap.clear();
-		for (PhotosData::const_iterator i = ::photosData.cbegin(), e = ::photosData.cend(); i != e; ++i) {
-			i.value()->forget();
+		for_const (auto photo, ::photosData) {
+			photo->forget();
 		}
-		for (DocumentsData::const_iterator i = ::documentsData.cbegin(), e = ::documentsData.cend(); i != e; ++i) {
-			i.value()->forget();
+		for_const (auto document, ::documentsData) {
+			document->forget();
 		}
-		for (LocationsData::const_iterator i = ::locationsData.cbegin(), e = ::locationsData.cend(); i != e; ++i) {
-			i.value()->thumb->forget();
+		for_const (auto location, ::locationsData) {
+			location->thumb->forget();
 		}
 	}

@@ -2041,6 +2105,7 @@ namespace {
 		::photoItems.clear();
 		::documentItems.clear();
 		::webPageItems.clear();
+		::gameItems.clear();
 		::sharedContactItems.clear();
 		::gifItems.clear();
 		lastPhotos.clear();
@@ -2464,7 +2529,7 @@ namespace {
 	}

 	void regPhotoItem(PhotoData *data, HistoryItem *item) {
-		::photoItems[data].insert(item, NullType());
+		::photoItems[data].insert(item);
 	}

 	void unregPhotoItem(PhotoData *data, HistoryItem *item) {
@@ -2480,7 +2545,7 @@ namespace {
 	}

 	void regDocumentItem(DocumentData *data, HistoryItem *item) {
-		::documentItems[data].insert(item, NullType());
+		::documentItems[data].insert(item);
 	}

 	void unregDocumentItem(DocumentData *data, HistoryItem *item) {
@@ -2496,7 +2561,7 @@ namespace {
 	}

 	void regWebPageItem(WebPageData *data, HistoryItem *item) {
-		::webPageItems[data].insert(item, NullType());
+		::webPageItems[data].insert(item);
 	}

 	void unregWebPageItem(WebPageData *data, HistoryItem *item) {
@@ -2507,10 +2572,22 @@ namespace {
 		return ::webPageItems;
 	}

+	void regGameItem(GameData *data, HistoryItem *item) {
+		::gameItems[data].insert(item);
+	}
+
+	void unregGameItem(GameData *data, HistoryItem *item) {
+		::gameItems[data].remove(item);
+	}
+
+	const GameItems &gameItems() {
+		return ::gameItems;
+	}
+
 	void regSharedContactItem(int32 userId, HistoryItem *item) {
 		auto user = App::userLoaded(userId);
 		auto canShareThisContact = user ? user->canShareThisContact() : false;
-		::sharedContactItems[userId].insert(item, NullType());
+		::sharedContactItems[userId].insert(item);
 		if (canShareThisContact != (user ? user->canShareThisContact() : false)) {
 			Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserCanShareContact);
 		}
@@ -2549,11 +2626,12 @@ namespace {
 	}

 	QString phoneFromSharedContact(int32 userId) {
-		SharedContactItems::const_iterator i = ::sharedContactItems.constFind(userId);
+		auto i = ::sharedContactItems.constFind(userId);
 		if (i != ::sharedContactItems.cend() && !i->isEmpty()) {
-			HistoryMedia *media = i->cbegin().key()->getMedia();
-			if (media && media->type() == MediaTypeContact) {
-				return static_cast<HistoryContact*>(media)->phone();
+			if (auto media = (*i->cbegin())->getMedia()) {
+				if (media->type() == MediaTypeContact) {
+					return static_cast<HistoryContact*>(media)->phone();
+				}
 			}
 		}
 		return QString();