Use nick to set the role
This should fix issue #152, reported by Stefan Haller.
--- a/mcabber/doc/help/cs/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/cs/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -34,8 +34,8 @@
Pozve uživatele 'jid' do aktuální místnosti s možností udání důvodu.
/room kick jméno [důvod]
Vyhodí (vykopne) uživatele 'jméno' z aktuální místnosti s možností udání důvodu.
-/room role jid role [důvod]
- Změní roli uživateli 'jid'. Role může být 'none' (žádná), 'visitor' (návštěvník), 'participant' (účastník) nebo 'moderator' (moderátor).
+/room role jméno role [důvod]
+ Změní roli uživateli 'jméno'. Role může být 'none' (žádná), 'visitor' (návštěvník), 'participant' (účastník) nebo 'moderator' (moderátor).
/room affil jid vztah [důvod]
Změní uživateli 'jid' vztah k místnosti. Vztah může být 'none' (žádný), 'member' (člen), 'admin' (správce) nebo 'owner' (vlastník).
/room setopt print_status|auto_whois|flag_joins [hodnota]
--- a/mcabber/doc/help/de/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/de/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -35,8 +35,8 @@
Lädt die jid [mit einem Grund] in den gerade aktiven MUC ein
/room kick nick [grund]
Wirft den User "nick" aus dem Raum
-/room role jid rolle [grund]
- Ändert die Rolle der jid (rolle kann "none", "visitor", "participant" oder "moderator" sein)
+/room role nick rolle [grund]
+ Ändert die Rolle der nick (rolle kann "none", "visitor", "participant" oder "moderator" sein)
/room affil jid zugeh [grund]
Ändert die Zugehörigkeit der jid zum Raum. (zugeh kann "none", "member", "admin" oder "owner" sein)
/room setopt print_status|auto_whois|flag_joins [wert]
--- a/mcabber/doc/help/en/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/en/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -36,8 +36,8 @@
Invite jid to the current room
/room kick nick [reason]
Kick "nick" from the current room
-/room role jid role [reason]
- Change jid's role (role can be "none", "visitor", "participant", "moderator")
+/room role nick role [reason]
+ Change nick's role (role can be "none", "visitor", "participant", "moderator")
/room affil jid affil [reason]
Change jid's affiliation (affil can be "none", "member", "admin", "owner")
/room setopt print_status|auto_whois|flag_joins [value]
--- a/mcabber/doc/help/fr/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/fr/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -36,8 +36,8 @@
Invite l'utilisateur jid dans le salon
/room kick pseudo [raison]
Chasse le membre "pseudo" du salon
-/room role jid role [raison]
- Change le rôle de jid (role peut être "none", "visitor", "participant", "moderator")
+/room role pseudo role [raison]
+ Change le rôle de "pseudo" (role peut être "none", "visitor", "participant", "moderator")
/room affil jid affil [raison]
Change l'affiliation de jid (affil peut être "none", "member", "admin", "owner")
/room setopt print_status|auto_whois|flag_joins [valeur]
--- a/mcabber/doc/help/it/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/it/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -35,8 +35,8 @@
Invita jid nella stanza corrente
/room kick nick [motivo]
Caccia "nick" dalla stanza corrente
-/room role jid role [motivo]
- Cambia il ruolo di jid (il ruolo può essere "none", "visitor", "participant", "moderator")
+/room role nick role [motivo]
+ Cambia il ruolo di nick (il ruolo può essere "none", "visitor", "participant", "moderator")
/room affil jid affil [motivo]
Cambia l'affiliazione di jid (l'affiliazione può essere "none", "member", "admin", "owner")
/room setopt print_status|auto_whois|flag_joins [value]
--- a/mcabber/doc/help/nl/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/nl/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -35,8 +35,8 @@
Nodig jid uit in de huidige chatroom
/room kick nick [reden]
Schop "nick" uit de huidige chatroom
-/room role jid role [reden]
- Verander jid's rol (rol kan zijn: "none", "visitor", "participant", "moderator")
+/room role nick role [reden]
+ Verander nick's rol (rol kan zijn: "none", "visitor", "participant", "moderator")
/room affil jid affil [reden]
Verander jid's verbintenis (affil kan zijn: "none", "member", "admin", "owner")
/room setopt print_status|auto_whois|flag_joins [waarde]
--- a/mcabber/doc/help/pl/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/pl/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -35,8 +35,8 @@
Zaprasza osobę jid do aktualnego pokoju z powodu "powód" (opcjonalnie)
/room kick nick [powód]
Wyrzucenie osoby "nick" z aktualnego pokoju z powodu "powód" (opcjonalnie)
-/room role jid role [powód]
- Zmienia rolę użytkownika jid (może być: "none", "visitor", "participant", "moderator")
+/room role nick role [powód]
+ Zmienia rolę użytkownika nick (może być: "none", "visitor", "participant", "moderator")
/room affil jid affil [powód]
Zmienia przynależność jid'a (może być: "none", "member", "admin", "owner")
/room setopt print_status|auto_whois|flag_joins [warotść]
--- a/mcabber/doc/help/ru/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/ru/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -35,8 +35,8 @@
Пригласить пользователя "jid" в текущую конференцию
/room kick nick [reason]
Исключить пользователя "jid" из текущей конференции
-/room role jid role [reason]
- Изменить статус пользователя "jid" (статус может быть "none", "visitor", "participant", "moderator")
+/room role nick role [reason]
+ Изменить статус пользователя "nick" (статус может быть "none", "visitor", "participant", "moderator")
/room affil jid affil [reason]
Принять пользователя "jid" в члены конференции (члены могут быть "none", "member", "admin", "owner")
/room setopt print_status|auto_whois|flag_joins [value]
--- a/mcabber/doc/help/uk/hlp_room.txt Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/doc/help/uk/hlp_room.txt Sat Sep 17 10:02:56 2016 +0200
@@ -36,8 +36,8 @@
Надіслати jid запрошення до поточної кімнати.
/room kick прізвисько [причина]
Кікнути "прізвисько" з кімнати.
-/room role jid роль [причина]
- Змінити роль jid у комнаті ("none", "visitor", "participant", "moderator")
+/room role прізвисько роль [причина]
+ Змінити роль "прізвисько" у комнаті ("none", "visitor", "participant", "moderator")
/room affil jid ступінь [причина]
Змінити ступінь довіри для jid ("none", "member", "admin", "owner").
/room setopt print_status|auto_whois|flag_joins [значення]
--- a/mcabber/mcabber/commands.c Mon Sep 12 22:39:04 2016 +0200
+++ b/mcabber/mcabber/commands.c Sat Sep 17 10:02:56 2016 +0200
@@ -2701,17 +2701,17 @@
static void room_role(gpointer bud, char *arg)
{
char **paramlst;
- gchar *fjid, *rolename;
+ gchar *nick, *rolename;
struct role_affil ra;
const char *roomid = buddy_getjid(bud);
- paramlst = split_arg(arg, 3, 1); // jid, new_role, [reason]
- fjid = *paramlst;
+ paramlst = split_arg(arg, 3, 1); // nick, new_role, [reason]
+ nick = *paramlst;
rolename = *(paramlst+1);
arg = *(paramlst+2);
- if (!fjid || !*fjid || !rolename || !*rolename) {
- scr_LogPrint(LPRINT_NORMAL, "Please specify both a Jabber ID and a role.");
+ if (!nick || !*nick || !rolename || !*rolename) {
+ scr_LogPrint(LPRINT_NORMAL, "Please specify both a nickname and a role.");
free_arg_lst(paramlst);
return;
}
@@ -2723,11 +2723,11 @@
break;
if (ra.val.role < imrole_size) {
- gchar *jid_utf8, *reason_utf8;
- jid_utf8 = to_utf8(fjid);
+ gchar *nick_utf8, *reason_utf8;
+ nick_utf8 = to_utf8(nick);
reason_utf8 = to_utf8(arg);
- xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
- g_free(jid_utf8);
+ xmpp_room_setattrib(roomid, NULL, nick_utf8, ra, reason_utf8);
+ g_free(nick_utf8);
g_free(reason_utf8);
} else {
scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter.");