Duh, chaining....

kmk/handlers/modtap.py

@@ -3,13 +3,7 @@ from kmk.kmktime import ticks_diff, ticks_ms
 
 def mt_pressed(key, state, *args, **kwargs):
     # Sets the timer start and acts like a modifier otherwise
-    state.keys_pressed.add(key.meta.mod1)
-    if key.meta.mod2:
-        state.keys_pressed.add(key.meta.mod2)
-    if key.meta.mod3:
-        state.keys_pressed.add(key.meta.mod3)
-    if key.meta.mod4:
-        state.keys_pressed.add(key.meta.mod4)
+    state.keys_pressed.add(key.meta.mods)
 
     state.start_time['mod_tap'] = ticks_ms()
     return state
@@ -17,13 +11,7 @@ def mt_pressed(key, state, *args, **kwargs):
 
 def mt_released(key, state, *args, **kwargs):
     # On keyup, check timer, and press key if needed.
-    state.keys_pressed.discard(key.meta.mod1)
-    if key.meta.mod2:
-        state.keys_pressed.discard(key.meta.mod2)
-    if key.meta.mod3:
-        state.keys_pressed.discard(key.meta.mod3)
-    if key.meta.mod4:
-        state.keys_pressed.discard(key.meta.mod4)
+    state.keys_pressed.discard(key.meta.mods)
     timer_name = 'mod_tap'
     if state.start_time[timer_name] and (
             ticks_diff(ticks_ms(), state.start_time[timer_name]) < state.config.tap_time

kmk/keys.py

@@ -679,11 +679,11 @@ make_argumented_key(
 )
 
 
-def mod_tap_validator(kc, mod1=None, mod2=None, mod3=None, mod4=None):
+def mod_tap_validator(kc, mods=None):
     '''
     Validates that mod tap keys are correctly used
     '''
-    return ModTapKeyMeta(kc=kc, mod1=mod1, mod2=mod2, mod3=mod3, mod4=mod4)
+    return ModTapKeyMeta(kc=kc, mods=mods)
 
 
 # ModTap

kmk/types.py

@@ -33,11 +33,8 @@ class LayerKeyMeta:
 
 
 class ModTapKeyMeta:
-    def __init__(self, kc=None, mod1=None, mod2=None, mod3=None, mod4=None):
-        self.mod1 = mod1
-        self.mod2 = mod2
-        self.mod3 = mod3
-        self.mod4 = mod4
+    def __init__(self, kc=None, mods=None):
+        self.mods = mods
         self.kc = kc