Nice design of admin/member tags.

Telegram/SourceFiles/data/data_channel.h

@@ -141,12 +141,10 @@ public:
 	base::flat_set<not_null<UserData*>> bots;
 	rpl::event_stream<bool> unrestrictedByBoostsChanges;
 
-	// For admin badges, full admins list with ranks.
-	base::flat_map<UserId, QString> admins;
+	base::flat_set<UserId> admins;
 	base::flat_map<UserId, QString> memberRanks;
 
 	UserData *creator = nullptr; // nullptr means unknown
-	QString creatorRank;
 	int botStatus = 0; // -1 - no bots, 0 - unknown, 1 - one bot, that sees all history, 2 - other
 	bool joinedMessageFound = false;
 	bool adminsLoaded = false;

Telegram/SourceFiles/data/data_channel_admins.cpp

@@ -20,16 +20,25 @@ ChannelAdminChanges::ChannelAdminChanges(not_null<ChannelData*> channel)
 }
 
 void ChannelAdminChanges::add(UserId userId, const QString &rank) {
-	const auto i = _admins.find(userId);
-	if (i == end(_admins) || i->second != rank) {
-		_admins[userId] = rank;
+	if (_admins.emplace(userId).second) {
 		_changes.emplace(userId);
 	}
+	auto &ranks = _channel->mgInfo->memberRanks;
+	if (!rank.isEmpty()) {
+		const auto i = ranks.find(userId);
+		if (i == end(ranks) || i->second != rank) {
+			ranks[userId] = rank;
+			_changes.emplace(userId);
+		}
+	} else {
+		if (ranks.remove(userId)) {
+			_changes.emplace(userId);
+		}
+	}
 }
 
 void ChannelAdminChanges::remove(UserId userId) {
-	if (_admins.contains(userId)) {
-		_admins.remove(userId);
+	if (_admins.remove(userId)) {
 		_changes.emplace(userId);
 	}
 }

Telegram/SourceFiles/data/data_channel_admins.h

@@ -20,7 +20,7 @@ public:
 
 private:
 	not_null<ChannelData*> _channel;
-	base::flat_map<UserId, QString> &_admins;
+	base::flat_set<UserId> &_admins;
 	base::flat_set<UserId> _changes;
 
 };