merge master into reactions

This commit is contained in:
Joseph Donofry 2020-05-07 20:53:24 -04:00
parent 7beaf868ef
commit a1661f7006
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
10 changed files with 74 additions and 6 deletions

View file

@ -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)
{