mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-12-22 15:25:48 +01:00
Code Activity

Correct spelling of privileged.

Browse source
This commit is contained in:
Antonin Décimo 2020-12-14 10:35:12 +01:00 committed by Juliusz Chroboczek
parent a939ec07a7
commit f5de94cf3e
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rtpconn/webclient.go
View file

@ -32,7 +32,7 @@ func errorToWSCloseMessage(id string, err error) (*clientMessage, []byte) {
Type: "usermessage",
Kind: "error",
Dest: id,
Priviledged: true,
Privileged: true,
Value: &s,
}
text = e.Error()
@ -168,7 +168,7 @@ type clientMessage struct {
Dest string `json:"dest,omitempty"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
Priviledged bool `json:"priviledged,omitempty"`
Privileged bool `json:"privileged,omitempty"`
Permissions *group.ClientPermissions `json:"permissions,omitempty"`
Group string `json:"group,omitempty"`
Value *string `json:"value,omitempty"`
@ -1181,7 +1181,7 @@ func handleClientMessage(c *webClient, m clientMessage) error {
Id: m.Id,
Dest: m.Dest,
Username: m.Username,
Priviledged: c.permissions.Op,
Privileged: c.permissions.Op,
Time: tm,
Kind: m.Kind,
Value: m.Value,
@ -1430,7 +1430,7 @@ func errorMessage(id string, err error) *clientMessage {
Type: "usermessage",
Kind: "error",
Dest: id,
Priviledged: true,
Privileged: true,
Value: &message,
}
case group.KickError:
@ -1444,7 +1444,7 @@ func errorMessage(id string, err error) *clientMessage {
Id: e.Id,
Username: e.Username,
Dest: id,
Priviledged: true,
Privileged: true,
Value: &message,
}
default:

12
static/galene.js
View file

@ -1587,7 +1587,7 @@ let lastMessage = {};
* @param {string} kind
* @param {string} message
*/
function addToChatbox(peerId, dest, nick, time, priviledged, kind, message) {
function addToChatbox(peerId, dest, nick, time, privileged, kind, message) {
let userpass = getUserPass();
let row = document.createElement('div');
row.classList.add('message-row');
@ -2263,25 +2263,25 @@ async function serverConnect() {
serverConnection.onjoined = gotJoined;
serverConnection.onchat = addToChatbox;
serverConnection.onclearchat = clearChat;
serverConnection.onusermessage = function(id, dest, username, time, priviledged, kind, message) {
serverConnection.onusermessage = function(id, dest, username, time, privileged, kind, message) {
switch(kind) {
case 'error':
case 'warning':
case 'info':
let from = id ? (username || 'Anonymous') : 'The Server';
if(priviledged)
if(privileged)
displayError(`${from} said: ${message}`, kind);
else
console.error(`Got unpriviledged message of kind ${kind}`);
console.error(`Got unprivileged message of kind ${kind}`);
break;
case 'mute':
console.log(id, dest, username);
if(priviledged) {
if(privileged) {
setLocalMute(true, true);
let by = username ? ' by ' + username : '';
displayWarning(`You have been muted${by}`);
} else {
console.error(`Got unpriviledged message of kind ${kind}`);
console.error(`Got unprivileged message of kind ${kind}`);
}
break;
default:

10
static/protocol.js
View file

@ -127,7 +127,7 @@ function ServerConnection() {
/**
* onchat is called whenever a new chat message is received.
*
* @type {(this: ServerConnection, id: string, dest: string, username: string, time: number, priviledged: boolean, kind: string, message: string) => void}
* @type {(this: ServerConnection, id: string, dest: string, username: string, time: number, privileged: boolean, kind: string, message: string) => void}
*/
this.onchat = null;
/**
@ -136,10 +136,10 @@ function ServerConnection() {
* a user-id otherwise.
*
* 'kind' is typically one of 'error', 'warning', 'info' or 'mute'. If
* 'id' is non-null, 'priviledged' indicates whether the message was
* 'id' is non-null, 'privileged' indicates whether the message was
* sent by an operator.
*
* @type {(this: ServerConnection, id: string, dest: string, username: string, time: number, priviledged: boolean, kind: string, message: string) => void}
* @type {(this: ServerConnection, id: string, dest: string, username: string, time: number, privileged: boolean, kind: string, message: string) => void}
*/
this.onusermessage = null;
/**
@ -159,7 +159,7 @@ function ServerConnection() {
* @property {string} [dest]
* @property {string} [username]
* @property {string} [password]
* @property {boolean} [priviledged]
* @property {boolean} [privileged]
* @property {Object<string,boolean>} [permissions]
* @property {string} [group]
* @property {string} [value]
@ -317,7 +317,7 @@ ServerConnection.prototype.connect = async function(url) {
if(sc.onusermessage)
sc.onusermessage.call(
sc, m.id, m.dest, m.username, m.time,
m.priviledged, m.kind, m.value,
m.privileged, m.kind, m.value,
);
break;
case 'clearchat':