From 9fa88eb0ec9cd8f603523bd2cc13601694b93aca Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 18 Oct 2019 01:17:46 +0300
Subject: [PATCH] Remove user/channel debug_source.

GitOrigin-RevId: a9d8fc3841d04e448ee6ef9a34b084d1d302257c
---
 td/telegram/ContactsManager.cpp | 21 +++------------------
 td/telegram/ContactsManager.h   |  4 ----
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index ba31c2150..a99e945b5 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -5368,12 +5368,7 @@ void ContactsManager::on_binlog_user_event(BinlogEvent &&event) {
   auto user_id = log_event.user_id;
   LOG(INFO) << "Add " << user_id << " from binlog";
   User *u = add_user(user_id, "on_binlog_user_event");
-  if (!(u->first_name.empty() && u->last_name.empty()) && Slice(u->debug_source) == Slice("on_binlog_user_event")) {
-    LOG(ERROR) << "Skip adding already added " << user_id;
-    binlog_erase(G()->td_db()->get_binlog(), event.id_);
-    return;  // TODO fix bug in Binlog and remove that fix
-  }
-  LOG_CHECK(u->first_name.empty() && u->last_name.empty()) << user_id << " " << u->debug_source;
+  LOG_CHECK(u->first_name.empty() && u->last_name.empty()) << user_id;
   *u = std::move(log_event.u);  // users come from binlog before all other events, so just add them
 
   u->logevent_id = event.id_;
@@ -5859,12 +5854,7 @@ void ContactsManager::on_binlog_channel_event(BinlogEvent &&event) {
   auto channel_id = log_event.channel_id;
   LOG(INFO) << "Add " << channel_id << " from binlog";
   Channel *c = add_channel(channel_id, "on_binlog_channel_event");
-  if (!c->status.is_banned() && Slice(c->debug_source) == Slice("on_binlog_channel_event")) {
-    LOG(ERROR) << "Skip adding already added " << channel_id;
-    binlog_erase(G()->td_db()->get_binlog(), event.id_);
-    return;  // TODO fix bug in Binlog and remove that fix
-  }
-  LOG_CHECK(c->status.is_banned()) << channel_id << " " << c->debug_source;
+  LOG_CHECK(c->status.is_banned()) << channel_id;
   *c = std::move(log_event.c);  // channels come from binlog before all other events, so just add them
 
   c->logevent_id = event.id_;
@@ -8988,11 +8978,7 @@ bool ContactsManager::get_user(UserId user_id, int left_tries, Promise<Unit> &&p
 
 ContactsManager::User *ContactsManager::add_user(UserId user_id, const char *source) {
   CHECK(user_id.is_valid());
-  User *u = &users_[user_id];
-  if (u->debug_source == nullptr) {
-    u->debug_source = source;
-  }
-  return u;
+  return &users_[user_id];
 }
 
 const ContactsManager::UserFull *ContactsManager::get_user_full(UserId user_id) const {
@@ -9509,7 +9495,6 @@ ContactsManager::Channel *ContactsManager::add_channel(ChannelId channel_id, con
     c->photo_source_id = it->second;
     channel_photo_file_source_ids_.erase(it);
   }
-  c->debug_source = source;
   return c;
 }
 
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 2b4bd260d..293c81567 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -531,8 +531,6 @@ class ContactsManager : public Actor {
 
     uint64 logevent_id = 0;
 
-    const char *debug_source = nullptr;
-
     template <class StorerT>
     void store(StorerT &storer) const;
 
@@ -665,8 +663,6 @@ class ContactsManager : public Actor {
     bool is_being_saved = false;  // is current channel being saved to the database
     uint64 logevent_id = 0;
 
-    const char *debug_source = nullptr;
-
     template <class StorerT>
     void store(StorerT &storer) const;