Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
galene
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
galene
Commits
3b98e123
Commit
3b98e123
authored
Jul 30, 2021
by
Juliusz Chroboczek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Send a message of kind "kicked" instead of "error".
parent
a5c97fd8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
README.PROTOCOL
README.PROTOCOL
+3
-2
rtpconn/webclient.go
rtpconn/webclient.go
+1
-1
static/galene.js
static/galene.js
+4
-1
No files found.
README.PROTOCOL
View file @
3b98e123
...
@@ -292,8 +292,9 @@ chat history, and is not expected to contain user-visible content.
...
@@ -292,8 +292,9 @@ chat history, and is not expected to contain user-visible content.
}
}
```
```
Currently defined kinds include `error`, `warning`, `info`, `clearchat`
Currently defined kinds include `error`, `warning`, `info`, `kicked`,
(not to be confused with the `clearchat` group action), and `mute`.
`clearchat` (not to be confused with the `clearchat` group action), and
`mute`.
A user action requests that the server act upon a user.
A user action requests that the server act upon a user.
...
...
rtpconn/webclient.go
View file @
3b98e123
...
@@ -1815,7 +1815,7 @@ func errorMessage(id string, err error) *clientMessage {
...
@@ -1815,7 +1815,7 @@ func errorMessage(id string, err error) *clientMessage {
}
}
return
&
clientMessage
{
return
&
clientMessage
{
Type
:
"usermessage"
,
Type
:
"usermessage"
,
Kind
:
"
error
"
,
Kind
:
"
kicked
"
,
Id
:
e
.
Id
,
Id
:
e
.
Id
,
Username
:
e
.
Username
,
Username
:
e
.
Username
,
Dest
:
id
,
Dest
:
id
,
...
...
static/galene.js
View file @
3b98e123
...
@@ -2198,6 +2198,7 @@ async function gotJoined(kind, group, perms, status, message) {
...
@@ -2198,6 +2198,7 @@ async function gotJoined(kind, group, perms, status, message) {
*/
*/
function
gotUserMessage
(
id
,
dest
,
username
,
time
,
privileged
,
kind
,
message
)
{
function
gotUserMessage
(
id
,
dest
,
username
,
time
,
privileged
,
kind
,
message
)
{
switch
(
kind
)
{
switch
(
kind
)
{
case
'
kicked
'
:
case
'
error
'
:
case
'
error
'
:
case
'
warning
'
:
case
'
warning
'
:
case
'
info
'
:
case
'
info
'
:
...
@@ -2934,7 +2935,6 @@ document.getElementById('resizer').addEventListener('mousedown', chatResizer, fa
...
@@ -2934,7 +2935,6 @@ document.getElementById('resizer').addEventListener('mousedown', chatResizer, fa
function
displayError
(
message
,
level
)
{
function
displayError
(
message
,
level
)
{
if
(
!
level
)
if
(
!
level
)
level
=
"
error
"
;
level
=
"
error
"
;
var
background
=
'
linear-gradient(to right, #e20a0a, #df2d2d)
'
;
var
background
=
'
linear-gradient(to right, #e20a0a, #df2d2d)
'
;
var
position
=
'
center
'
;
var
position
=
'
center
'
;
var
gravity
=
'
top
'
;
var
gravity
=
'
top
'
;
...
@@ -2948,6 +2948,9 @@ function displayError(message, level) {
...
@@ -2948,6 +2948,9 @@ function displayError(message, level) {
case
"
warning
"
:
case
"
warning
"
:
background
=
"
linear-gradient(to right, #bdc511, #c2cf01)
"
;
background
=
"
linear-gradient(to right, #bdc511, #c2cf01)
"
;
break
;
break
;
case
"
kicked
"
:
level
=
"
error
"
;
break
;
}
}
/** @ts-ignore */
/** @ts-ignore */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment