github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 17:04:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Imports of upload-only chat messages (#29162)

Browse Source 
The current implementation adds a "note" for chat messages with empty
messages, however chat messages with only uploads  are allowed. This change
allows such messages to be imported.
This commit is contained in:
Selase Krakani
2024-10-10 15:18:10 +00:00
committed by GitHub
parent 882c2da29e
commit dd34f1927b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
script/bulk_import/base.rb
View File

@ -1908,7 +1908,7 @@ class BulkImport::Base
message[:id] = @last_chat_message_id += 1 message[:id] = @last_chat_message_id += 1
message[:user_id] ||= Discourse::SYSTEM_USER_ID message[:user_id] ||= Discourse::SYSTEM_USER_ID
message[:last_editor_id] ||= message[:user_id] message[:last_editor_id] ||= message[:user_id]
message[:message] = (message[:message] || "").scrub.strip.presence || "<Empty imported message>" message[:message] = (message[:message] || "").scrub.strip
message[:message] = normalize_text(message[:message]) message[:message] = normalize_text(message[:message])
message[:cooked] = ::Chat::Message.cook(message[:message], user_id: message[:last_editor_id]) message[:cooked] = ::Chat::Message.cook(message[:message], user_id: message[:last_editor_id])
message[:cooked_version] = ::Chat::Message::BAKED_VERSION message[:cooked_version] = ::Chat::Message::BAKED_VERSION

1
script/bulk_import/generic_bulk.rb
View File

@ -2669,6 +2669,7 @@ class BulkImport::Generic < BulkImport::Base
user_id = user_id_from_imported_id(row["user_id"]) user_id = user_id_from_imported_id(row["user_id"])
next if channel_id.blank? || user_id.blank? next if channel_id.blank? || user_id.blank?
next if row["message"].blank? && row["upload_ids"].blank?
last_editor_id = user_id_from_imported_id(row["last_editor_id"]) last_editor_id = user_id_from_imported_id(row["last_editor_id"])
thread_id = chat_thread_id_from_original_id(row["thread_id"]) thread_id = chat_thread_id_from_original_id(row["thread_id"])