rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add an ugly custom emote completer using ~

This commit is contained in:
Nicolas Werner 2021-12-27 06:23:36 +01:00
parent 3e8734dbd5
commit ea6b19b307
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
5 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
resources/qml/Completer.qml
View File

@ -69,10 +69,7 @@ Popup {
onCompleterNameChanged: {
if (completerName) {
if (completerName == "user")
completer = TimelineManager.completerFor(completerName, room.roomId);
else
completer = TimelineManager.completerFor(completerName);
completer = TimelineManager.completerFor(completerName, room.roomId);
completer.setSearchString("");
} else {
completer = undefined;
@ -182,6 +179,39 @@ Popup {
}
DelegateChoice {
roleValue: "customEmoji"
RowLayout {
id: del
anchors.centerIn: parent
spacing: rowSpacing
Avatar {
height: popup.avatarHeight
width: popup.avatarWidth
displayName: model.shortcode
//userid: model.shortcode
url: model.url.replace("mxc://", "image://MxcImage/")
onClicked: popup.completionClicked(completer.completionAt(model.index))
crop: false
}
Label {
text: model.shortcode
color: model.index == popup.currentIndex ? Nheko.colors.highlightedText : Nheko.colors.text
}
Label {
text: "(" + model.packname + ")"
color: model.index == popup.currentIndex ? Nheko.colors.highlightedText : Nheko.colors.buttonText
}
}
}
DelegateChoice {
roleValue: "room"

9
resources/qml/MessageInput.qml
View File

@ -101,6 +101,7 @@ Rectangle {
}
function openCompleter(pos, type) {
if (popup.opened) return;
completerTriggeredAt = pos;
popup.completerName = type;
popup.open();
@ -166,13 +167,12 @@ Rectangle {
messageInput.text = room.input.nextText();
} else if (event.key == Qt.Key_At) {
messageInput.openCompleter(selectionStart, "user");
popup.open();
} else if (event.key == Qt.Key_Colon) {
messageInput.openCompleter(selectionStart, "emoji");
popup.open();
} else if (event.key == Qt.Key_NumberSign) {
messageInput.openCompleter(selectionStart, "roomAliases");
popup.open();
} else if (event.text == "~") {
messageInput.openCompleter(selectionStart, "customEmoji");
} else if (event.key == Qt.Key_Escape && popup.opened) {
popup.completerName = "";
popup.close();
@ -214,6 +214,9 @@ Rectangle {
} else if (t == ':') {
messageInput.openCompleter(pos, "emoji");
return ;
} else if (t == '~') {
messageInput.openCompleter(pos, "customEmoji");
return ;
}
pos = pos - 1;
}

30
src/Cache.cpp
View File

@ -3580,24 +3580,26 @@ Cache::getImagePacks(const std::string &room_id, std::optional<bool> stickers)
auto addPack = [&infos, stickers](const mtx::events::msc2545::ImagePack &pack,
const std::string &source_room,
const std::string &state_key) {
if (!pack.pack || !stickers.has_value() ||
(stickers.value() ? pack.pack->is_sticker() : pack.pack->is_emoji())) {
ImagePackInfo info;
info.source_room = source_room;
info.state_key = state_key;
info.pack.pack = pack.pack;
bool pack_matches = !stickers.has_value() ||
(stickers.value() ? pack.pack->is_sticker() : pack.pack->is_emoji());
for (const auto &img : pack.images) {
if (stickers.has_value() && img.second.overrides_usage() &&
(stickers ? !img.second.is_sticker() : !img.second.is_emoji()))
continue;
ImagePackInfo info;
info.source_room = source_room;
info.state_key = state_key;
info.pack.pack = pack.pack;
info.pack.images.insert(img);
}
for (const auto &img : pack.images) {
if (stickers.has_value() &&
(img.second.overrides_usage()
? (!stickers.value() ? img.second.is_sticker() : img.second.is_emoji())
: !pack_matches))
continue;
if (!info.pack.images.empty())
infos.push_back(std::move(info));
info.pack.images.insert(img);
}
if (!info.pack.images.empty())
infos.push_back(std::move(info));
};
// packs from account data

4
src/CombinedImagePackModel.cpp
View File

@ -56,7 +56,9 @@ CombinedImagePackModel::data(const QModelIndex &index, int role) const
if (hasIndex(index.row(), index.column(), index.parent())) {
switch (role) {
case CompletionModel::CompletionRole:
return QString::fromStdString(images[index.row()].image.url);
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);
case Roles::Url:
return QString::fromStdString(images[index.row()].image.url);
case CompletionModel::SearchRole:

5
src/timeline/TimelineViewManager.cpp
View File

@ -550,6 +550,11 @@ TimelineViewManager::completerFor(QString completerName, QString roomId)
auto proxy = new CompletionProxyModel(stickerModel, 1, static_cast<size_t>(-1) / 4);
stickerModel->setParent(proxy);
return proxy;
} else if (completerName == "customEmoji") {
auto stickerModel = new CombinedImagePackModel(roomId.toStdString(), false);
auto proxy = new CompletionProxyModel(stickerModel);
stickerModel->setParent(proxy);
return proxy;
}
return nullptr;
}