Use body in alt text of custom emoji

resources/qml/Completer.qml

@@ -69,7 +69,7 @@ Popup {
 
     onCompleterNameChanged: {
         if (completerName) {
-            completer = TimelineManager.completerFor(completerName, room.roomId);
+            completer = TimelineManager.completerFor(completerName, completerName == "room" ? "" : room.roomId);
             completer.setSearchString("");
         } else {
             completer = undefined;

src/CombinedImagePackModel.cpp

@@ -58,7 +58,7 @@ CombinedImagePackModel::data(const QModelIndex &index, int role) const
         case CompletionModel::CompletionRole:
             return QString("<img data-mx-emoticon height=32 src=\"%1\" alt=\"%2\" title=\"%2\">")
               .arg(QString::fromStdString(images[index.row()].image.url).toHtmlEscaped(),
-                   images[index.row()].shortcode);
+                   QString::fromStdString(images[index.row()].image.body));
         case Roles::Url:
             return QString::fromStdString(images[index.row()].image.url);
         case CompletionModel::SearchRole: