From b61ac21e867d3fbf159ebeb99b24b57f342a6c2a Mon Sep 17 00:00:00 2001
From: James Lu <GLolol@overdrivenetworks.com>
Date: Fri, 29 Apr 2016 22:39:37 -0700
Subject: [PATCH] hybrid, ts6: adjust umode definitions again

- Prefix non-standard snomask umodes with sno_ to avoid confusion
- Remove _hybrid suffixes and chary_ prefixes, they serve little use
- Re-map some hybrid modes to match existing definitions: showadmin->admin, smessages->snomask, hideops->hideoper, softcallerid->deaf_commonchan
---
 protocols/hybrid.py | 18 +++++++++---------
 protocols/ts6.py    |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/protocols/hybrid.py b/protocols/hybrid.py
index dffff13..f22891e 100644
--- a/protocols/hybrid.py
+++ b/protocols/hybrid.py
@@ -44,16 +44,16 @@ class HybridProtocol(TS6Protocol):
         self.irc.cmodes = cmodes
 
         umodes = {
-            'oper': 'o', 'invisible': 'i', 'wallops': 'w', 'chary_locops': 'l',
-            'cloak_hybrid': 'x', 'hidechans': 'p', 'regdeaf': 'R', 'deaf': 'D',
-            'callerid': 'g', 'showadmin': 'a', 'softcallerid': 'G', 'hideops': 'H',
-            'webirc': 'W', 'client_connections': 'c', 'bad_client_connections': 'u',
-            'rejected_clients': 'j', 'skill_notices': 'k', 'fullauthblock': 'f',
-            'remote_client_connections': 'F', 'admin_requests': 'y', 'debug': 'd',
-            'nickchange_notices': 'n', 'hideidle': 'q', 'registered': 'r',
-            'smessages': 's', 'ssl': 'S', 'sjoins': 'e', 'botfloods': 'b',
+            'oper': 'o', 'invisible': 'i', 'wallops': 'w', 'locops': 'l',
+            'cloak': 'x', 'hidechans': 'p', 'regdeaf': 'R', 'deaf': 'D',
+            'callerid': 'g', 'admin': 'a', 'deaf_commonchan': 'G', 'hideoper': 'H',
+            'webirc': 'W', 'sno_clientconnections': 'c', 'sno_badclientconnections': 'u',
+            'sno_rejectedclients': 'j', 'sno_skill': 'k', 'sno_fullauthblock': 'f',
+            'sno_remoteclientconnections': 'F', 'sno_admin_requests': 'y', 'debug': 'd',
+            'sno_nickchange': 'n', 'hideidle': 'q', 'registered': 'r',
+            'snomask': 's', 'ssl': 'S', 'sno_server_connects': 'e', 'sno_botfloods': 'b',
             # Now, map all the ABCD type modes:
-            '*A': '', '*B': '', '*C': '', '*D': 'oiwlpRDgdx'
+            '*A': '', '*B': '', '*C': '', '*D': 'DFGHRSWabcdefgijklnopqrsuwxy'
         }
 
         self.irc.umodes = umodes
diff --git a/protocols/ts6.py b/protocols/ts6.py
index e602d15..d680642 100644
--- a/protocols/ts6.py
+++ b/protocols/ts6.py
@@ -281,10 +281,10 @@ class TS6Protocol(TS6BaseProtocol):
         chary_umodes = {'deaf': 'D', 'servprotect': 'S', 'u_admin': 'a',
                         'invisible': 'i', 'oper': 'o', 'wallops': 'w',
                         'snomask': 's', 'u_noforward': 'Q', 'regdeaf': 'R',
-                        'callerid': 'g', 'chary_operwall': 'z', 'chary_locops':
-                        'l', 'cloak': 'x',
-                         # Now, map all the ABCD type modes:
-                         '*A': '', '*B': '', '*C': '', '*D': 'DSaiowsQRgzlx'}
+                        'callerid': 'g', 'operwall': 'z', 'locops': 'l',
+                        'cloak': 'x',
+                        # Now, map all the ABCD type modes:
+                        '*A': '', '*B': '', '*C': '', '*D': 'DSaiowsQRgzlx'}
         self.irc.umodes = chary_umodes
 
         # Toggles support of shadowircd/elemental-ircd specific channel modes: