GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-24 11:42:51 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
These use InspIRCd specific arguments which don't map cleanly to other IRCds. #559
This commit is contained in:
James Lu 2017-12-18 13:05:12 -08:00
parent 6c65d5523e
commit ec3b230eab
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/modelists/channel-modes.csv
View File

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

1 Channel Mode / IRCd rfc1459 hybrid inspircd ngircd p10/ircu p10/nefarious p10/snircd ts6/charybdis ts6/chatircd ts6/elemental ts6/ratbox unreal
23 issecure Z
24 joinflood j (m_joinflood) j j j
25 key k k k k k k k k k k k k
26 kicknorejoin J (m_kicknorejoin) J
27 kicknorejoin_insp J (m_kicknorejoin)
28 largebanlist L L L
29 limit l l l l l l l l l l l l
30 moderated m m m m m m m m m m m m
54 registered r r (m_services_account) r R R R r
55 regmoderated M M (m_services_account) M M M M
56 regonly R R (m_services_account) R r r r r r r r R
57 repeat E (m_repeat) K (ext/chm_norepeat.c)
58 repeat_insp E (m_repeat)
59 secret s s s s s s s s s s s s
60 sslonly S z (m_sslmodes) z S (ext/chm_sslonly) S (ext/chm_sslonly) S (ext/chm_sslonly.c) S z
61 stripcolor S (m_stripcolor) S c c c S

10
docs/modelists/channel-modes.html
View File

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

7
protocols/inspircd.py
View File

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