mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-25 10:05:58 +01:00
Code Activity

Send a message of kind "kicked" instead of "error".

Browse source
This commit is contained in:
Juliusz Chroboczek 2021-07-30 19:38:02 +02:00
parent a5c97fd849
commit 3b98e123e0
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.PROTOCOL
View file

@ -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.

2
rtpconn/webclient.go
View file

@ -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,

5
static/galene.js
View file

@ -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
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) {
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 */