Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
4c228df1
"README.md" did not exist on "5ff5f17377432645f65bc614228783cccb69d20c"
Commit
4c228df1
authored
10 years ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Use the new 'inviter' key from im sync for room display names.
parent
14b99896
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
webclient/rooms/rooms-controller.js
+7
-2
7 additions, 2 deletions
webclient/rooms/rooms-controller.js
webclient/rooms/rooms.html
+1
-1
1 addition, 1 deletion
webclient/rooms/rooms.html
with
8 additions
and
3 deletions
webclient/rooms/rooms-controller.js
+
7
−
2
View file @
4c228df1
...
...
@@ -59,7 +59,7 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload',
// FIXME push membership to top level key to match /im/sync
event
.
membership
=
event
.
content
.
membership
;
// FIXME bodge a nicer name than the room ID for this invite.
event
.
room_
alias
=
event
.
user_id
+
"
's room
"
;
event
.
room_
display_name
=
event
.
user_id
+
"
's room
"
;
$scope
.
rooms
[
event
.
room_id
]
=
event
;
}
});
...
...
@@ -70,15 +70,20 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload',
if
(
alias
)
{
// use the existing alias from storage
data
[
i
].
room_alias
=
alias
;
data
[
i
].
room_display_name
=
alias
;
}
else
if
(
data
[
i
].
aliases
&&
data
[
i
].
aliases
[
0
])
{
// save the mapping
// TODO: select the smarter alias from the array
matrixService
.
createRoomIdToAliasMapping
(
data
[
i
].
room_id
,
data
[
i
].
aliases
[
0
]);
data
[
i
].
room_display_name
=
data
[
i
].
aliases
[
0
];
}
else
if
(
data
[
i
].
membership
==
"
invite
"
&&
"
inviter
"
in
data
[
i
])
{
data
[
i
].
room_display_name
=
data
[
i
].
inviter
+
"
's room
"
}
else
{
// last resort use the room id
data
[
i
].
room_
alias
=
data
[
i
].
room_id
;
data
[
i
].
room_
display_name
=
data
[
i
].
room_id
;
}
}
return
data
;
...
...
This diff is collapsed.
Click to expand it.
webclient/rooms/rooms.html
+
1
−
1
View file @
4c228df1
...
...
@@ -65,7 +65,7 @@
<div
class=
"rooms"
ng-repeat=
"(rm_id, room) in rooms"
>
<div>
<a
href=
"#/room/{{ room.room_alias ? room.room_alias : rm_id }}"
>
{{ room.room_
alias
}}
</a>
{{room.membership === 'invite' ? ' (invited)' : ''}}
<a
href=
"#/room/{{ room.room_alias ? room.room_alias : rm_id }}"
>
{{ room.room_
display_name
}}
</a>
{{room.membership === 'invite' ? ' (invited)' : ''}}
</div>
</div>
<br/>
...
...
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