From c2fbf4f728e441c68bc7ef7dde27320bce9a1b9a Mon Sep 17 00:00:00 2001
From: xfnw <xfnw@ttm.sh>
Date: Mon, 23 Nov 2020 16:39:51 -0500
Subject: [PATCH] ham keep and owo modules ported

---
 {old_modules => modules}/ham.py  |  8 ++++----
 {old_modules => modules}/keep.py | 20 ++++++++++----------
 {old_modules => modules}/owo.py  |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)
 rename {old_modules => modules}/ham.py (84%)
 rename {old_modules => modules}/keep.py (73%)
 rename {old_modules => modules}/owo.py (84%)

diff --git a/old_modules/ham.py b/modules/ham.py
similarity index 84%
rename from old_modules/ham.py
rename to modules/ham.py
index 0e7aeb4..c6ab183 100644
--- a/old_modules/ham.py
+++ b/modules/ham.py
@@ -1,7 +1,7 @@
-
+from bot import *
 import json, requests
 
-
+@command('lookup')
 async def lookup(self,c,n,m):
   if len(m) < 1:
     await self.message(c, '[\x036ham\x0f] you need the callsign lol')
@@ -18,7 +18,7 @@ async def lookup(self,c,n,m):
 
 
 async def init(self):
-  self.cmd['lookup'] = lookup
-  self.help['lookup'] = ['lookup <callsign> - lookup a ham callsign','ROBERT']
+  pass
+  #self.help['lookup'] = ['lookup <callsign> - lookup a ham callsign','ROBERT']
 
 
diff --git a/old_modules/keep.py b/modules/keep.py
similarity index 73%
rename from old_modules/keep.py
rename to modules/keep.py
index c9d2bb3..2794200 100644
--- a/old_modules/keep.py
+++ b/modules/keep.py
@@ -1,4 +1,4 @@
-
+from bot import *
 import random
 
 async def getkeep(self,c,n,m):
@@ -72,18 +72,18 @@ async def rmkeep(self,c,n,m):
     await self.message(c,'[\x036keep\x0f] you must have +o in #balun')
 
 async def init(self):
-  self.keepdb = self.db['keep']
+  self.keepdb = shared.db['keep']
 
-  self.cmd['keep'] = getkeep
-  self.help['keep'] = ['keep - get keeps about keep','lets learn about keep!']
+  shared.commands['keep'] = getkeep
+  #self.help['keep'] = ['keep - get keeps about keep','lets learn about keep!']
   
-  self.cmd['addkeep'] = addkeep
-  self.help['addkeep'] = ['addkeep <keep> - add a new keep (more)','if you find something offensive contact lickthecheese, he can remove it and/or tell you who added it so watch out!']
+  shared.commands['addkeep'] = addkeep
+  #self.help['addkeep'] = ['addkeep <keep> - add a new keep (more)','if you find something offensive contact lickthecheese, he can remove it and/or tell you who added it so watch out!']
 
-  self.cmd['grabkeep'] = grabkeep
-  self.help['grabkeep'] = ['grabkeep [back] - grab something to keep','tooootally did not steal this from bitbot']
+  shared.commands['grabkeep'] = grabkeep
+  #self.help['grabkeep'] = ['grabkeep [back] - grab something to keep','tooootally did not steal this from bitbot']
 
   self.rmkeepchan = "#balun"
-  self.cmd['rmkeep'] = rmkeep
-  self.help['rmkeep'] = ['rmkeep <criteria> <pattern> - remove some keep(s). criteria types in (more)','types of criteria: n|nick q|quote eg "rmkeep nick spammer" to get rid of all keeps created by nick spammer']
+  shared.commands['rmkeep'] = rmkeep
+  #self.help['rmkeep'] = ['rmkeep <criteria> <pattern> - remove some keep(s). criteria types in (more)','types of criteria: n|nick q|quote eg "rmkeep nick spammer" to get rid of all keeps created by nick spammer']
 
diff --git a/old_modules/owo.py b/modules/owo.py
similarity index 84%
rename from old_modules/owo.py
rename to modules/owo.py
index 1454b9a..58ee602 100644
--- a/old_modules/owo.py
+++ b/modules/owo.py
@@ -1,4 +1,4 @@
-
+from bot import *
 import random
 
 async def owologger(self,c,n,m):
@@ -32,7 +32,7 @@ async def owotext(self, back, chan):
 
 async def init(self):
   self.owolog = {}
-  self.rawm['owolog'] = owologger
-  self.cmd['owo'] = owoify
-  self.help['owo'] = ['owo [num] - owoify the text', 'owo owo uwu']
+  shared.rawm['owolog'] = owologger
+  shared.commands['owo'] = owoify
+  #self.help['owo'] = ['owo [num] - owoify the text', 'owo owo uwu']