Rename FullMessageId to MessageFullId.

1 files changed, 22 insertions, 22 deletions

diff --git a/td/telegram/VoiceNotesManager.cpp b/td/telegram/VoiceNotesManager.cpp
index f7520951f..678b1f5ed 100644
--- a/td/telegram/VoiceNotesManager.cpp
+++ b/td/telegram/VoiceNotesManager.cpp
@@ -134,40 +134,40 @@ void VoiceNotesManager::create_voice_note(FileId file_id, string mime_type, int3
   on_get_voice_note(std::move(v), replace);
 }
 
-void VoiceNotesManager::register_voice_note(FileId voice_note_file_id, FullMessageId full_message_id,
+void VoiceNotesManager::register_voice_note(FileId voice_note_file_id, MessageFullId message_full_id,
                                             const char *source) {
-  if (full_message_id.get_message_id().is_scheduled() || !full_message_id.get_message_id().is_server() ||
+  if (message_full_id.get_message_id().is_scheduled() || !message_full_id.get_message_id().is_server() ||
       td_->auth_manager_->is_bot()) {
     return;
   }
-  LOG(INFO) << "Register voice note " << voice_note_file_id << " from " << full_message_id << " from " << source;
+  LOG(INFO) << "Register voice note " << voice_note_file_id << " from " << message_full_id << " from " << source;
   CHECK(voice_note_file_id.is_valid());
-  bool is_inserted = voice_note_messages_[voice_note_file_id].insert(full_message_id).second;
-  LOG_CHECK(is_inserted) << source << ' ' << voice_note_file_id << ' ' << full_message_id;
-  is_inserted = message_voice_notes_.emplace(full_message_id, voice_note_file_id).second;
+  bool is_inserted = voice_note_messages_[voice_note_file_id].insert(message_full_id).second;
+  LOG_CHECK(is_inserted) << source << ' ' << voice_note_file_id << ' ' << message_full_id;
+  is_inserted = message_voice_notes_.emplace(message_full_id, voice_note_file_id).second;
   CHECK(is_inserted);
 }
 
-void VoiceNotesManager::unregister_voice_note(FileId voice_note_file_id, FullMessageId full_message_id,
+void VoiceNotesManager::unregister_voice_note(FileId voice_note_file_id, MessageFullId message_full_id,
                                               const char *source) {
-  if (full_message_id.get_message_id().is_scheduled() || !full_message_id.get_message_id().is_server() ||
+  if (message_full_id.get_message_id().is_scheduled() || !message_full_id.get_message_id().is_server() ||
       td_->auth_manager_->is_bot()) {
     return;
   }
-  LOG(INFO) << "Unregister voice note " << voice_note_file_id << " from " << full_message_id << " from " << source;
+  LOG(INFO) << "Unregister voice note " << voice_note_file_id << " from " << message_full_id << " from " << source;
   CHECK(voice_note_file_id.is_valid());
   auto &message_ids = voice_note_messages_[voice_note_file_id];
-  auto is_deleted = message_ids.erase(full_message_id) > 0;
-  LOG_CHECK(is_deleted) << source << ' ' << voice_note_file_id << ' ' << full_message_id;
+  auto is_deleted = message_ids.erase(message_full_id) > 0;
+  LOG_CHECK(is_deleted) << source << ' ' << voice_note_file_id << ' ' << message_full_id;
   if (message_ids.empty()) {
     voice_note_messages_.erase(voice_note_file_id);
   }
-  is_deleted = message_voice_notes_.erase(full_message_id) > 0;
+  is_deleted = message_voice_notes_.erase(message_full_id) > 0;
   CHECK(is_deleted);
 }
 
-void VoiceNotesManager::recognize_speech(FullMessageId full_message_id, Promise<Unit> &&promise) {
-  auto it = message_voice_notes_.find(full_message_id);
+void VoiceNotesManager::recognize_speech(MessageFullId message_full_id, Promise<Unit> &&promise) {
+  auto it = message_voice_notes_.find(message_full_id);
   CHECK(it != message_voice_notes_.end());
 
   auto file_id = it->second;
@@ -181,7 +181,7 @@ void VoiceNotesManager::recognize_speech(FullMessageId full_message_id, Promise<
                   file_id](Result<telegram_api::object_ptr<telegram_api::updateTranscribedAudio>> r_update) {
     send_closure(actor_id, &VoiceNotesManager::on_transcribed_audio_update, file_id, true, std::move(r_update));
   };
-  if (voice_note->transcription_info->recognize_speech(td_, full_message_id, std::move(promise), std::move(handler))) {
+  if (voice_note->transcription_info->recognize_speech(td_, message_full_id, std::move(promise), std::move(handler))) {
     on_voice_note_transcription_updated(file_id);
   }
 }
@@ -229,8 +229,8 @@ void VoiceNotesManager::on_transcribed_audio_update(
 void VoiceNotesManager::on_voice_note_transcription_updated(FileId file_id) {
   auto it = voice_note_messages_.find(file_id);
   if (it != voice_note_messages_.end()) {
-    for (const auto &full_message_id : it->second) {
-      td_->messages_manager_->on_external_update_message_content(full_message_id);
+    for (const auto &message_full_id : it->second) {
+      td_->messages_manager_->on_external_update_message_content(message_full_id);
     }
   }
 }
@@ -238,14 +238,14 @@ void VoiceNotesManager::on_voice_note_transcription_updated(FileId file_id) {
 void VoiceNotesManager::on_voice_note_transcription_completed(FileId file_id) {
   auto it = voice_note_messages_.find(file_id);
   if (it != voice_note_messages_.end()) {
-    for (const auto &full_message_id : it->second) {
-      td_->messages_manager_->on_update_message_content(full_message_id);
+    for (const auto &message_full_id : it->second) {
+      td_->messages_manager_->on_update_message_content(message_full_id);
     }
   }
 }
 
-void VoiceNotesManager::rate_speech_recognition(FullMessageId full_message_id, bool is_good, Promise<Unit> &&promise) {
-  auto it = message_voice_notes_.find(full_message_id);
+void VoiceNotesManager::rate_speech_recognition(MessageFullId message_full_id, bool is_good, Promise<Unit> &&promise) {
+  auto it = message_voice_notes_.find(message_full_id);
   CHECK(it != message_voice_notes_.end());
 
   auto file_id = it->second;
@@ -254,7 +254,7 @@ void VoiceNotesManager::rate_speech_recognition(FullMessageId full_message_id, b
   if (voice_note->transcription_info == nullptr) {
     return promise.set_value(Unit());
   }
-  voice_note->transcription_info->rate_speech_recognition(td_, full_message_id, is_good, std::move(promise));
+  voice_note->transcription_info->rate_speech_recognition(td_, message_full_id, is_good, std::move(promise));
 }
 
 SecretInputMedia VoiceNotesManager::get_secret_input_media(FileId voice_note_file_id,