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

Add support for non-message room events

Browse Source
This commit is contained in:
miruka
2019-07-02 22:22:29 -04:00
parent a6653179e5
commit 9d5701da19
11 changed files with 299 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/qml/Chat/Chat.qml
View File

@@ -55,27 +55,27 @@ HColumnLayout {
Layout.fillHeight: true
}
TypingMembersBar {}
//TypingMembersBar {}
InviteBanner {
visible: category === "Invites"
inviter: roomInfo.inviter
}
// InviteBanner {
//visible: category === "Invites"
//inviter: roomInfo.inviter
//}
UnknownDevicesBanner {
visible: category == "Rooms" && hasUnknownDevices
}
//UnknownDevicesBanner {
//visible: category == "Rooms" && hasUnknownDevices
//}
SendBox {
id: sendBox
visible: category == "Rooms" && ! hasUnknownDevices
}
LeftBanner {
visible: category === "Left"
leftEvent: roomInfo.leftEvent
}
}
//LeftBanner {
//visible: category === "Left"
//leftEvent: roomInfo.leftEvent
//}
//}
// RoomSidePane {
//id: roomSidePane
@@ -144,5 +144,6 @@ HColumnLayout {
//Layout.minimumWidth: HStyle.avatar.size
//Layout.maximumWidth: parent.width
//}
}
}
}

59
src/qml/Chat/RoomEventList/MessageContent.qml
View File

@@ -7,11 +7,18 @@ Row {
spacing: standardSpacing / 2
layoutDirection: isOwn ? Qt.RightToLeft : Qt.LeftToRight
function textHueForName(name) { // TODO: move
return Qt.hsla(avatar.hueFromName(name),
HStyle.displayName.saturation,
HStyle.displayName.lightness,
1)
}
HAvatar {
id: avatar
hidden: combine
name: senderInfo.displayName || stripUserId(model.senderId)
dimension: 48
dimension: model.showNameLine ? 48 : 28
}
Rectangle {
@@ -33,16 +40,13 @@ Row {
anchors.fill: parent
HLabel {
height: combine ? 0 : implicitHeight
width: parent.width
height: model.showNameLine && ! combine ? implicitHeight : 0
visible: height > 0
id: nameLabel
text: senderInfo.displayName || model.senderId
color: Qt.hsla(avatar.hueFromName(avatar.name),
HStyle.displayName.saturation,
HStyle.displayName.lightness,
1)
color: textHueForName(avatar.name)
elide: Text.ElideRight
maximumLineCount: 1
horizontalAlignment: isOwn ? Text.AlignRight : Text.AlignLeft
@@ -53,10 +57,49 @@ Row {
}
HRichLabel {
function escapeHtml(text) { // TODO: move this
return text.replace("&", "&")
.replace("<", "&lt;")
.replace(">", "&gt;")
.replace('"', "&quot;")
.replace("'", "&#039;")
}
function translate(text) {
if (model.translatable == false) { return text }
text = text.replace(
"%S",
"<font color='" + nameLabel.color + "'>" +
escapeHtml(senderInfo.displayName || model.senderId) +
"</font>"
)
var name = models.users.getUser(
chatPage.userId, model.targetUserId
).displayName
var sid = avatar.stripUserId(model.targetUserId || "")
text = text.replace(
"%T",
"<font color='" + textHueForName(name || sid) + "'>" +
escapeHtml(name || model.targetUserId) +
"</font>"
)
text = qsTr(text)
if (model.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])
}
}
width: parent.width
id: contentLabel
text: model.content +
text: translate(model.content) +
"&nbsp;&nbsp;<font size=" + HStyle.fontSize.small +
"px color=" + HStyle.chat.message.date + ">" +
Qt.formatDateTime(model.date, "hh:mm:ss") +
@@ -64,8 +107,6 @@ Row {
(model.isLocalEcho ?
"&nbsp;<font size=" + HStyle.fontSize.small +
"px>⏳</font>" : "")
textFormat: model.type == "text" ?
Text.PlainText : Text.RichText
color: HStyle.chat.message.body
wrapMode: Text.Wrap

15
src/qml/Chat/RoomEventList/RoomEventDelegate.qml
View File

@@ -14,10 +14,6 @@ Column {
roomEventListView.model.get(index + 1) : null
}
function getIsMessage(type) {
return true
}
property var previousItem: getPreviousItem()
signal reloadPreviousItem()
onReloadPreviousItem: previousItem = getPreviousItem()
@@ -26,18 +22,14 @@ Column {
Component.onCompleted:
senderInfo = models.users.getUser(chatPage.userId, senderId)
//readonly property bool isMessage: ! model.type.match(/^event.*/)
readonly property bool isMessage: getIsMessage(model.type)
readonly property bool isOwn: chatPage.userId === senderId
readonly property bool isFirstEvent: model.type == "eventCreate"
readonly property bool isFirstEvent: model.event_type == "RoomCreateEvent"
readonly property bool combine:
previousItem &&
! talkBreak &&
! dayBreak &&
getIsMessage(previousItem.type) === isMessage &&
previousItem.senderId === senderId &&
minsBetween(previousItem.date, model.date) <= 5
@@ -75,14 +67,13 @@ Column {
width: roomEventDelegate.width
}
Item {
Item { // TODO: put this in Daybreak.qml?
visible: dayBreak
width: parent.width
height: topPadding
}
Loader {
source: isMessage ? "MessageContent.qml" : "EventContent.qml"
MessageContent {
anchors.right: isOwn ? parent.right : undefined
}
}

151
src/qml/Chat/utils.js
View File

@@ -1,154 +1,3 @@
function getEventText(type, dict) {
switch (type) {
case "RoomCreateEvent":
return (dict.federate ? "allowed" : "blocked") +
" users on other matrix servers " +
(dict.federate ? "to join" : "from joining") +
" this room."
break
case "RoomGuestAccessEvent":
return (dict.guest_access === "can_join" ? "allowed " : "forbad") +
"guests to join the room."
break
case "RoomJoinRulesEvent":
return "made the room " +
(dict.join_rule === "public." ? "public" : "invite only.")
break
case "RoomHistoryVisibilityEvent":
return getHistoryVisibilityEventText(dict)
break
case "PowerLevelsEvent":
return "changed the room's permissions."
case "RoomMemberEvent":
return getMemberEventText(dict)
break
case "RoomAliasEvent":
return "set the room's main address to " +
dict.canonical_alias + "."
break
case "RoomNameEvent":
return "changed the room's name to \"" + dict.name + "\"."
break
case "RoomTopicEvent":
return "changed the room's topic to \"" + dict.topic + "\"."
break
case "RoomEncryptionEvent":
return "turned on encryption for this room."
break
case "OlmEvent":
case "MegolmEvent":
return "hasn't sent your device the keys to decrypt this message."
default:
console.log(type + "\n" + JSON.stringify(dict, null, 4) + "\n")
return "did something this client does not understand."
//case "CallEvent": TODO
}
}
function getHistoryVisibilityEventText(dict) {
switch (dict.history_visibility) {
case "shared":
var end = "all room members."
break
case "world_readable":
var end = "any member or outsider."
break
case "joined":
var end = "all room members, since the point they joined."
break
case "invited":
var end = "all room members, since the point they were invited."
break
}
return "made future history visible to " + end
}
function getStateDisplayName(dict) {
// The dict.content.displayname may be outdated, prefer
// retrieving it fresh
return Backend.users.get(dict.state_key).displayName.value
}
function getMemberEventText(dict) {
var info = dict.content, prev = dict.prev_content
if (! prev || (info.membership != prev.membership)) {
var reason = info.reason ? (" Reason: " + info.reason) : ""
switch (info.membership) {
case "join":
return prev && prev.membership === "invite" ?
"accepted the invitation." : "joined the room."
break
case "invite":
return "invited " + getStateDisplayName(dict) + " to the room."
break
case "leave":
if (dict.state_key === dict.sender) {
return (prev && prev.membership === "invite" ?
"declined the invitation." : "left the room.") +
reason
}
var name = getStateDisplayName(dict)
return (prev && prev.membership === "invite" ?
"withdrew " + name + "'s invitation." :
prev && prev.membership == "ban" ?
"unbanned " + name + " from the room." :
"kicked out " + name + " from the room.") +
reason
break
case "ban":
var name = getStateDisplayName(dict)
return "banned " + name + " from the room." + reason
break
}
}
var changed = []
if (prev && (info.avatar_url != prev.avatar_url)) {
changed.push("profile picture")
}
if (prev && (info.displayname != prev.displayname)) {
changed.push("display name from \"" +
(prev.displayname || dict.state_key) + '" to "' +
(info.displayname || dict.state_key) + '"')
}
if (changed.length > 0) {
return "changed their " + changed.join(" and ") + "."
}
return ""
}
function getLeftBannerText(leftEvent) {
if (! leftEvent) {
return "You are not member of this room."

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

@@ -2,4 +2,3 @@
Qt.include("app.js")
Qt.include("users.js")
Qt.include("rooms.js")
Qt.include("rooms_timeline.js")

22
src/qml/EventHandlers/rooms.js
View File

@@ -59,3 +59,25 @@ function onRoomMemberUpdated(room_id, user_id, typing) {
function onRoomMemberDeleted(room_id, user_id) {
}
function onTimelineEventReceived(
event_type, room_id, event_id, sender_id, date, content,
content_type, is_local_echo, show_name_line, translatable, target_user_id
) {
models.timelines.upsert({"eventId": event_id}, {
"eventType": py.getattr(event_type, "__name__"),
"roomId": room_id,
"eventId": event_id,
"senderId": sender_id,
"date": date,
"content": content,
"contentType": content,
"isLocalEcho": is_local_echo,
"showNameLine": show_name_line,
"translatable": translatable,
"targetUserId": target_user_id
}, true, 1000)
}
var onTimelineMessageReceived = onTimelineEventReceived

12
src/qml/EventHandlers/rooms_timeline.js
View File

@@ -1,12 +0,0 @@
function onHtmlMessageReceived(type, room_id, event_id, sender_id, date,
is_local_echo, content) {
models.timelines.upsert({"eventId": event_id}, {
"type": type,
"roomId": room_id,
"eventId": event_id,
"senderId": sender_id,
"date": date,
"isLocalEcho": is_local_echo,
"content": content,
}, true, 1000)
}