Fixed caps module

wiseguiz · Jan 26, 2016 · 1c14ee7 · 1c14ee7
1 parent fda201e
commit 1c14ee7
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/plugins/data.lua b/plugins/data.lua
@@ -214,7 +214,7 @@ return {
       if args[2] == 'LS' or args[2] == 'ACK' or args[2] == 'NAK' then
         to_process = { }
       end
-      if args[2] == 'LS' or args[2] == 'ACK' then
+      if args[2] == 'LS' or args[2] == 'ACK' or args[2] == 'NEW' or args[2] == 'DEL' then
         for item in trailing:gmatch('%S+') do
           for _index_0 = 1, #caps do
             local cap = caps[_index_0]
@@ -229,6 +229,29 @@ return {
       end
       if args[2] == 'LS' then
         return self:send_raw(('CAP REQ :%s'):format(table.concat(to_process, ' ')))
+      elseif args[2] == 'NEW' then
+        local to_send = { }
+        for item in trailing:gmatch('%S+') do
+          for _index_0 = 1, #caps do
+            local cap = caps[_index_0]
+            if item == cap then
+              self:fire_hook('REQ_CAP')
+              to_send[#to_send + 1] = item
+            end
+          end
+        end
+        return self:send_raw(('CAP REQ :%s'):format(table.concat(to_send, ' ')))
+      elseif args[2] == 'DEL' then
+        local to_send = { }
+        for item in trailing:gmatch('%S+') do
+          for _index_0 = 1, #caps do
+            local cap = caps[_index_0]
+            if item == cap then
+              self:fire_hook('DEL_CAP')
+              to_send[#to_send + 1] = item
+            end
+          end
+        end
       elseif args[2] == 'ACK' then
         for _index_0 = 1, #to_process do
           local cap = to_process[_index_0]

diff --git a/plugins/data.moon b/plugins/data.moon
@@ -148,14 +148,29 @@ serve_self ==> setmetatable(@, {__call: ()=>pairs(@)})
 			caps = {'extended-join', 'multi-prefix', 'away-notify', 'account-notify',
 				'chghost', 'server-time'}
 			to_process = {} if args[2] == 'LS' or args[2] == 'ACK' or args[2] == 'NAK'
-			if args[2] == 'LS' or args[2] == 'ACK'
+			if args[2] == 'LS' or args[2] == 'ACK' or args[2] == 'NEW' or args[2] == 'DEL'
 				for item in trailing\gmatch '%S+'
 					for cap in *caps
 						if item == cap
 							@fire_hook 'REQ_CAP' if args[2] == 'LS'
 							to_process[#to_process + 1] = cap
 			if args[2] == 'LS'
 				@send_raw ('CAP REQ :%s')\format table.concat(to_process, ' ')
+			elseif args[2] == 'NEW'
+				to_send = {}
+				for item in trailing\gmatch '%S+'
+					for cap in *caps
+						if item == cap
+							@fire_hook 'REQ_CAP'
+							to_send[#to_send + 1] = item
+				@send_raw ('CAP REQ :%s')\format table.concat(to_send, ' ')
+			elseif args[2] == 'DEL'
+				to_send = {}
+				for item in trailing\gmatch '%S+'
+					for cap in *caps
+						if item == cap
+							@fire_hook 'DEL_CAP'
+							to_send[#to_send + 1] = item
 			elseif args[2] == 'ACK'
 				for cap in *to_process
 					key, value = cap\match '^(.-)=(.+)'