.gitignore

@@ -1,7 +1,14 @@
-*.log
+venv/
-__pycache__/
-config.json
-data/
 json/
 users/
-venv/
+__pycache__/
+doctorow_ebooks.txt
+.indexme
+*.swp
+*.log
+config.ini
+config.json
+plugins/pronouns.json
+plugins/ebooks/
+optout
+secrets.toml

bot.py

@@ -8,22 +8,28 @@ with open('config.json') as c:
     config = json.load(c)
 
 if __name__ == '__main__':
-    if len(sys.argv) > 1 and if sys.argv[1] == '--test-mode':
+    if len(sys.argv) > 1:
-        channels = config['test']['channels']
+        if sys.argv[1] == '--test-mode':
-        cmd_prefix = config['test']['cmd_prefix']
+            channels = ['#jmjl-devel']
-        nick = f"{config['nickname']}{config['test']['nick_suffix']}"
+            nick = 'ju[dev]'
-        prefix_plugins = True
+            prefix_plugins = True
+            cmd_prefix='^'
+        else:
+            channels = config['channels']
+            prefix_plugins = False
+            cmd_prefix='&'
+            nick = 'ju'
     else:
         channels = config['channels']
-        cmd_prefix = config['cmd_prefix']
+        nick = 'ju'
-        nick = config['nickname']
         prefix_plugins = False
+        cmd_prefix='&'
     bot = pinhook.bot.Bot(
         channels,
         nick,
         'localhost',
-        ops=config['ops'],
+        ops=['jmjl'],
-        ns_pass=f"{config['nickname'] {config['password']}",
+        ns_pass='ju {}'.format(config['password']),
         #ns_pass=config['password'],
         nickserv='nickserv',
         cmd_prefix=cmd_prefix,

plugins/tilde.py

@@ -111,8 +111,6 @@ def cleanwash_money(msg):
     #new_balance=((__import__('random').randint(80,110)/100)*balance).split('.')[0]
     new_balance = Decimal(randint(80,110))/Decimal(100)*Decimal(balance)
     new_balance = new_balance.quantize(Decimal('1.'), rounding=ROUND_DOWN)
-    percentage_return = new_balance/balance * Decimal(100)
-    percentage_return = percentage_return.quantize(Decimal('.00'), rounding=ROUND_DOWN)
     #jackpot_balance=(0.10*balance).split('.')[0]
     jackpot_balance = (Decimal(0.10)*Decimal(balance)).quantize(Decimal('1.'), rounding=ROUND_DOWN)
     with open(util.tilde.JACKPOT_FILE, "r+") as jackpotfile:
@@ -121,6 +119,6 @@ def cleanwash_money(msg):
         jackpotfile.truncate()
         jackpot_now = str(jackpot + jackpot_balance)
         jackpotfile.write(jackpot_now)
-    message = f"Cleanwashed {balance}TCN, and given the user {new_balance}TCN ({percentage_return}%) and contributed {jackpot_balance}TCN to the balance, jackpot at {jackpot_now}TCN"
+    message = f"Cleanwashed {balance}TCN, and given the user {new_balance}TCN and contributed {jackpot_balance}TCN to the balance, jackpot at {jackpot_now}TCN"
     util.tilde.admin_update_tilde(nick,amount=new_balance,time=msg.timestamp,comment=message)
     return pinhook.plugin.message(message)

run.sh

@@ -2,4 +2,4 @@
 
 cd ~jmjl/dev/juju
 
-exec /home/jmjl/usr/share/python/venv/pinhook-juju/bin/python /home/jmjl/dev/juju/bot.py "$1"
+exec /home/jmjl/usr/share/python/venv/pinhook-juju/bin/python /home/jmjl/dev/juju/bot.py