From 7b01bb833f5bc3386611dc0c015a99c236e941f6 Mon Sep 17 00:00:00 2001
From: Sebastian Köhler <sebkoehler@whoami.org.uk>
Date: Sat, 4 Aug 2012 14:19:58 +0200
Subject: Implemented xop support

3 new channel user modes have been added.

Half Op: +h(Prefix: %) can set the channel modes +imntvIbek
and kick all +v and normal users.

Admin: +a(Prefix: &) can set channel modes +imntvIbekoRsz and kick all
+o, +h, +v and normal users.

Owner: +q(Prefix: ~) can set channel modes +imntvIbekoRsz and kick all
+a, +o, +h, +v and normal users
---
 doc/.gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/.gitignore b/doc/.gitignore
index 0035855c..a7b6a22c 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
 sample-ngircd.conf
+Add_Modes.txt
-- 
cgit 1.4.1


From 097c72aa65d9914d688eaece718648ca060e287a Mon Sep 17 00:00:00 2001
From: Sebastian Köhler <sebkoehler@whoami.org.uk>
Date: Sun, 5 Aug 2012 23:38:47 +0200
Subject: Tests and documentation for xop

---
 doc/Modes.txt             |  5 ++++
 src/testsuite/mode-test.e | 68 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

(limited to 'doc')

diff --git a/doc/Modes.txt b/doc/Modes.txt
index e47e2707..d61bd2d0 100644
--- a/doc/Modes.txt
+++ b/doc/Modes.txt
@@ -66,7 +66,12 @@ channel of which he is a member.
 
   mode	since	description
 
+  q	20?	User is channel owner can only be set by a service, other
+		owner and irc op. Can promote other users to q, a, o, h, v.
+  a	20?	User is channel admin and can promote other users to v, h, o
   o	0.2.0	User is channel operator and can op/kick/... other members.
+  h	20?	User is half op and can set channel modes imntvIbek and kick
+		voiced and normal users.
   v	0.2.0	User is "voiced" and can speak even if channel is moderated.
 
 
diff --git a/src/testsuite/mode-test.e b/src/testsuite/mode-test.e
index 260cd03c..44b6e5df 100644
--- a/src/testsuite/mode-test.e
+++ b/src/testsuite/mode-test.e
@@ -31,6 +31,46 @@ expect {
 	"@* MODE nick :-i"
 }
 
+send "join #usermode\r"
+expect {
+	timeout { exit 1 }
+	"@* JOIN :#usermode"
+}
+expect {
+	timeout { exit 1 }
+	"366"
+}
+
+send "mode #usermode +v nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode +v nick\r"
+}
+
+send "mode #usermode +h nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode +h nick\r"
+}
+
+send "mode #usermode +a nick\r"
+expect {
+	timeout { exit 1 }
+	"482 nick"
+}
+
+send "mode #usermode +q nick\r"
+expect {
+	timeout { exit 1 }
+	"482 nick"
+}
+
+send "mode #usermode -vho nick nick nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode -vho nick nick nick"
+}
+
 send "oper TestOp 123\r"
 expect {
 	timeout { exit 1 }
@@ -47,6 +87,34 @@ expect {
 	"221 nick +o"
 }
 
+send "mode #usermode +a nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode +a nick"
+}
+
+send "mode #usermode +q nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode +q nick"
+}
+
+send "names #usermode\r"
+expect {
+	timeout { exit 1 }
+	"353 nick = #usermode :~nick"
+}
+expect {
+	timeout { exit 1 }
+	"366 nick #usermode"
+}
+
+send "part #usermode\r"
+expect {
+	timeout { exit 1 }
+	"@* PART #usermode"
+}
+
 send "join #channel\r"
 expect {
 	timeout { exit 1 }
-- 
cgit 1.4.1


From b12acddf4fd143a91a825ba40ef0a15d7f2c3e4a Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Sun, 23 Sep 2012 17:52:26 +0200
Subject: doc/Modes.txt: add version number to new channel modes

---
 doc/Modes.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/Modes.txt b/doc/Modes.txt
index dec80ce8..e3b754d6 100644
--- a/doc/Modes.txt
+++ b/doc/Modes.txt
@@ -68,11 +68,11 @@ channel of which he is a member.
 
   mode	since	description
 
-  q	20?	User is channel owner can only be set by a service, other
+  q	20	User is channel owner can only be set by a service, other
 		owner and irc op. Can promote other users to q, a, o, h, v.
-  a	20?	User is channel admin and can promote other users to v, h, o
+  a	20	User is channel admin and can promote other users to v, h, o
   o	0.2.0	User is channel operator and can op/kick/... other members.
-  h	20?	User is half op and can set channel modes imntvIbek and kick
+  h	20	User is half op and can set channel modes imntvIbek and kick
 		voiced and normal users.
   v	0.2.0	User is "voiced" and can speak even if channel is moderated.
 
-- 
cgit 1.4.1


From 1744a8d145c35edbb4abf093dd7336ecde4965d5 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Sun, 23 Sep 2012 17:52:53 +0200
Subject: Clean up doc/.gitignore

---
 doc/.gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc')

diff --git a/doc/.gitignore b/doc/.gitignore
index a7b6a22c..0035855c 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,2 +1 @@
 sample-ngircd.conf
-Add_Modes.txt
-- 
cgit 1.4.1