Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RoomDelegate subtitle, take only 1 arg for getUser

Browse Source
This commit is contained in:
miruka
2019-07-04 00:24:21 -04:00
parent 5fa2892fda
commit 63645b73a5
10 changed files with 107 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/Chat/Timeline/EventContent.qml
View File

@@ -16,7 +16,7 @@ Row {
}
Rectangle {
color: isMessage(model) ?
color: Utils.eventIsMessage(model) ?
HStyle.chat.message.background : HStyle.chat.event.background
//width: nameLabel.implicitWidth

10
src/qml/Chat/Timeline/EventDelegate.qml
View File

@@ -1,6 +1,7 @@
import QtQuick 2.7
import QtQuick.Layouts 1.3
import "../../Base"
import "../../utils.js" as Utils
Column {
id: roomEventDelegate
@@ -16,17 +17,12 @@ Column {
roomEventListView.model.get(model.index + nth) : null
}
function isMessage(item) {
return /^RoomMessage($|[A-Z])/.test(item.eventType)
}
property var previousItem: getPreviousItem()
signal reloadPreviousItem()
onReloadPreviousItem: previousItem = getPreviousItem()
property var senderInfo: null
Component.onCompleted:
senderInfo = models.users.getUser(chatPage.userId, model.senderId)
Component.onCompleted: senderInfo = models.users.getUser(model.senderId)
readonly property bool isOwn: chatPage.userId === model.senderId
@@ -36,7 +32,7 @@ Column {
readonly property bool combine: Boolean(
model.date &&
previousItem && previousItem.eventType && previousItem.date &&
isMessage(previousItem) == isMessage(model) &&
Utils.eventIsMessage(previousItem) == Utils.eventIsMessage(model) &&
! talkBreak &&
! dayBreak &&
previousItem.senderId === model.senderId &&

1
src/qml/EventHandlers/users.js
View File

@@ -6,6 +6,7 @@ function onAccountDeleted(user_id) {
models.accounts.popWhere({"userId": user_id}, 1)
}
// TODO: get updated from nio rooms
function onUserUpdated(user_id, display_name, avatar_url, status_message) {
models.users.upsert({"userId": user_id}, {
"userId": user_id,

14
src/qml/Models.qml
View File

@@ -11,24 +11,20 @@ QtObject {
}
property HListModel users: HListModel {
function getUser(as_account_id, wanted_user_id) {
wanted_user_id = wanted_user_id || as_account_id
var found = users.getWhere({"userId": wanted_user_id}, 1)
function getUser(user_id) {
var found = users.getWhere({"userId": user_id}, 1)
if (found.length > 0) { return found[0] }
users.append({
"userId": wanted_user_id,
"userId": user_id,
"displayName": "",
"avatarUrl": "",
"statusMessage": ""
})
py.callClientCoro(
as_account_id, "request_user_update_event", [wanted_user_id]
)
py.callCoro("request_user_update_event", [user_id])
return users.getWhere({"userId": wanted_user_id}, 1)[0]
return users.getWhere({"userId": user_id}, 1)[0]
}
}

4
src/qml/Python.qml
View File

@@ -12,6 +12,10 @@ Python {
signal willLoadAccounts(bool will)
property bool loadingAccounts: false
function callSync(name, args) {
return call_sync("APP.backend." + name, args)
}
function callCoro(name, args, kwargs, callback) {
call("APP.call_backend_coro", [name, args, kwargs], function(uuid){
pendingCoroutines[uuid] = callback || function() {}

24
src/qml/SidePane/RoomDelegate.qml
View File

@@ -36,10 +36,30 @@ MouseArea {
Layout.maximumWidth: parent.width
}
HLabel {
HRichLabel {
id: subtitleLabel
visible: Boolean(text)
//text: models.timelines.getWhere({"roomId": model.roomId}, 1)[0].content
text: {
for (var i = 0; i < models.timelines.count; i++) {
var item = models.timelines.get(i) // TODO: standardize
if (item.roomId == model.roomId) {
var ev = item
break
}
}
if (! ev) { return "" }
if (! Utils.eventIsMessage(ev)) {
return Utils.translatedEventContent(ev)
}
return Utils.coloredNameHtml(
models.users.getUser(ev.senderId).displayName,
ev.senderId
) + ": " + py.callSync("inlinify", [ev.content])
}
textFormat: Text.StyledText
font.pixelSize: HStyle.fontSize.small

29
src/qml/SidePane/utils.js
View File

@@ -1,29 +0,0 @@
.import "../Chat/utils.js" as ChatJS
function getLastRoomEventText(roomId, accountId) {
var eventsModel = Backend.roomEvents.get(roomId)
if (eventsModel.count < 1) { return "" }
var ev = eventsModel.get(0)
var name = Backend.users.get(ev.dict.sender).displayName.value
var undecryptable = ev.type === "OlmEvent" || ev.type === "MegolmEvent"
if (undecryptable || ev.type.startsWith("RoomMessage")) {
var color = Qt.hsla(Backend.hueFromString(name), 0.32, 0.3, 1)
return "<font color='" + color + "'>" +
name +
":</font> " +
(undecryptable ?
"<font color='darkred'>" + qsTr("Undecryptable") + "<font>" :
ev.dict.body)
} else {
return "<font color='" + (undecryptable ? "darkred" : "#444") + "'>" +
name +
" " +
ChatJS.getEventText(ev.type, ev.dict) +
"</font>"
}
}

40
src/qml/utils.js
View File

@@ -20,7 +20,7 @@ function hueFrom(string) {
}
function avatarHue(name) {
function avatarHue(name) { // TODO: bad name
return Qt.hsla(
hueFrom(name),
HStyle.avatar.background.saturation,
@@ -30,7 +30,7 @@ function avatarHue(name) {
}
function nameHue(name) {
function nameHue(name) { // TODO: bad name
return Qt.hsla(
hueFrom(name),
HStyle.displayName.saturation,
@@ -40,6 +40,13 @@ function nameHue(name) {
}
function coloredNameHtml(name, alt_id) {
return "<font color='" + nameHue(name || stripUserId(alt_id)) + "'>" +
escapeHtml(name || alt_id) +
"</font>"
}
function escapeHtml(string) {
// Replace special HTML characters by encoded alternatives
return string.replace("&", "&amp;")
@@ -50,38 +57,31 @@ function escapeHtml(string) {
}
function eventIsMessage(ev) {
return /^RoomMessage($|[A-Z])/.test(ev.eventType)
}
function translatedEventContent(ev) {
// ev: models.timelines item
if (ev.translatable == false) { return ev.content }
// %S → sender display name
var name = models.users.getUser(ev.senderId).displayName
var text = ev.content.replace(
"%S",
"<font color='" + nameHue(name || stripUserId(ev.senderId)) + "'>" +
escapeHtml(name || ev.senderId) +
"</font>"
)
var text = ev.content.replace("%S", coloredNameHtml(name, ev.senderId))
// %T → target (event state_key) display name
if (ev.targetUserId) {
var target_name = models.users.getUser(ev.targetUserId).displayName
text = text.replace(
"%T",
"<font color='" +
nameHue(target_name || stripUserId(ev.targetUserId)) +
"'>" +
escapeHtml(target_name || ev.targetUserId) +
"</font>"
)
var tname = models.users.getUser(ev.targetUserId).displayName
text = text.replace("%T", coloredNameHtml(tname, ev.targetUserId))
}
text = qsTr(text)
if (model.translatable == true) { return text }
if (ev.translatable == true) { return text }
// Else, model.translatable should be an array of args
for (var i = 0; model.translatable.length; i++) {
text = text.arg(model.translatable[i])
for (var i = 0; ev.translatable.length; i++) {
text = text.arg(ev.translatable[i])
}
return text
}