inspircd: move definitions for cmodes +J and +E to kicknorejoin_insp and repeat_insp

These use InspIRCd specific arguments which don't map cleanly to other IRCds. #559

docs/modelists/channel-modes.csv

@@ -23,7 +23,8 @@ inviteonly,i,i,i,i,i,i,i,i,i,i,i,i
 issecure,,,,,,,,,,,,Z
 joinflood,,,j (m_joinflood),,,,,j,j,j,,
 key,k,k,k,k,k,k,k,k,k,k,k,k
-kicknorejoin,,,J (m_kicknorejoin),,,,,,,J,,
+kicknorejoin,,,,,,,,,,J,,
+kicknorejoin_insp,,,J (m_kicknorejoin),,,,,,,,,
 largebanlist,,,,,,,,L,L,L,,
 limit,l,l,l,l,l,l,l,l,l,l,l,l
 moderated,m,m,m,m,m,m,m,m,m,m,m,m
@@ -53,7 +54,8 @@ redirect,,,L (m_redirect),,,L,,f,f,f,,L
 registered,,r,r (m_services_account),r,R,R,R,,,,,r
 regmoderated,,M,M (m_services_account),M,,M,M,,,,,M
 regonly,,R,R (m_services_account),R,r,r,r,r,r,r,r,R
-repeat,,,E (m_repeat),,,,,,,K (ext/chm_norepeat.c),,
+repeat,,,,,,,,,,K (ext/chm_norepeat.c),,
+repeat_insp,,,E (m_repeat),,,,,,,,,
 secret,s,s,s,s,s,s,s,s,s,s,s,s
 sslonly,,S,z (m_sslmodes),z,,,,S (ext/chm_sslonly),S (ext/chm_sslonly),S (ext/chm_sslonly.c),S,z
 stripcolor,,,S (m_stripcolor),,,S,,c,c,c,,S

docs/modelists/channel-modes.html

@@ -160,7 +160,10 @@ td:first-child, th[scope="row"] {
 <td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td><td class="tablecell-yes">+k</td></tr>
 <tr>
 <th scope="row">kicknorejoin</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-special">+J<br><span class="note">(m_kicknorejoin)</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">+J</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">+J</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<tr>
+<th scope="row">kicknorejoin_insp</th>
+<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-special">+J<br><span class="note">(m_kicknorejoin)</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">largebanlist</th>
 <td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">+L</td><td class="tablecell-yes">+L</td><td class="tablecell-yes">+L</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
@@ -250,7 +253,10 @@ td:first-child, th[scope="row"] {
 <td class="tablecell-na note">n/a</td><td class="tablecell-yes">+R</td><td class="tablecell-special">+R<br><span class="note">(m_services_account)</span></td><td class="tablecell-yes">+R</td><td class="tablecell-yes">+r</td><td class="tablecell-yes">+r</td><td class="tablecell-yes">+r</td><td class="tablecell-yes">+r</td><td class="tablecell-yes">+r</td><td class="tablecell-yes">+r</td><td class="tablecell-yes">+r</td><td class="tablecell-yes">+R</td></tr>
 <tr>
 <th scope="row">repeat</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-special">+E<br><span class="note">(m_repeat)</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-special">+K<br><span class="note">(ext/chm_norepeat.c)</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-special">+K<br><span class="note">(ext/chm_norepeat.c)</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<tr>
+<th scope="row">repeat_insp</th>
+<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-special">+E<br><span class="note">(m_repeat)</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">secret</th>
 <td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td><td class="tablecell-yes">+s</td></tr>

protocols/inspircd.py

@@ -452,7 +452,7 @@ class InspIRCdProtocol(TS6BaseProtocol):
                 # Strip c_ prefixes to be consistent with other protocols.
                 name = name.lstrip('c_')
 
-                if name == 'reginvite':  # Reginvite? That's a dumb name.
+                if name == 'reginvite':  # Reginvite? That's an odd name.
                     name = 'regonly'
 
                 if name == 'founder':  # Channel mode +q
@@ -461,6 +461,11 @@ class InspIRCdProtocol(TS6BaseProtocol):
                     # but I personally prefer the latter.
                     name = 'owner'
 
+                if name in ('repeat', 'kicknorejoin'):
+                    # Suffix modes using inspircd-specific arguments so that it can
+                    # be safely relayed.
+                    name += '_insp'
+
                 # We don't care about mode prefixes; just the mode char.
                 self.cmodes[name] = char[-1]