mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-09-04 11:03:14 +02:00
feat: Implement local messages feature
This commit introduces the ability for you to add messages locally to a chat. These messages are displayed only on the client and are not sent to the server. Key changes include: - Data Layer: - Added a new `LocalMessage` class inheriting from `AyuMessageBase` in `ayu/data/entities.h`. - Implemented functions in `ayu/data/messages_storage.cpp` and `.h` (`addLocalMessage`, `getLocalMessages`, `hasLocalMessages`) to manage the storage of these messages in the AyuGram SQLite database, including creating a new table for local messages. - UI and Display: - Modified `ayu/ui/message_history/history_item.cpp` to ensure `LocalMessage` objects are rendered in the chat history. - Added a visual distinction for local messages by prepending "[Local] " to their text content. - UI Flow: - Implemented a new dialog box (`AddLocalMessageBox` in `boxes/add_local_message_box.cpp` and `.h`) for composing local messages, allowing you to specify a sender name (defaults to the current user) and the message text. - Added a context menu option ("Add Local Message") to the message input field in `HistoryWidget` to launch this dialog. - Testing: - Defined a suite of manual test cases covering data storage, retrieval, UI display, and the creation flow via the new UI, ensuring the feature's correctness and usability. This feature enhances AyuGram by allowing you to annotate chats or add notes directly within the message flow, visible only to yourselves.
This commit is contained in:
parent
3c7f3e8740
commit
31cb5f620b
9 changed files with 302 additions and 2 deletions
|
@ -25,6 +25,11 @@ auto storage = make_storage(
|
|||
column<EditedMessage>(&EditedMessage::userId),
|
||||
column<EditedMessage>(&EditedMessage::dialogId),
|
||||
column<EditedMessage>(&EditedMessage::messageId)),
|
||||
make_index("idx_local_message_userId_dialogId_topicId_messageId",
|
||||
column<LocalMessage>(&LocalMessage::userId),
|
||||
column<LocalMessage>(&LocalMessage::dialogId),
|
||||
column<LocalMessage>(&LocalMessage::topicId),
|
||||
column<LocalMessage>(&LocalMessage::messageId)),
|
||||
make_table<DeletedMessage>(
|
||||
"DeletedMessage",
|
||||
make_column("fakeId", &DeletedMessage::fakeId, primary_key().autoincrement()),
|
||||
|
@ -97,6 +102,42 @@ auto storage = make_storage(
|
|||
make_column("documentAttributesSerialized", &EditedMessage::documentAttributesSerialized),
|
||||
make_column("mimeType", &EditedMessage::mimeType)
|
||||
),
|
||||
make_table<LocalMessage>(
|
||||
"LocalMessage",
|
||||
make_column("fakeId", &LocalMessage::fakeId, primary_key().autoincrement()),
|
||||
make_column("userId", &LocalMessage::userId),
|
||||
make_column("dialogId", &LocalMessage::dialogId),
|
||||
make_column("groupedId", &LocalMessage::groupedId),
|
||||
make_column("peerId", &LocalMessage::peerId),
|
||||
make_column("fromId", &LocalMessage::fromId),
|
||||
make_column("topicId", &LocalMessage::topicId),
|
||||
make_column("messageId", &LocalMessage::messageId),
|
||||
make_column("date", &LocalMessage::date),
|
||||
make_column("flags", &LocalMessage::flags),
|
||||
make_column("editDate", &LocalMessage::editDate),
|
||||
make_column("views", &LocalMessage::views),
|
||||
make_column("fwdFlags", &LocalMessage::fwdFlags),
|
||||
make_column("fwdFromId", &LocalMessage::fwdFromId),
|
||||
make_column("fwdName", &LocalMessage::fwdName),
|
||||
make_column("fwdDate", &LocalMessage::fwdDate),
|
||||
make_column("fwdPostAuthor", &LocalMessage::fwdPostAuthor),
|
||||
make_column("replyFlags", &LocalMessage::replyFlags),
|
||||
make_column("replyMessageId", &LocalMessage::replyMessageId),
|
||||
make_column("replyPeerId", &LocalMessage::replyPeerId),
|
||||
make_column("replyTopId", &LocalMessage::replyTopId),
|
||||
make_column("replyForumTopic", &LocalMessage::replyForumTopic),
|
||||
make_column("replySerialized", &LocalMessage::replySerialized),
|
||||
make_column("entityCreateDate", &LocalMessage::entityCreateDate),
|
||||
make_column("text", &LocalMessage::text),
|
||||
make_column("textEntities", &LocalMessage::textEntities),
|
||||
make_column("mediaPath", &LocalMessage::mediaPath),
|
||||
make_column("hqThumbPath", &LocalMessage::hqThumbPath),
|
||||
make_column("documentType", &LocalMessage::documentType),
|
||||
make_column("documentSerialized", &LocalMessage::documentSerialized),
|
||||
make_column("thumbsSerialized", &LocalMessage::thumbsSerialized),
|
||||
make_column("documentAttributesSerialized", &LocalMessage::documentAttributesSerialized),
|
||||
make_column("mimeType", &LocalMessage::mimeType)
|
||||
),
|
||||
make_table<DeletedDialog>(
|
||||
"DeletedDialog",
|
||||
make_column("fakeId", &DeletedDialog::fakeId, primary_key().autoincrement()),
|
||||
|
@ -160,6 +201,47 @@ void moveCurrentDatabase() {
|
|||
}
|
||||
}
|
||||
|
||||
void addLocalMessage(const LocalMessage &message) {
|
||||
try {
|
||||
storage.begin_transaction();
|
||||
storage.insert(message);
|
||||
storage.commit();
|
||||
} catch (std::exception &ex) {
|
||||
LOG(("Failed to save local message for some reason: %1").arg(ex.what()));
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<LocalMessage> getLocalMessages(ID userId, ID dialogId, ID topicId, ID minId, ID maxId, int totalLimit) {
|
||||
return storage.get_all<LocalMessage>(
|
||||
where(
|
||||
column<LocalMessage>(&LocalMessage::userId) == userId and
|
||||
column<LocalMessage>(&LocalMessage::dialogId) == dialogId and
|
||||
(column<LocalMessage>(&LocalMessage::topicId) == topicId or topicId == 0) and
|
||||
(column<LocalMessage>(&LocalMessage::messageId) > minId or minId == 0) and
|
||||
(column<LocalMessage>(&LocalMessage::messageId) < maxId or maxId == 0)
|
||||
),
|
||||
order_by(column<LocalMessage>(&LocalMessage::messageId)).desc(),
|
||||
limit(totalLimit)
|
||||
);
|
||||
}
|
||||
|
||||
bool hasLocalMessages(ID userId, ID dialogId, ID topicId) {
|
||||
try {
|
||||
return !storage.select(
|
||||
columns(column<LocalMessage>(&LocalMessage::dialogId)),
|
||||
where(
|
||||
column<LocalMessage>(&LocalMessage::userId) == userId and
|
||||
column<LocalMessage>(&LocalMessage::dialogId) == dialogId and
|
||||
(column<LocalMessage>(&LocalMessage::topicId) == topicId or topicId == 0)
|
||||
),
|
||||
limit(1)
|
||||
).empty();
|
||||
} catch (std::exception &ex) {
|
||||
LOG(("Failed to check if dialog has local message: %1").arg(ex.what()));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void initialize() {
|
||||
auto movePrevious = false;
|
||||
|
||||
|
|
|
@ -20,4 +20,8 @@ void addDeletedMessage(const DeletedMessage &message);
|
|||
std::vector<DeletedMessage> getDeletedMessages(ID userId, ID dialogId, ID topicId, ID minId, ID maxId, int totalLimit);
|
||||
bool hasDeletedMessages(ID userId, ID dialogId, ID topicId);
|
||||
|
||||
void addLocalMessage(const LocalMessage &message);
|
||||
std::vector<LocalMessage> getLocalMessages(ID userId, ID dialogId, ID topicId, ID minId, ID maxId, int totalLimit);
|
||||
bool hasLocalMessages(ID userId, ID dialogId, ID topicId);
|
||||
|
||||
}
|
||||
|
|
|
@ -58,6 +58,10 @@ class EditedMessage : public AyuMessageBase
|
|||
{
|
||||
};
|
||||
|
||||
class LocalMessage : public AyuMessageBase
|
||||
{
|
||||
};
|
||||
|
||||
class DeletedDialog
|
||||
{
|
||||
public:
|
||||
|
|
|
@ -139,4 +139,28 @@ bool hasDeletedMessages(not_null<PeerData*> peer, ID topicId) {
|
|||
return AyuDatabase::hasDeletedMessages(userId, getDialogIdFromPeer(peer), topicId);
|
||||
}
|
||||
|
||||
void addLocalMessage(not_null<HistoryItem*> item) {
|
||||
LocalMessage message;
|
||||
map(item, message);
|
||||
|
||||
// Optionally, add checks similar to addEditedMessage or addDeletedMessage
|
||||
// if (message.text.empty()) {
|
||||
// return;
|
||||
// }
|
||||
|
||||
AyuDatabase::addLocalMessage(message);
|
||||
}
|
||||
|
||||
std::vector<AyuMessageBase>
|
||||
getLocalMessages(not_null<PeerData*> peer, ID topicId, ID minId, ID maxId, int totalLimit) {
|
||||
const ID userId = peer->session().userId().bare & PeerId::kChatTypeMask;
|
||||
return convertToBase(
|
||||
AyuDatabase::getLocalMessages(userId, getDialogIdFromPeer(peer), topicId, minId, maxId, totalLimit));
|
||||
}
|
||||
|
||||
bool hasLocalMessages(not_null<PeerData*> peer, ID topicId) {
|
||||
const ID userId = peer->session().userId().bare & PeerId::kChatTypeMask;
|
||||
return AyuDatabase::hasLocalMessages(userId, getDialogIdFromPeer(peer), topicId);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -20,4 +20,8 @@ void addDeletedMessage(not_null<HistoryItem*> item);
|
|||
std::vector<AyuMessageBase> getDeletedMessages(not_null<PeerData*> peer, ID topicId, ID minId, ID maxId, int totalLimit);
|
||||
bool hasDeletedMessages(not_null<PeerData*> peer, ID topicId);
|
||||
|
||||
void addLocalMessage(not_null<HistoryItem*> item);
|
||||
std::vector<AyuMessageBase> getLocalMessages(not_null<PeerData*> peer, ID topicId, ID minId, ID maxId, int totalLimit);
|
||||
bool hasLocalMessages(not_null<PeerData*> peer, ID topicId);
|
||||
|
||||
}
|
||||
|
|
|
@ -117,8 +117,11 @@ void GenerateItems(
|
|||
addPart(makeSimpleTextMessage(std::move(text)));
|
||||
};
|
||||
|
||||
const auto text = QString::fromStdString(message.text);
|
||||
addSimpleTextMessage(Ui::Text::WithEntities(text));
|
||||
QString textString = QString::fromStdString(message.text);
|
||||
if (dynamic_cast<const LocalMessage*>(&message)) {
|
||||
textString = QStringLiteral("[Local] ") + textString;
|
||||
}
|
||||
addSimpleTextMessage(Ui::Text::WithEntities(textString));
|
||||
}
|
||||
|
||||
} // namespace MessageHistory
|
||||
|
|
83
Telegram/SourceFiles/boxes/add_local_message_box.cpp
Normal file
83
Telegram/SourceFiles/boxes/add_local_message_box.cpp
Normal file
|
@ -0,0 +1,83 @@
|
|||
#include "boxes/add_local_message_box.h"
|
||||
|
||||
#include "ui/widgets/labels.h"
|
||||
#include "ui/widgets/input_fields.h"
|
||||
#include "ui/widgets/buttons.h"
|
||||
#include "ui/widgets/layout.h"
|
||||
#include "ui/wrap/padding_wrap.h"
|
||||
#include "lang/lang_keys.h"
|
||||
#include "window/window_session_controller.h"
|
||||
#include "main/main_session.h"
|
||||
#include "data/data_user.h"
|
||||
#include "styles/style_layers.h"
|
||||
#include "styles/style_boxes.h"
|
||||
|
||||
AddLocalMessageBox::AddLocalMessageBox(QWidget*, not_null<Window::SessionController*> controller)
|
||||
: BoxContent(controller->uiShow())
|
||||
, _controller(controller)
|
||||
, _senderField(
|
||||
this,
|
||||
st::defaultInputField,
|
||||
tr::lng_local_message_sender_ph(), // Placeholder for sender name
|
||||
_controller->session().user()->name()) // Default to current user's name
|
||||
, _messageField(
|
||||
this,
|
||||
st::defaultInputFieldContext, // Use context for multiline
|
||||
tr::lng_local_message_text_ph()) { // Placeholder for message text
|
||||
setupControls();
|
||||
}
|
||||
|
||||
void AddLocalMessageBox::setupControls() {
|
||||
const auto content =verticalLayout();
|
||||
setTitle(tr::lng_box_add_local_message_title());
|
||||
|
||||
content->add(object_ptr<Ui::FlatLabel>(
|
||||
content,
|
||||
tr::lng_local_message_sender_label(), // "Sender:"
|
||||
st::boxLabel));
|
||||
content->add(object_ptr<Ui::PaddingWrap<Ui::InputField>>(
|
||||
content,
|
||||
base::duplicate(_senderField),
|
||||
st::boxPadding));
|
||||
|
||||
content->add(object_ptr<Ui::FlatLabel>(
|
||||
content,
|
||||
tr::lng_local_message_text_label(), // "Message Text:"
|
||||
st::boxLabel));
|
||||
_messageField->setInstantInserts(true);
|
||||
_messageField->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
|
||||
_messageField->setMaxHeight(st::boxMaxListHeight / 2); // Allow ample space for text
|
||||
content->add(object_ptr<Ui::PaddingWrap<Ui::InputField>>(
|
||||
content,
|
||||
base::duplicate(_messageField),
|
||||
st::boxPadding));
|
||||
|
||||
_submitButton = addButton(tr::lng_box_ok(), [=] { save(); });
|
||||
addButton(tr::lng_cancel(), [=] { closeBox(); });
|
||||
}
|
||||
|
||||
void AddLocalMessageBox::prepare() {
|
||||
setDimensions(st::boxWidth, layout()->heightForWidth(st::boxWidth));
|
||||
_senderField->setFocus();
|
||||
}
|
||||
|
||||
void AddLocalMessageBox::setInnerFocus() {
|
||||
_senderField->setFocus();
|
||||
}
|
||||
|
||||
void AddLocalMessageBox::save() {
|
||||
const auto senderName = _senderField->getLastText().trimmed();
|
||||
const auto messageText = _messageField->getLastText().trimmed();
|
||||
|
||||
if (messageText.isEmpty()) {
|
||||
_messageField->showError();
|
||||
return;
|
||||
}
|
||||
|
||||
_saveLocalMessageRequests.fire({senderName, messageText});
|
||||
closeBox();
|
||||
}
|
||||
|
||||
rpl::producer<AddLocalMessageBox::LocalMessageData> AddLocalMessageBox::saveLocalMessageRequests() const {
|
||||
return _saveLocalMessageRequests.events();
|
||||
}
|
37
Telegram/SourceFiles/boxes/add_local_message_box.h
Normal file
37
Telegram/SourceFiles/boxes/add_local_message_box.h
Normal file
|
@ -0,0 +1,37 @@
|
|||
#pragma once
|
||||
|
||||
#include "ui/layers/box_content.h"
|
||||
#include "ui/widgets/input_fields.h"
|
||||
#include "ui/widgets/buttons.h"
|
||||
|
||||
namespace Ui {
|
||||
class VerticalLayout;
|
||||
} // namespace Ui
|
||||
|
||||
class AddLocalMessageBox : public Ui::BoxContent {
|
||||
public:
|
||||
AddLocalMessageBox(QWidget*, not_null<Window::SessionController*> controller);
|
||||
|
||||
struct LocalMessageData {
|
||||
QString senderName;
|
||||
QString messageText;
|
||||
};
|
||||
|
||||
rpl::producer<LocalMessageData> saveLocalMessageRequests() const;
|
||||
|
||||
protected:
|
||||
void prepare() override;
|
||||
void setInnerFocus() override;
|
||||
|
||||
private:
|
||||
void setupControls();
|
||||
void save();
|
||||
|
||||
not_null<Window::SessionController*> _controller;
|
||||
object_ptr<Ui::InputField> _senderField;
|
||||
object_ptr<Ui::InputField> _messageField;
|
||||
object_ptr<Ui::RoundButton> _submitButton;
|
||||
|
||||
rpl::event_stream<LocalMessageData> _saveLocalMessageRequests;
|
||||
|
||||
};
|
|
@ -179,6 +179,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include "styles/style_window.h"
|
||||
#include "styles/style_chat_helpers.h"
|
||||
#include "styles/style_info.h"
|
||||
#include "ui/widgets/popup_menu.h" // Required for Ui::PopupMenu
|
||||
#include "boxes/add_local_message_box.h" // Will be created
|
||||
#include "ayu/data/messages_storage.h" // Required for AyuMessages::addLocalMessage
|
||||
|
||||
#include <QtGui/QWindow>
|
||||
#include <QtCore/QMimeData>
|
||||
|
@ -542,6 +545,10 @@ HistoryWidget::HistoryWidget(
|
|||
supportInitAutocomplete();
|
||||
}
|
||||
_field->rawTextEdit()->installEventFilter(this);
|
||||
_field->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
connect(_field, &Ui::InputField::customContextMenuRequested, this, [this](const QPoint &pos) {
|
||||
showFieldContextMenu(pos);
|
||||
});
|
||||
_field->setMimeDataHook([=](
|
||||
not_null<const QMimeData*> data,
|
||||
Ui::InputField::MimeAction action) {
|
||||
|
@ -9563,3 +9570,55 @@ HistoryWidget::~HistoryWidget() {
|
|||
}
|
||||
setTabbedPanel(nullptr);
|
||||
}
|
||||
|
||||
void HistoryWidget::showFieldContextMenu(const QPoint &pos) {
|
||||
auto menu = base::make_unique_q<Ui::PopupMenu>(this, st::defaultPopupMenu);
|
||||
_field->fillContextMenu(menu.get());
|
||||
if (_history && _canSendMessages) { // Only show if we can potentially add a message
|
||||
menu->addSeparator();
|
||||
menu->addAction(tr::lng_context_add_local_message(tr::now), [=] { // Assuming this lang key will be added
|
||||
showAddLocalMessageBox();
|
||||
});
|
||||
}
|
||||
menu->popup(_field->mapToGlobal(pos));
|
||||
}
|
||||
|
||||
void HistoryWidget::showAddLocalMessageBox() {
|
||||
if (!_history) return;
|
||||
|
||||
auto box = Ui::Show(Box<AddLocalMessageBox>(this), Ui::LayerOption::KeepOther);
|
||||
box->saveLocalMessageRequests(
|
||||
) | rpl::start_with_next([=](const AddLocalMessageBox::LocalMessageData &data) {
|
||||
handleAddLocalMessage(data.senderName, data.messageText);
|
||||
}, box->lifetime());
|
||||
}
|
||||
|
||||
void HistoryWidget::handleAddLocalMessage(const QString &senderName, const QString &messageText) {
|
||||
if (!_history || messageText.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
PeerData *fromPeer = session().user();
|
||||
QString finalPostAuthor = QString();
|
||||
|
||||
if (!senderName.isEmpty() && senderName != fromPeer->name()) {
|
||||
// This is a simplified approach. A real implementation might involve
|
||||
// searching for the user or allowing creation of a placeholder.
|
||||
// For now, if a name is provided that isn't the current user,
|
||||
// we'll use the current user as the sender but set the postAuthor.
|
||||
finalPostAuthor = senderName;
|
||||
LOG(("Warning: Custom sender '%1' requested for local message. Defaulting to current user as sender, using name as postAuthor.").arg(senderName));
|
||||
}
|
||||
|
||||
|
||||
HistoryItem *newItem = _history->makeMessage({
|
||||
.id = _history->nextNonHistoryEntryId(),
|
||||
.flags = MessageFlag::FakeHistoryItem | MessageFlag::HasFromId | (finalPostAuthor.isEmpty() ? MessageFlag() : MessageFlag::HasPostAuthor),
|
||||
.from = fromPeer->id,
|
||||
.date = base::unixtime::now(),
|
||||
.postAuthor = finalPostAuthor,
|
||||
}, { messageText }, MTP_messageMediaEmpty());
|
||||
|
||||
AyuMessages::addLocalMessage(newItem);
|
||||
// The UI should update automatically due to existing mechanisms for new messages.
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue