From 28978abce3bcb6df3f8b64341bd1ed7454064ff7 Mon Sep 17 00:00:00 2001 From: Pratyush Desai Date: Fri, 1 Nov 2024 18:14:44 +0530 Subject: [PATCH 1/2] Remove Deprecated Logic Remove deprecated logic wrt performing lookups on TripSit API. Was already not in use due to issues with data and it's potential impact on users. Signed-off-by: Pratyush Desai --- plugin.py | 78 ------------------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/plugin.py b/plugin.py index 6b2ba57..0c79fca 100644 --- a/plugin.py +++ b/plugin.py @@ -53,12 +53,6 @@ except ImportError: filename = conf.supybot.directories.data.dirize("Tripsit.db") - -#url_drug = "http://tripbot.tripsit.me/api/tripsit/getDrug" -#url_combo = "http://tripbot.tripsit.me/api/tripsit/getInteraction" -url_drug = "http://172.16.24.2:1999/api/tripsit/getDrug" -url_combo = "http://172.16.24.2:1999/api/tripsit/getInteraction" - insufflated = ["Insufflation", "Insufflation-IR", "Insufflation-XR"] METHODS = { @@ -109,55 +103,6 @@ class Tripsit(callbacks.Plugin): world.flushers.remove(self._flushDb) self.__parent.die() - @wrap(['something', optional('something')]) - def drug(self, irc, msg, args, name, category): - """ [] - - fetches data on drug from tripsit wiki - """ -# category_list = [] -# r = requests.get(url_drug, params={"name": name}).json() -# if not r['err']: -# drug = r["data"][0]["pretty_name"] -# properties = r["data"][0]["properties"] -# for key in properties: -# category_list.append(key) -# if category is None: -# re = drug + " Available categories are: " + ", ".join(category_list) -# irc.reply(re) -# else: -# if category in properties.keys(): -# re = drug + " " + properties[category] -# irc.reply(re) -# else: -# irc.error(f"Unknown category {drug} Available categories are: " + ", ".join(category_list)) -# else: -# irc.error("unknown drug") - irc.reply("This no longer works, try @psywiki " + name + " " + category) - -# def combo(self, irc, msg, args, drugA, drugB): -# """ -# -# fetches known interactions between the substances provided. -# """ -# r = requests.get(url_combo, params={f"drugA": drugA, f"drugB": drugB}).json() -# if not r["err"] and r["data"][0]: -# interaction = r["data"][0] -# drug_a = interaction["interactionCategoryA"] -# drug_b = interaction["interactionCategoryB"] -# interaction_status = interaction["status"] -# re = f"{drug_a} and {drug_b}: {interaction_status}" -# if 'note' in interaction: -# note = interaction["note"] -# re += f'. Note: {note}' -# irc.reply(re) -# else: -# irc.reply(re) -# else: -# irc.reply("Unknown combo (that doesn't mean it's safe). Known combos: lsd, mushrooms, dmt, mescaline, dox, nbomes, 2c-x, 2c-t-x, amt, 5-meo-xxt, cannabis, ketamine, mxe, dxm, pcp, nitrous, amphetamines, mdma, cocaine, caffeine, alcohol, ghb/gbl, opioids, tramadol, benzodiazepines, maois, ssris.") -# -# combo = wrap(combo, [("something"), ("something")]) - def set(self, irc, msg, args, timezone): """ @@ -185,31 +130,12 @@ class Tripsit(callbacks.Plugin): [--ago] and [ROA] fields are optional """ opts = dict(opts) -# r = requests.get(url_drug, params={"name": name}).json() found_method = False onset = None -# if not r['err']: -# drug = r['data'][0] -# drug_name = drug['pretty_name'] -# method_keys = ['value'] methods = [] if method: methods = [method.lower()] methods = METHODS.get(methods[0], methods) -# method_keys += methods - -# if 'formatted_onset' in drug: -# match = list(set(method_keys)& -# set(drug["formatted_onset"].keys())) -# if match: -# onset = drug["formatted_onset"][match[0]] -# found_method = True -# if match[0] in methods: -# method = (match or [method])[0] -# -# if onset and "_unit" in drug["formatted_onset"]: -# onset = "%s %s" % ( -# onset, drug["formatted_onset"]["_unit"]) drug_and_method = name if method: if not found_method: @@ -261,7 +187,6 @@ class Tripsit(callbacks.Plugin): # re=":-( This is currently not available, sorry. Exception ID T0T4LLYFCK3D." irc.reply(re) - @wrap([optional('positiveInt')]) def undose(self, irc, msg, args, entry): """ @@ -345,7 +270,6 @@ class Tripsit(callbacks.Plugin): """ retrieves your last logged doses - """ if history > 20: irc.error("you can't retrieve more than 20 doses") @@ -378,8 +302,6 @@ class Tripsit(callbacks.Plugin): else: irc.error(f'No doses saved for {nick}') - - @wrap(["something"]) def amountdosed(self, irc, msg, args, drug): """ -- 2.35.3 From 13ce17653a275b4bb1b3b9046d07c4aa921559f5 Mon Sep 17 00:00:00 2001 From: Pratyush Desai Date: Fri, 1 Nov 2024 18:25:38 +0530 Subject: [PATCH 2/2] rm deps, fix formatting Remove unneeded deps and some whitespace related formatting based on flake8 output. Signed-off-by: Pratyush Desai --- plugin.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/plugin.py b/plugin.py index 0c79fca..fcdf901 100644 --- a/plugin.py +++ b/plugin.py @@ -28,19 +28,13 @@ ### -from humanize import ordinal from supybot import utils, plugins, ircutils, callbacks, world, conf, log from supybot.commands import * from num2words import num2words -import dateutil.parser -import json -import requests import pickle -import sys import datetime -import time import pytz try: @@ -69,6 +63,7 @@ METHODS = { "smoked": ["Smoked"] } + class Tripsit(callbacks.Plugin): """Harm-Reduction tools from tripsit's tripbot and the tripsitwiki""" threaded = True @@ -115,7 +110,7 @@ class Tripsit(callbacks.Plugin): if nick in self.db: self.db[nick]['timezone'] = timezone else: - self.db[nick] = {'timezone': timezone } + self.db[nick] = {'timezone': timezone} irc.replySuccess() except pytz.UnknownTimeZoneError: irc.error(_('Unknown timezone'), Raise=True) @@ -155,7 +150,7 @@ class Tripsit(callbacks.Plugin): dose_td = datetime.timedelta(hours=int(ago[0:2]), minutes=int(ago[2:4])) dose_td_s = dose_td.total_seconds() time = time - dose_td - doseLog = {'time': time, 'dose': dose, 'drug': name, 'method': method } + doseLog = {'time': time, 'dose': dose, 'drug': name, 'method': method} doses = self.db[nick].get('doses') if doses: doses.append(doseLog) @@ -172,7 +167,7 @@ class Tripsit(callbacks.Plugin): dose_td = datetime.timedelta(hours=int(ago[0:2]), minutes=int(ago[2:4])) dose_td_s = dose_td.total_seconds() time = time - dose_td - doseLog = {'time': time, 'dose': dose, 'drug': name, 'method': method } + doseLog = {'time': time, 'dose': dose, 'drug': name, 'method': method} doses = [doseLog] self.db[nick] = {'timezone': timezone, 'doses': doses} @@ -190,7 +185,7 @@ class Tripsit(callbacks.Plugin): @wrap([optional('positiveInt')]) def undose(self, irc, msg, args, entry): """ - + removes your last dose entry, if is provided then deletes the nth last dose """ @@ -253,8 +248,8 @@ class Tripsit(callbacks.Plugin): dose_time = lastdose['time'] timezone = self.db[nick]['timezone'] tz = pytz.timezone(str(timezone)) - time = datetime.datetime.now(tz=tz) - since_dose = time - dose_time + time = datetime.datetime.now(tz = tz) + since_dose= time - dose_time since_dose_seconds = since_dose.total_seconds() if history: history = num2words(history, to='ordinal') @@ -279,7 +274,7 @@ class Tripsit(callbacks.Plugin): try: rangecheck = self.db[nick]['doses'][-int(history)] irc.reply(f"Your last {history} doses logged are:", private=True) - for number in range(history,0,-1): + for number in range(history, 0, -1): lastdose = self.db[nick]['doses'][-int(number)] dose = lastdose['dose'] drug = lastdose['drug'] @@ -315,7 +310,7 @@ class Tripsit(callbacks.Plugin): doselogs = self.db[nick]['doses'] for doselog in doselogs: if doselog["drug"] == drug: - for i,c in enumerate(doselog["dose"]): + for i, c in enumerate(doselog["dose"]): if not c.isdigit(): break num += int(doselog["dose"][:i]) @@ -323,7 +318,7 @@ class Tripsit(callbacks.Plugin): irc.reply(f"You have dosed a total of {num}{unit} amount of {drug}") else: irc.error(f"No doses saved for {nick}") - + Class = Tripsit -- 2.35.3