merge master into reactions
This commit is contained in:
parent
7beaf868ef
commit
a1661f7006
10 changed files with 74 additions and 6 deletions
|
|
@ -914,6 +914,13 @@ TimelineModel::decryptEvent(const mtx::events::EncryptedEvent<mtx::events::msg::
|
|||
return {dummy, false};
|
||||
}
|
||||
|
||||
void
|
||||
TimelineModel::reactAction(QString id)
|
||||
{
|
||||
setReaction(id);
|
||||
ChatPage::instance()->reactMessage(id);
|
||||
}
|
||||
|
||||
void
|
||||
TimelineModel::replyAction(QString id)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue