Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
3277a650
Commit
3277a650
authored
10 years ago
by
Matthew Hodgson
Browse files
Options
Downloads
Patches
Plain Diff
actually display room metadata based on m.room.membe events
parent
0045a264
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
webclient/app.css
+4
-0
4 additions, 0 deletions
webclient/app.css
webclient/components/matrix/event-handler-service.js
+11
-0
11 additions, 0 deletions
webclient/components/matrix/event-handler-service.js
webclient/room/room.html
+8
-2
8 additions, 2 deletions
webclient/room/room.html
with
23 additions
and
2 deletions
webclient/app.css
+
4
−
0
View file @
3277a650
...
...
@@ -245,6 +245,10 @@ h1 {
background-color
:
#fff
! important
;
}
.mine
.membership
{
background-color
:
#fff
! important
;
}
.mine
.text
.bubble
{
text-align
:
left
! important
;
}
...
...
This diff is collapsed.
Click to expand it.
webclient/components/matrix/event-handler-service.js
+
11
−
0
View file @
3277a650
...
...
@@ -69,6 +69,17 @@ angular.module('eventHandlerService', [])
var
handleRoomMember
=
function
(
event
,
isLiveEvent
)
{
initRoom
(
event
.
room_id
);
// add membership changes as if they were a room message if something interesting changed
if
(
event
.
content
.
prev
!==
event
.
content
.
membership
)
{
if
(
isLiveEvent
)
{
$rootScope
.
events
.
rooms
[
event
.
room_id
].
messages
.
push
(
event
);
}
else
{
$rootScope
.
events
.
rooms
[
event
.
room_id
].
messages
.
unshift
(
event
);
}
}
$rootScope
.
events
.
rooms
[
event
.
room_id
].
members
[
event
.
user_id
]
=
event
;
$rootScope
.
$broadcast
(
MEMBER_EVENT
,
event
,
isLiveEvent
);
};
...
...
This diff is collapsed.
Click to expand it.
webclient/room/room.html
+
8
−
2
View file @
3277a650
...
...
@@ -26,19 +26,25 @@
</div>
<div
id=
"messageTableWrapper"
keep-scroll
>
<!-- FIXME: need to have better timestamp semantics than the (msg.content.hsob_ts || msg.ts) hack below -->
<table
id=
"messageTable"
infinite-scroll=
"paginateMore()"
>
<tr
ng-repeat=
"msg in events.rooms[room_id].messages"
ng-class=
"(events.rooms[room_id].messages[$index - 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')"
scroll-item
>
<td
class=
"leftBlock"
>
<div
class=
"sender"
ng-hide=
"events.rooms[room_id].messages[$index - 1].user_id === msg.user_id"
>
{{ members[msg.user_id].displayname || msg.user_id }}
</div>
<div
class=
"timestamp"
>
{{ msg.content.hsob_ts | date:'MMM d HH:mm:ss' }}
</div>
<div
class=
"timestamp"
>
{{
(
msg.content.hsob_ts
|| msg.ts)
| date:'MMM d HH:mm:ss' }}
</div>
</td>
<td
class=
"avatar"
>
<img
class=
"avatarImage"
ng-src=
"{{ members[msg.user_id].avatar_url || 'img/default-profile.jpg' }}"
width=
"32"
height=
"32"
ng-hide=
"events.rooms[room_id].messages[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"
/>
</td>
<td
ng-class=
"!msg.content.membership
_target
? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : 'membership text'"
>
<td
ng-class=
"!msg.content.membership ? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : 'membership text'"
>
<div
class=
"bubble"
>
<span
ng-hide=
'msg.type !== "m.room.member"'
>
{{ members[msg.user_id].displayname || msg.user_id }}
{{ {"join": "joined", "leave": "left", "invite": "invited"}[msg.content.membership] }}
{{ msg.content.target_id || '' }}
</span>
<span
ng-hide=
'msg.content.msgtype !== "m.emote"'
ng-bind-html=
"'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"
/>
<span
ng-hide=
'msg.content.msgtype !== "m.text"'
ng-bind-html=
"((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"
/>
<div
ng-show=
'msg.content.msgtype === "m.image"'
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment