Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
matrix-react-sdk
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Matrix.org
matrix-react-sdk
Commits
0d841551
Commit
0d841551
authored
9 years ago
by
Matthew Hodgson
Browse files
Options
Downloads
Patches
Plain Diff
prettyprint conference joins and parts properly
parent
05a3dab5
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/CallHandler.js
+4
-0
4 additions, 0 deletions
src/CallHandler.js
src/TextForEvent.js
+36
-3
36 additions, 3 deletions
src/TextForEvent.js
with
40 additions
and
3 deletions
src/CallHandler.js
+
4
−
0
View file @
0d841551
...
...
@@ -327,6 +327,10 @@ var callHandler = {
setConferenceHandler
:
function
(
confHandler
)
{
ConferenceHandler
=
confHandler
;
},
getConferenceHandler
:
function
()
{
return
ConferenceHandler
;
}
};
// Only things in here which actually need to be global are the
...
...
This diff is collapsed.
Click to expand it.
src/TextForEvent.js
+
36
−
3
View file @
0d841551
/*
Copyright 2015, 2016 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
var
MatrixClientPeg
=
require
(
"
./MatrixClientPeg
"
);
var
CallHandler
=
require
(
"
./CallHandler
"
);
function
textForMemberEvent
(
ev
)
{
// XXX: SYJS-16 "sender is sometimes null for join messages"
var
senderName
=
ev
.
sender
?
ev
.
sender
.
name
:
ev
.
getSender
();
var
targetName
=
ev
.
target
?
ev
.
target
.
name
:
ev
.
getStateKey
();
var
ConferenceHandler
=
CallHandler
.
getConferenceHandler
();
var
reason
=
ev
.
getContent
().
reason
?
(
"
Reason:
"
+
ev
.
getContent
().
reason
)
:
""
;
...
...
@@ -17,9 +35,14 @@ function textForMemberEvent(ev) {
return
targetName
+
"
received an invitation from
"
+
senderName
+
"
.
"
;
}
else
{
if
(
ConferenceHandler
&&
ConferenceHandler
.
isConferenceUser
(
ev
.
getStateKey
()))
{
return
senderName
+
"
requested a VoIP conference
"
;
}
else
{
return
senderName
+
"
invited
"
+
targetName
+
"
.
"
;
}
}
case
'
ban
'
:
return
senderName
+
"
banned
"
+
targetName
+
"
.
"
+
reason
;
case
'
join
'
:
...
...
@@ -41,13 +64,23 @@ function textForMemberEvent(ev) {
}
}
else
{
if
(
!
ev
.
target
)
console
.
warn
(
"
Join message has no target! --
"
+
ev
.
getContent
().
state_key
);
if
(
ConferenceHandler
&&
ConferenceHandler
.
isConferenceUser
(
ev
.
getStateKey
()))
{
return
"
VoIP conference started
"
;
}
else
{
return
targetName
+
"
joined the room.
"
;
}
}
return
''
;
case
'
leave
'
:
if
(
ev
.
getSender
()
===
ev
.
getStateKey
())
{
if
(
ConferenceHandler
&&
ConferenceHandler
.
isConferenceUser
(
ev
.
getStateKey
()))
{
return
"
VoIP conference finished
"
;
}
else
{
return
targetName
+
"
left the room.
"
;
}
}
else
if
(
ev
.
getPrevContent
().
membership
===
"
ban
"
)
{
return
senderName
+
"
unbanned
"
+
targetName
+
"
.
"
;
}
...
...
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