diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 98fa1cb..673c866 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,13 +1,17 @@ repos: -- repo: https://github.com/ambv/black - rev: 22.3.0 + - repo: https://github.com/psf/black + rev: 22.6.0 hooks: - id: black args: - --line-length=120 -- repo: https://gitlab.com/pycqa/flake8 + - repo: https://github.com/PyCQA/isort + rev: 5.10.1 + hooks: + - id: isort + args: ["--profile", "black"] + - repo: https://github.com/PyCQA/flake8 rev: 4.0.1 hooks: - - id: flake8 - args: - - "--max-line-length=120" + - id: flake8 + args: [--max-line-length=120] diff --git a/commands/alias.py b/commands/alias.py index ce55037..fd5e644 100644 --- a/commands/alias.py +++ b/commands/alias.py @@ -1,5 +1,6 @@ -import main from yaml import dump + +import main from modules import alias diff --git a/commands/blacklist.py b/commands/blacklist.py index 42684a6..7dc3c19 100644 --- a/commands/blacklist.py +++ b/commands/blacklist.py @@ -1,6 +1,7 @@ -import main from yaml import dump +import main + class BlacklistCommand: def __init__(self, *args): diff --git a/commands/dist.py b/commands/dist.py index 2348e29..a126e07 100644 --- a/commands/dist.py +++ b/commands/dist.py @@ -1,5 +1,6 @@ +from subprocess import PIPE, run + import main -from subprocess import run, PIPE class DistCommand: diff --git a/commands/email.py b/commands/email.py index ea36da0..c388a56 100644 --- a/commands/email.py +++ b/commands/email.py @@ -1,6 +1,7 @@ -import main from yaml import dump +import main + class EmailCommand: def __init__(self, *args): diff --git a/commands/network.py b/commands/network.py index 4a6bdf2..a1da160 100644 --- a/commands/network.py +++ b/commands/network.py @@ -1,7 +1,9 @@ -import main +from string import digits + from yaml import dump + +import main from modules.network import Network -from string import digits class NetworkCommand: diff --git a/commands/relay.py b/commands/relay.py index 34bbd70..2b80f5e 100644 --- a/commands/relay.py +++ b/commands/relay.py @@ -1,6 +1,7 @@ -import main from yaml import dump +import main + class RelayCommand: def __init__(self, *args): diff --git a/commands/stats.py b/commands/stats.py index 7102dd1..e2e8eb9 100644 --- a/commands/stats.py +++ b/commands/stats.py @@ -1,7 +1,8 @@ +from string import digits + import main import modules.counters as count import modules.userinfo as userinfo -from string import digits class StatsCommand: diff --git a/commands/token.py b/commands/token.py index 7d38eac..b5c9cd5 100644 --- a/commands/token.py +++ b/commands/token.py @@ -1,7 +1,9 @@ -import main -from yaml import dump from uuid import uuid4 +from yaml import dump + +import main + class TokenCommand: def __init__(self, *args): diff --git a/core/bot.py b/core/bot.py index 7edec16..a148350 100644 --- a/core/bot.py +++ b/core/bot.py @@ -1,31 +1,25 @@ -from twisted.internet.protocol import ReconnectingClientFactory -from twisted.words.protocols.irc import IRCClient +import sys +from copy import deepcopy +from datetime import datetime +from random import randint + +from twisted.internet import reactor from twisted.internet.defer import Deferred +from twisted.internet.protocol import ReconnectingClientFactory from twisted.internet.task import LoopingCall -from twisted.internet import reactor from twisted.words.protocols.irc import ( - numeric_to_symbolic, - lowDequote, IRCBadMessage, + IRCClient, + lowDequote, + numeric_to_symbolic, ) -import sys -from random import randint -from copy import deepcopy -from datetime import datetime - -from modules import userinfo -from modules import counters -from modules import monitor -from modules import chankeep -from modules import regproc - +import main from core.relay import sendRelayNotification +from modules import chankeep, counters, monitor, regproc, userinfo from utils.dedup import dedup - -import main -from utils.logging.log import log, warn, error from utils.logging.debug import debug +from utils.logging.log import error, log, warn from utils.logging.send import sendAll from utils.parsing import parsen diff --git a/core/logstash.py b/core/logstash.py index 94429bc..1e3c2c9 100644 --- a/core/logstash.py +++ b/core/logstash.py @@ -1,7 +1,8 @@ -import logstash import logging - from json import dumps + +import logstash + import main logger = None diff --git a/core/parser.py b/core/parser.py index 2f2383d..da0312c 100644 --- a/core/parser.py +++ b/core/parser.py @@ -1,6 +1,6 @@ import main from utils.logging.log import warn -from utils.logging.send import sendSuccess, sendFailure, sendInfo, incorrectUsage +from utils.logging.send import incorrectUsage, sendFailure, sendInfo, sendSuccess def parseCommand(addr, authed, data): diff --git a/core/relay.py b/core/relay.py index acd64cd..7ae0cba 100644 --- a/core/relay.py +++ b/core/relay.py @@ -1,5 +1,7 @@ -from twisted.internet.protocol import Protocol, Factory from json import dumps, loads + +from twisted.internet.protocol import Factory, Protocol + import main from utils.logging.log import log, warn diff --git a/core/server.py b/core/server.py index eda59e9..581d237 100644 --- a/core/server.py +++ b/core/server.py @@ -1,8 +1,8 @@ -from twisted.internet.protocol import Protocol, Factory -import main -from utils.logging.log import log, warn +from twisted.internet.protocol import Factory, Protocol +import main from core.parser import parseCommand +from utils.logging.log import log, warn class Server(Protocol): diff --git a/main.py b/main.py index be8e446..42950b9 100644 --- a/main.py +++ b/main.py @@ -1,8 +1,9 @@ import json import pickle -from redis import StrictRedis -from string import digits from os import urandom +from string import digits + +from redis import StrictRedis # List of errors ZNC can give us ZNCErrors = ["Error:", "Unable to load", "does not exist", "doesn't exist"] diff --git a/modules/alias.py b/modules/alias.py index 84b0adc..85cebc2 100644 --- a/modules/alias.py +++ b/modules/alias.py @@ -1,7 +1,8 @@ -import main import random import re +import main + def generate_password(): return "".join([chr(random.randint(0, 74) + 48) for i in range(32)]) diff --git a/modules/chankeep.py b/modules/chankeep.py index 66c1764..d22a755 100644 --- a/modules/chankeep.py +++ b/modules/chankeep.py @@ -1,11 +1,13 @@ -import main -from utils.logging.log import log, warn, error -from utils.logging.debug import debug from copy import deepcopy from math import ceil -import modules.provision + from twisted.internet.threads import deferToThread +import main +import modules.provision +from utils.logging.debug import debug +from utils.logging.log import error, log, warn + def allRelaysActive(net): relayNum = len(main.network[net].relays.keys()) diff --git a/modules/counters.py b/modules/counters.py index 21ad775..64407e7 100644 --- a/modules/counters.py +++ b/modules/counters.py @@ -1,6 +1,7 @@ -import main from twisted.internet.task import LoopingCall +import main + def event(name, eventType): if "local" not in main.counters.keys(): diff --git a/modules/monitor.py b/modules/monitor.py index 34d6c8c..7bdd662 100644 --- a/modules/monitor.py +++ b/modules/monitor.py @@ -1,5 +1,5 @@ -from core.relay import sendRelayNotification from core.logstash import sendLogstashNotification +from core.relay import sendRelayNotification from modules import userinfo from utils.dedup import dedup diff --git a/modules/network.py b/modules/network.py index be70f48..58f18ad 100644 --- a/modules/network.py +++ b/modules/network.py @@ -1,13 +1,13 @@ +from twisted.internet import reactor from twisted.internet.ssl import DefaultOpenSSLContextFactory +import main +from core.bot import IRCBotFactory from modules import alias from modules.chankeep import nukeNetwork from modules.regproc import needToRegister -from twisted.internet import reactor -from core.bot import IRCBotFactory -import main -from utils.logging.log import log from utils.get import getRelay +from utils.logging.log import log class Network: diff --git a/modules/provision.py b/modules/provision.py index e4a6c9d..e1e740e 100644 --- a/modules/provision.py +++ b/modules/provision.py @@ -1,7 +1,8 @@ -import main -from utils.deliver_relay_commands import deliverRelayCommands from twisted.internet import reactor + +import main import modules.regproc +from utils.deliver_relay_commands import deliverRelayCommands def provisionUserNetworkData( diff --git a/modules/regproc.py b/modules/regproc.py index 6926ad6..3cc35bc 100644 --- a/modules/regproc.py +++ b/modules/regproc.py @@ -1,9 +1,10 @@ +from copy import deepcopy +from random import choice + import main from modules import provision -from utils.logging.log import error from utils.logging.debug import debug -from copy import deepcopy -from random import choice +from utils.logging.log import error def needToRegister(net): diff --git a/modules/userinfo.py b/modules/userinfo.py index 9e66463..d6b14e0 100644 --- a/modules/userinfo.py +++ b/modules/userinfo.py @@ -1,8 +1,8 @@ from twisted.internet.threads import deferToThread import main -from utils.logging.log import warn from utils.logging.debug import trace +from utils.logging.log import warn from utils.parsing import parsen diff --git a/threshold b/threshold index 893b455..8a9b866 100755 --- a/threshold +++ b/threshold @@ -1,27 +1,20 @@ #!/usr/bin/env python -from twisted.internet import reactor -from twisted.internet.ssl import DefaultOpenSSLContextFactory import sys -from signal import signal, SIGINT - -# from twisted.python import log -# from sys import stdout -# log.startLogging(stdout) -from sys import stdout, stderr # Import again because we want to override -from codecs import getwriter # fix printing odd shit to the terminal +from codecs import getwriter +from signal import SIGINT, signal +from sys import stderr, stdout +from twisted.internet import reactor +from twisted.internet.ssl import DefaultOpenSSLContextFactory +import core.logstash import main - +import modules.counters +from core.relay import RelayFactory +from core.server import ServerFactory from utils.cleanup import handler - - -from utils.logging.log import log from utils.loaders.command_loader import loadCommands -from core.server import ServerFactory -from core.relay import RelayFactory -import modules.counters -import core.logstash +from utils.logging.log import log main.initMain() diff --git a/utils/cleanup.py b/utils/cleanup.py index aef11bc..057b1bc 100644 --- a/utils/cleanup.py +++ b/utils/cleanup.py @@ -1,5 +1,6 @@ -import main from twisted.internet import reactor + +import main from utils.logging.debug import debug from utils.logging.log import log diff --git a/utils/dedup.py b/utils/dedup.py index 89654f1..0565a0d 100644 --- a/utils/dedup.py +++ b/utils/dedup.py @@ -1,7 +1,9 @@ -from datetime import datetime -from csiphash import siphash24 from copy import deepcopy +from datetime import datetime from json import dumps + +from csiphash import siphash24 + import main from utils.logging.debug import debug diff --git a/utils/deliver_relay_commands.py b/utils/deliver_relay_commands.py index e02a70d..84f30f0 100644 --- a/utils/deliver_relay_commands.py +++ b/utils/deliver_relay_commands.py @@ -1,16 +1,17 @@ -import main -from twisted.internet.ssl import DefaultOpenSSLContextFactory +from datetime import datetime + from twisted.internet import reactor +from twisted.internet.protocol import ReconnectingClientFactory +from twisted.internet.ssl import DefaultOpenSSLContextFactory from twisted.words.protocols.irc import IRCClient -from twisted.internet.protocol import ReconnectingClientFactory -from utils.parsing import parsen -from utils.logging.log import log, error -from utils.logging.send import sendAll -from modules import userinfo -from datetime import datetime +import main from core.relay import sendRelayNotification +from modules import userinfo from utils.get import getRelay +from utils.logging.log import error, log +from utils.logging.send import sendAll +from utils.parsing import parsen # TODO: strip out non-relay functionality diff --git a/utils/loaders/command_loader.py b/utils/loaders/command_loader.py index 1181119..2f0756a 100644 --- a/utils/loaders/command_loader.py +++ b/utils/loaders/command_loader.py @@ -1,10 +1,9 @@ from os import listdir +from main import CommandMap from utils.logging.debug import debug from utils.logging.log import error -from main import CommandMap - def loadCommands(allowDup=False): for filename in listdir("commands"): diff --git a/utils/loaders/single_loader.py b/utils/loaders/single_loader.py index c87a963..65ce147 100644 --- a/utils/loaders/single_loader.py +++ b/utils/loaders/single_loader.py @@ -1,10 +1,9 @@ -from os import listdir -from importlib import reload import sys - -from utils.logging.debug import debug +from importlib import reload +from os import listdir from main import CommandMap +from utils.logging.debug import debug def loadSingle(commandName):