Compare commits
12
Commits
5a060342a4
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a8566dfdde | ||
|
|
b22d16e364 | ||
|
|
710c570c8d | ||
|
|
f43905b760 | ||
|
|
e2702cbfe8 | ||
|
|
f38fcd8939 | ||
|
|
bd24e53a3c | ||
|
|
05b11aafc8 | ||
|
|
8cac1a7da4 | ||
|
|
d4922f8772 | ||
|
|
a22905f689 | ||
|
|
c85a7520ce |
@@ -141,3 +141,5 @@ cython_debug/
|
|||||||
# Pycharm
|
# Pycharm
|
||||||
.idea/
|
.idea/
|
||||||
|
|
||||||
|
prod.toml
|
||||||
|
log/
|
||||||
@@ -7,6 +7,7 @@ name = "pypi"
|
|||||||
ts3 = "*"
|
ts3 = "*"
|
||||||
pycoingecko = "*"
|
pycoingecko = "*"
|
||||||
toml = "*"
|
toml = "*"
|
||||||
|
requests = "*"
|
||||||
|
|
||||||
[dev-packages]
|
[dev-packages]
|
||||||
|
|
||||||
|
|||||||
Generated
+17
-17
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"_meta": {
|
"_meta": {
|
||||||
"hash": {
|
"hash": {
|
||||||
"sha256": "d9f13c4341b606a12b8b0ef95f6bce67911d3f7866a6c4552c342c4a5ae15fdf"
|
"sha256": "31ecf8cb0f57cd41d5c094347ce8878eddd6f611790259ee671f31d6620a1bee"
|
||||||
},
|
},
|
||||||
"pipfile-spec": 6,
|
"pipfile-spec": 6,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -18,26 +18,26 @@
|
|||||||
"default": {
|
"default": {
|
||||||
"certifi": {
|
"certifi": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee",
|
"sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
|
||||||
"sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"
|
"sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
|
||||||
],
|
],
|
||||||
"version": "==2021.5.30"
|
"version": "==2021.10.8"
|
||||||
},
|
},
|
||||||
"charset-normalizer": {
|
"charset-normalizer": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:5d209c0a931f215cee683b6445e2d77677e7e75e159f78def0db09d68fafcaa6",
|
"sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597",
|
||||||
"sha256:5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"
|
"sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"
|
||||||
],
|
],
|
||||||
"markers": "python_version >= '3'",
|
"markers": "python_version >= '3'",
|
||||||
"version": "==2.0.6"
|
"version": "==2.0.12"
|
||||||
},
|
},
|
||||||
"idna": {
|
"idna": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a",
|
"sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff",
|
||||||
"sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"
|
"sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
|
||||||
],
|
],
|
||||||
"markers": "python_version >= '3'",
|
"markers": "python_version >= '3'",
|
||||||
"version": "==3.2"
|
"version": "==3.3"
|
||||||
},
|
},
|
||||||
"pycoingecko": {
|
"pycoingecko": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
@@ -49,11 +49,11 @@
|
|||||||
},
|
},
|
||||||
"requests": {
|
"requests": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24",
|
"sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61",
|
||||||
"sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"
|
"sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"
|
||||||
],
|
],
|
||||||
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
|
"index": "pypi",
|
||||||
"version": "==2.26.0"
|
"version": "==2.27.1"
|
||||||
},
|
},
|
||||||
"toml": {
|
"toml": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
@@ -73,11 +73,11 @@
|
|||||||
},
|
},
|
||||||
"urllib3": {
|
"urllib3": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece",
|
"sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14",
|
||||||
"sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"
|
"sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e"
|
||||||
],
|
],
|
||||||
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
|
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
|
||||||
"version": "==1.26.7"
|
"version": "==1.26.9"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"develop": {}
|
"develop": {}
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ TBD
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lukas Mahler"
|
__author__ = "Lukas Mahler"
|
||||||
__version__ = "0.0.0"
|
__version__ = "1.0.0"
|
||||||
__date__ = "30.10.2021"
|
__date__ = "14.04.2022"
|
||||||
__email__ = "m@hler.eu"
|
__email__ = "m@hler.eu"
|
||||||
__status__ = "Development"
|
__status__ = "Development"
|
||||||
|
|
||||||
@@ -86,7 +86,7 @@ class TSbot:
|
|||||||
self.pipeOut("Can't find my own client id. terminating...", lvl="critical")
|
self.pipeOut("Can't find my own client id. terminating...", lvl="critical")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
''' if you want to move the Bot to a certain channel (instead of the defualt channel, you can do: '''
|
''' if you want to move the Bot to a certain channel (instead of the default channel, you can do: '''
|
||||||
# self.bot.clientmove(clid=self.myid,cid=129)
|
# self.bot.clientmove(clid=self.myid,cid=129)
|
||||||
|
|
||||||
# ----------- SUBSCRIBE TO EVENTS -------------
|
# ----------- SUBSCRIBE TO EVENTS -------------
|
||||||
@@ -114,7 +114,7 @@ class TSbot:
|
|||||||
# ----------- LOOP HERE -------------
|
# ----------- LOOP HERE -------------
|
||||||
while self.running:
|
while self.running:
|
||||||
# self.bot.send_keepalive()
|
# self.bot.send_keepalive()
|
||||||
self.pipeOut(f"Waiting for a new Event...")
|
self.pipeOut(f"Waiting for a new Event...", lvl="debug")
|
||||||
self.bot.version()
|
self.bot.version()
|
||||||
|
|
||||||
# Auto-update crypto price channels every 30 minutes
|
# Auto-update crypto price channels every 30 minutes
|
||||||
@@ -124,6 +124,9 @@ class TSbot:
|
|||||||
|
|
||||||
commands.ticker(self, "")
|
commands.ticker(self, "")
|
||||||
|
|
||||||
|
# Hijacked for WoW
|
||||||
|
commands.rwf(self)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -180,11 +183,22 @@ class TSbot:
|
|||||||
# New text message
|
# New text message
|
||||||
elif event_type == "notifytextmessage":
|
elif event_type == "notifytextmessage":
|
||||||
msg = event[0]["msg"].replace("\n", " ")
|
msg = event[0]["msg"].replace("\n", " ")
|
||||||
invkr = event[0]["invokername"]
|
invkr_name = event[0]["invokername"]
|
||||||
invkr_id = event[0]["invokerid"]
|
invkr_id = event[0]["invokerid"]
|
||||||
self.pipeOut(f'Message | From: "{invkr}" | Content: "{msg}"')
|
invkr_uid = event[0]["invokeruid"]
|
||||||
|
invkr_dbid = self.bot.clientgetdbidfromuid(cluid=invkr_uid)[0]["cldbid"]
|
||||||
|
permission_level = 1 if self.isadmin(invkr_dbid) else 0
|
||||||
|
|
||||||
|
invoker = {'name': invkr_name,
|
||||||
|
'id': invkr_id,
|
||||||
|
'uid': invkr_uid,
|
||||||
|
'dbid': invkr_dbid}
|
||||||
|
|
||||||
|
self.pipeOut(f'Message | From: "{invkr_name}" | '
|
||||||
|
f'Permissionlevel: {permission_level} | Content: "{msg}"')
|
||||||
|
|
||||||
if msg.startswith("."):
|
if msg.startswith("."):
|
||||||
self.lookupcommand(msg, invkr_id)
|
self.lookupcommand(msg, invoker, permission_level)
|
||||||
|
|
||||||
# Unknown Event
|
# Unknown Event
|
||||||
else:
|
else:
|
||||||
@@ -203,19 +217,23 @@ class TSbot:
|
|||||||
lvln = int(getattr(util.logging, lvl))
|
lvln = int(getattr(util.logging, lvl))
|
||||||
self.log.log(lvln, msg)
|
self.log.log(lvln, msg)
|
||||||
|
|
||||||
if reprint:
|
if reprint and lvln >= self.log.getEffectiveLevel():
|
||||||
print(f"[{time.strftime('%H:%M:%S')}]{f'[{lvl}]':10s} {msg}")
|
print(f"[{time.strftime('%H:%M:%S')}]{f'[{lvl}]':10s} {msg}")
|
||||||
|
|
||||||
|
if not self.whitelisted:
|
||||||
|
if msg == "error id 524: client is flooding":
|
||||||
|
time.sleep(30)
|
||||||
|
|
||||||
if lvl == "CRITICAL":
|
if lvl == "CRITICAL":
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
def stop(self, invkr_id):
|
def stop(self, invoker):
|
||||||
"""
|
"""
|
||||||
This stops the bot instance by invalidating the event loop.
|
This stops the bot instance by invalidating the event loop.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
msg = "Shutdown, bye bye!"
|
msg = "Shutdown, bye bye!"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=msg)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=msg)
|
||||||
self.pipeOut(msg)
|
self.pipeOut(msg)
|
||||||
self.running = False
|
self.running = False
|
||||||
|
|
||||||
@@ -256,7 +274,7 @@ class TSbot:
|
|||||||
|
|
||||||
for clid in clients:
|
for clid in clients:
|
||||||
data = self.printable_clientinfo(clid)
|
data = self.printable_clientinfo(clid)
|
||||||
self.pipeOut(f"{data}", lvl="debug")
|
self.pipeOut(f"{data}", lvl="DEBUG")
|
||||||
|
|
||||||
i = 0
|
i = 0
|
||||||
while n == -1 or i < n:
|
while n == -1 or i < n:
|
||||||
@@ -264,7 +282,7 @@ class TSbot:
|
|||||||
try:
|
try:
|
||||||
self.bot.clientpoke(msg=msg, clid=clid)
|
self.bot.clientpoke(msg=msg, clid=clid)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.pipeOut(e, lvl="warning")
|
self.pipeOut(e, lvl="WARNING")
|
||||||
pass
|
pass
|
||||||
time.sleep(delay)
|
time.sleep(delay)
|
||||||
i += 1
|
i += 1
|
||||||
@@ -307,7 +325,7 @@ class TSbot:
|
|||||||
try:
|
try:
|
||||||
client = self.bot.clientinfo(clid=clid)
|
client = self.bot.clientinfo(clid=clid)
|
||||||
except ts3.query.TS3QueryError as e:
|
except ts3.query.TS3QueryError as e:
|
||||||
self.pipeOut(f"given clid {clid} returned error:\n{e}", lvl="ERROR")
|
self.pipeOut(f"ISQUERY: given clid {clid} returned: {e}", lvl="WARNING")
|
||||||
return True
|
return True
|
||||||
try:
|
try:
|
||||||
if client[0]["client_type"] == "1":
|
if client[0]["client_type"] == "1":
|
||||||
@@ -384,87 +402,96 @@ class TSbot:
|
|||||||
|
|
||||||
# Commands -------------------------------------------------------------------------------------------------------------
|
# Commands -------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
def lookupcommand(self, msg, invkr_id):
|
def lookupcommand(self, msg, invoker, permission_level):
|
||||||
"""
|
"""
|
||||||
Every message starting with '.' gets passed and evaluated in this function.
|
Every message starting with '.' gets passed and evaluated in this function.
|
||||||
Commands in this function are sorted alphabetically.
|
Commands in this function are sorted alphabetically.
|
||||||
Parameters in brackets are optional.
|
Parameters in brackets are optional.
|
||||||
|
|
||||||
Command Parameter 1 Parameter 2
|
Currently only 2 permission levels are implemented [0 = Everyone, 1 = Admins]
|
||||||
---------------------------------------------------------
|
|
||||||
.admin / .notifyAdmin
|
Command Parameter 1 Parameter 2 Permissionlevel
|
||||||
.annoy target message
|
--------------------------------------------------------------------------------------
|
||||||
.follow target
|
.admin / .notifyAdmin 0
|
||||||
.help / .h
|
.annoy target message 1
|
||||||
.info clid
|
.follow target 1
|
||||||
.kickall message
|
.help / .h 0
|
||||||
.list channel/clients/commands/groups
|
.info clid 0
|
||||||
.mute target
|
.kickall message 1
|
||||||
.pingall message
|
.list channel/clients/commands/groups 1
|
||||||
.rename nickname
|
.mute target 1
|
||||||
.roll
|
.pingall message 1
|
||||||
.stop / .quit / .q
|
.rename nickname 1
|
||||||
.test
|
.rmb amount 0
|
||||||
.ticker (symbol)
|
.roll 0
|
||||||
.unmute target
|
.rwf 0
|
||||||
|
.stop / .quit / .q 1
|
||||||
|
.test 1
|
||||||
|
.ticker (symbol) 0
|
||||||
|
.unmute target 1
|
||||||
"""
|
"""
|
||||||
|
|
||||||
commandstring = msg.split(" ")
|
commandstring = msg.split(" ")
|
||||||
command = commandstring[0]
|
command = commandstring[0]
|
||||||
parameter = commandstring[1:]
|
parameter = commandstring[1:]
|
||||||
self.pipeOut(f"command: {command} | parameter: {parameter} | invkr_id: {invkr_id}")
|
self.pipeOut(f"command: {command} | parameter: {parameter} | "
|
||||||
|
f"from: {invoker['name']} | permissionlevel: {permission_level}")
|
||||||
# ??? passable = {"self": self, "invkr_id": invkr_id, "parameter": parameter}
|
|
||||||
|
|
||||||
if command == ".admin" or command == ".notifyAdmin":
|
if command == ".admin" or command == ".notifyAdmin":
|
||||||
commands.notifyAdmin(self)
|
commands.notifyAdmin(self)
|
||||||
|
|
||||||
elif command == ".annoy":
|
elif command == ".annoy" and permission_level > 0:
|
||||||
commands.annoy(self, invkr_id, parameter)
|
commands.annoy(self, invoker, parameter)
|
||||||
|
|
||||||
elif command == ".follow":
|
elif command == ".follow" and permission_level > 0:
|
||||||
commands.follow(self, invkr_id, parameter)
|
commands.follow(self, invoker, parameter)
|
||||||
|
|
||||||
elif command == ".help" or command == ".h":
|
elif command == ".help" or command == ".h":
|
||||||
commands.help(self, invkr_id)
|
commands.help(self, invoker)
|
||||||
|
|
||||||
elif command == ".info":
|
elif command == ".info":
|
||||||
commands.info(self, invkr_id)
|
commands.info(self, invoker)
|
||||||
|
|
||||||
elif command == ".kickall":
|
elif command == ".kickall" and permission_level > 0:
|
||||||
self.kickall("test") # TODO
|
self.kickall("test") # TODO
|
||||||
|
|
||||||
elif command == ".list":
|
elif command == ".list" and permission_level > 0:
|
||||||
commands.list(self, invkr_id, parameter)
|
commands.list(self, invoker, parameter)
|
||||||
|
|
||||||
elif command == ".mute":
|
elif command == ".mute" and permission_level > 0:
|
||||||
commands.mute(self, invkr_id, parameter)
|
commands.mute(self, invoker, parameter)
|
||||||
|
|
||||||
elif command == ".pingall":
|
elif command == ".pingall" and permission_level > 0:
|
||||||
commands.pingall(self, invkr_id, parameter)
|
commands.pingall(self, invoker, parameter)
|
||||||
|
|
||||||
elif command == ".rename":
|
elif command == ".rename" and permission_level > 0:
|
||||||
commands.rename(self, invkr_id, parameter)
|
commands.rename(self, invoker, parameter)
|
||||||
|
|
||||||
|
elif command == ".rmb":
|
||||||
|
commands.rmb(self, invoker, parameter)
|
||||||
|
|
||||||
elif command == ".roll":
|
elif command == ".roll":
|
||||||
pass # TODO needs permission for everyone + targemode implementation
|
commands.roll(self, invoker)
|
||||||
|
|
||||||
elif command == ".stop" or command == ".quit" or command == ".q":
|
elif command == ".rwf":
|
||||||
commands.quit(self, invkr_id)
|
commands.rwf(self)
|
||||||
|
|
||||||
elif command == ".test":
|
elif command == ".stop" or command == ".quit" or command == ".q" and permission_level > 0:
|
||||||
|
commands.quit(self, invoker)
|
||||||
|
|
||||||
|
elif command == ".test" and permission_level > 0:
|
||||||
cid = self.createChannel("Test")
|
cid = self.createChannel("Test")
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=cid)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=cid)
|
||||||
|
|
||||||
elif command == ".ticker":
|
elif command == ".ticker":
|
||||||
commands.ticker(self, parameter)
|
commands.ticker(self, parameter)
|
||||||
|
|
||||||
elif command == ".unmute":
|
elif command == ".unmute" and permission_level > 0:
|
||||||
commands.unmute(self, invkr_id, parameter)
|
commands.unmute(self, invoker, parameter)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
err = f"Unknown Command: [{command}]"
|
err = f"Unknown Command: [{command}]"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------------------------------------------------
|
||||||
@@ -480,6 +507,9 @@ def main():
|
|||||||
# Load toml config
|
# Load toml config
|
||||||
conf = util.getConf("prod.toml")
|
conf = util.getConf("prod.toml")
|
||||||
|
|
||||||
|
# Change loglevel from config
|
||||||
|
util.changeLevel(log, conf['Log']['level'])
|
||||||
|
|
||||||
# Start the Bot Instance
|
# Start the Bot Instance
|
||||||
TSbot(conf, log)
|
TSbot(conf, log)
|
||||||
|
|
||||||
|
|||||||
+125
-30
@@ -3,8 +3,8 @@ TBD
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lukas Mahler"
|
__author__ = "Lukas Mahler"
|
||||||
__version__ = "0.0.0"
|
__version__ = "1.0.0"
|
||||||
__date__ = "30.10.2021"
|
__date__ = "14.04.2022"
|
||||||
__email__ = "m@hler.eu"
|
__email__ = "m@hler.eu"
|
||||||
__status__ = "Development"
|
__status__ = "Development"
|
||||||
|
|
||||||
@@ -13,23 +13,25 @@ __status__ = "Development"
|
|||||||
import sys
|
import sys
|
||||||
import json
|
import json
|
||||||
import time
|
import time
|
||||||
|
import random
|
||||||
import inspect
|
import inspect
|
||||||
|
|
||||||
# Custom
|
# Custom
|
||||||
import ts3
|
import ts3
|
||||||
|
import requests
|
||||||
|
|
||||||
# Self
|
# Self
|
||||||
from src import util
|
from src import util
|
||||||
|
|
||||||
|
|
||||||
def annoy(self, invkr_id, parameter):
|
def annoy(self, invoker, parameter):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not parameter:
|
if not len(parameter) != 1:
|
||||||
err = "Please use the command like this: .annoy TARGET MESSAGE"
|
err = "Please use the command like this: .annoy TARGET MESSAGE"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
target = parameter[0]
|
target = parameter[0]
|
||||||
@@ -37,14 +39,14 @@ def annoy(self, invkr_id, parameter):
|
|||||||
self.poke(n=10, msg=msg, usr=target)
|
self.poke(n=10, msg=msg, usr=target)
|
||||||
|
|
||||||
|
|
||||||
def follow(self, invkr_id, parameter):
|
def follow(self, invoker, parameter):
|
||||||
"""
|
"""
|
||||||
TODO sticky folgen
|
TODO sticky folgen
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not parameter:
|
if not parameter:
|
||||||
err = "Please use the command like this: .follow TARGET"
|
err = "Please use the command like this: .follow TARGET"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
target = parameter[0]
|
target = parameter[0]
|
||||||
@@ -53,35 +55,35 @@ def follow(self, invkr_id, parameter):
|
|||||||
self.bot.clientmove(clid=self.myid, cid=cid)
|
self.bot.clientmove(clid=self.myid, cid=cid)
|
||||||
|
|
||||||
|
|
||||||
def help(self, invkr_id):
|
def help(self, invoker):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Find all functions in this submodule
|
# Find all functions in this submodule
|
||||||
cmds = [f[0] for f in inspect.getmembers(sys.modules[__name__], inspect.isfunction)]
|
cmds = [f[0] for f in inspect.getmembers(sys.modules[__name__], inspect.isfunction)]
|
||||||
msg = f"\n\nList of commands:\n---------------------\n.{f'{chr(10)}.'.join(cmds)}"
|
msg = f"List of commands:\n---------------------\n.{f'{chr(10)}.'.join(cmds)}"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=msg)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=msg)
|
||||||
|
|
||||||
|
|
||||||
def info(self, invkr_id):
|
def info(self, invoker):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
msg = f"\n\nRuntime: {util.getRuntime(self.started)}\n" \
|
msg = f"Runtime: {util.getRuntime(self.started)}\n" \
|
||||||
f"Version: {self.version}"
|
f"Version: {self.version}"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=msg)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=msg)
|
||||||
|
|
||||||
|
|
||||||
def list(self, invkr_id, parameter):
|
def list(self, invoker, parameter):
|
||||||
"""
|
"""
|
||||||
Message the invoker of the function either a list of channels, clients, commands or server groups.
|
Message the invoker of the function either a list of channels, clients, commands or server groups.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not parameter:
|
if not parameter:
|
||||||
err = "Please use the command like this: .list channel/clients/commands/groups/"
|
err = "Please use the command like this: .list channel/clients/commands/groups/"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
what = parameter[0]
|
what = parameter[0]
|
||||||
@@ -104,7 +106,7 @@ def list(self, invkr_id, parameter):
|
|||||||
msg = json.dumps(mydict)
|
msg = json.dumps(mydict)
|
||||||
|
|
||||||
elif what == "commands":
|
elif what == "commands":
|
||||||
help(self, invkr_id)
|
help(self, invoker)
|
||||||
return
|
return
|
||||||
|
|
||||||
elif what == "groups":
|
elif what == "groups":
|
||||||
@@ -116,17 +118,17 @@ def list(self, invkr_id, parameter):
|
|||||||
else:
|
else:
|
||||||
msg = f"The parameter [{what}] is not supported."
|
msg = f"The parameter [{what}] is not supported."
|
||||||
|
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=msg)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=msg)
|
||||||
|
|
||||||
|
|
||||||
def mute(self, invkr_id, parameter):
|
def mute(self, invoker, parameter):
|
||||||
"""
|
"""
|
||||||
Assign the mute group to a user.
|
Assign the mute group to a user.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not parameter:
|
if not parameter:
|
||||||
err = "Please use the command like this: .mute TARGET"
|
err = "Please use the command like this: .mute TARGET"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
target = parameter[0]
|
target = parameter[0]
|
||||||
@@ -137,18 +139,18 @@ def mute(self, invkr_id, parameter):
|
|||||||
self.bot.servergroupaddclient(sgid=self.sgid_mute, cldbid=cldbid)
|
self.bot.servergroupaddclient(sgid=self.sgid_mute, cldbid=cldbid)
|
||||||
except ts3.query.TS3QueryError as e:
|
except ts3.query.TS3QueryError as e:
|
||||||
err = f"Failed to add to group: [{e}]"
|
err = f"Failed to add to group: [{e}]"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
def pingall(self, invkr_id, parameter):
|
def pingall(self, invoker, parameter):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not parameter:
|
if not parameter:
|
||||||
err = "Please use the command like this: .pingall MESSAGE"
|
err = "Please use the command like this: .pingall MESSAGE"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
msg = parameter[0]
|
msg = parameter[0]
|
||||||
@@ -173,30 +175,123 @@ def notifyAdmin(self):
|
|||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
|
|
||||||
def quit(self, invkr_id):
|
def quit(self, invoker):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
"""
|
"""
|
||||||
self.stop(invkr_id)
|
self.stop(invoker)
|
||||||
|
|
||||||
|
|
||||||
def rename(self, invkr_id, parameter):
|
def rename(self, invoker, parameter):
|
||||||
"""
|
"""
|
||||||
Rename the Bot to the given Nickname
|
Rename the Bot to the given Nickname
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not parameter:
|
if not parameter:
|
||||||
err = "Please use the command like this: .rename NICKNAME"
|
err = "Please use the command like this: .rename NICKNAME"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
self.nickname = parameter[0]
|
self.nickname = parameter[0]
|
||||||
self.bot.clientupdate(client_nickname=self.nickname)
|
self.bot.clientupdate(client_nickname=self.nickname)
|
||||||
|
|
||||||
|
|
||||||
|
def rmb(self, invoker, parameter):
|
||||||
|
"""
|
||||||
|
Convert rmb (Chinese Yuan) to eur (Euro)
|
||||||
|
"""
|
||||||
|
|
||||||
|
if not parameter:
|
||||||
|
err = "Please use the command like this: .rmb AMOUNT"
|
||||||
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
|
return
|
||||||
|
|
||||||
|
url = "https://www.floatrates.com/daily/cny.json"
|
||||||
|
req = requests.get(url)
|
||||||
|
|
||||||
|
if req.status_code != 200:
|
||||||
|
self.pipeOut(req.status_code, lvl="WARNING")
|
||||||
|
return
|
||||||
|
|
||||||
|
data = json.loads(req.text)
|
||||||
|
|
||||||
|
if not data:
|
||||||
|
return
|
||||||
|
|
||||||
|
if "eur" not in data:
|
||||||
|
self.pipeOut(data, lvl="WARNING")
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
conversion_rate = float(data['eur']['inverseRate'])
|
||||||
|
except KeyError:
|
||||||
|
conversion_rate = 6.94 # Static
|
||||||
|
|
||||||
|
if "k" in parameter[0]:
|
||||||
|
rmb_val = float(parameter[0].replace("k", "000"))
|
||||||
|
else:
|
||||||
|
rmb_val = float(parameter[0])
|
||||||
|
|
||||||
|
eur = rmb_val / conversion_rate
|
||||||
|
msg = f"[{rmb_val:.0f}] rmb is approx. [{eur:.0f}] eur / conversion rate [{conversion_rate:.2f}]"
|
||||||
|
|
||||||
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=msg)
|
||||||
|
|
||||||
|
|
||||||
|
def roll(self, invoker):
|
||||||
|
|
||||||
|
cid_invoker = self.bot.clientinfo(clid=int(invoker['id']))[0]["cid"]
|
||||||
|
cid_self = self.bot.clientinfo(clid=self.myid)[0]["cid"]
|
||||||
|
|
||||||
|
if cid_self != cid_invoker:
|
||||||
|
self.bot.clientmove(clid=self.myid, cid=cid_invoker)
|
||||||
|
|
||||||
|
rolled = random.randint(0, 100)
|
||||||
|
msg = f"Rolled a [{rolled:3d}] by {invoker['name']}"
|
||||||
|
self.bot.sendtextmessage(targetmode=2, target=cid_invoker, msg=msg)
|
||||||
|
|
||||||
|
|
||||||
|
def rwf(self):
|
||||||
|
"""
|
||||||
|
Refresh the WoW progress channel,
|
||||||
|
this is very specific to my use, you can disable this in the config.
|
||||||
|
"""
|
||||||
|
url = "https://raider.io/api/v1/raiding/progression?raid=sepulcher-of-the-first-ones&difficulty=mythic®ion=world"
|
||||||
|
req = requests.get(url)
|
||||||
|
|
||||||
|
if req.status_code != 200:
|
||||||
|
self.pipeOut(req.status_code, lvl="WARNING")
|
||||||
|
return
|
||||||
|
|
||||||
|
data = json.loads(req.text)
|
||||||
|
|
||||||
|
if not data:
|
||||||
|
return
|
||||||
|
|
||||||
|
if "progression" not in data:
|
||||||
|
self.pipeOut(data, lvl="WARNING")
|
||||||
|
return
|
||||||
|
|
||||||
|
prog_done = 0
|
||||||
|
prog_max = len(data['progression'])
|
||||||
|
|
||||||
|
for i in range(0, prog_max):
|
||||||
|
if data['progression'][i]['totalGuilds'] > 0:
|
||||||
|
prog_done = i
|
||||||
|
|
||||||
|
guilds_done = data['progression'][prog_done]['totalGuilds']
|
||||||
|
|
||||||
|
channelname = f"[cspacerC3]Sepulcher {prog_done+1}/{prog_max} ({guilds_done})"
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.editChannelname(205, channelname)
|
||||||
|
except ts3.query.TS3QueryError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def ticker(self, parameter):
|
def ticker(self, parameter):
|
||||||
"""
|
"""
|
||||||
Refresh the Crypto Ticker channels,
|
Refresh the crypto Ticker channels,
|
||||||
this is very specific to my use, you can disable this in the config.
|
this is very specific to my use, you can disable this in the config.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -222,14 +317,14 @@ def ticker(self, parameter):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
def unmute(self, invkr_id, parameter):
|
def unmute(self, invoker, parameter):
|
||||||
"""
|
"""
|
||||||
Remove the mute group to a user.
|
Remove the mute group to a user.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not parameter:
|
if not parameter:
|
||||||
err = "Please use the command like this: .unmute TARGET"
|
err = "Please use the command like this: .unmute TARGET"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
target = parameter[0]
|
target = parameter[0]
|
||||||
@@ -240,7 +335,7 @@ def unmute(self, invkr_id, parameter):
|
|||||||
self.bot.servergroupdelclient(sgid=self.sgid_mute, cldbid=cldbid)
|
self.bot.servergroupdelclient(sgid=self.sgid_mute, cldbid=cldbid)
|
||||||
except ts3.query.TS3QueryError as e:
|
except ts3.query.TS3QueryError as e:
|
||||||
err = f"Failed to remove from group: [{e}]"
|
err = f"Failed to remove from group: [{e}]"
|
||||||
self.bot.sendtextmessage(targetmode=1, target=invkr_id, msg=err)
|
self.bot.sendtextmessage(targetmode=1, target=invoker['id'], msg=err)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+9
-3
@@ -3,12 +3,13 @@ TBD
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lukas Mahler"
|
__author__ = "Lukas Mahler"
|
||||||
__version__ = "0.0.0"
|
__version__ = "0.0.1"
|
||||||
__date__ = "27.09.2021"
|
__date__ = "04.02.2022"
|
||||||
__email__ = "m@hler.eu"
|
__email__ = "m@hler.eu"
|
||||||
__status__ = "Development"
|
__status__ = "Development"
|
||||||
|
|
||||||
# Imports
|
# Imports
|
||||||
|
from datetime import datetime
|
||||||
from pycoingecko import CoinGeckoAPI
|
from pycoingecko import CoinGeckoAPI
|
||||||
|
|
||||||
|
|
||||||
@@ -44,7 +45,12 @@ class GeckoAPI:
|
|||||||
|
|
||||||
matching = [x for x in self.coinlist if x["id"] == symbol_id.lower()]
|
matching = [x for x in self.coinlist if x["id"] == symbol_id.lower()]
|
||||||
if len(matching) == 1:
|
if len(matching) == 1:
|
||||||
resp_dict = self.api.get_price(ids=matching[0]["id"], vs_currencies=curr.lower())
|
try:
|
||||||
|
resp_dict = self.api.get_price(ids=matching[0]["id"], vs_currencies=curr.lower())
|
||||||
|
except Exception as e:
|
||||||
|
with open("gecko_error.log", 'a+') as log:
|
||||||
|
log.write(f"{datetime.now():%Y-%m-%d %H:%M} | {e}\n")
|
||||||
|
return "Error"
|
||||||
price = resp_dict[matching[0]["id"]][curr.lower()]
|
price = resp_dict[matching[0]["id"]][curr.lower()]
|
||||||
if isinstance(price, int):
|
if isinstance(price, int):
|
||||||
price = float(price) # Convert to always have floats
|
price = float(price) # Convert to always have floats
|
||||||
|
|||||||
@@ -15,3 +15,6 @@ mute = "0"
|
|||||||
nickname = "myTS3-Bot"
|
nickname = "myTS3-Bot"
|
||||||
whitelisted = false
|
whitelisted = false
|
||||||
crypto = false
|
crypto = false
|
||||||
|
|
||||||
|
[Log]
|
||||||
|
level = "INFO"
|
||||||
|
|||||||
+11
-4
@@ -3,8 +3,8 @@ TBD
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lukas Mahler"
|
__author__ = "Lukas Mahler"
|
||||||
__version__ = "0.0.0"
|
__version__ = "1.0.0"
|
||||||
__date__ = "13.10.2021"
|
__date__ = "14.04.2022"
|
||||||
__email__ = "m@hler.eu"
|
__email__ = "m@hler.eu"
|
||||||
__status__ = "Development"
|
__status__ = "Development"
|
||||||
|
|
||||||
@@ -82,17 +82,24 @@ def setupLogger(logpath, lvl="DEBUG"):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
global log # Needed to log exceptions in src\util
|
global log # Needed to log exceptions in src\util
|
||||||
log = logging.getLogger()
|
log = logging.getLogger("mylog")
|
||||||
if not os.path.exists(logpath):
|
if not os.path.exists(logpath):
|
||||||
os.makedirs(logpath)
|
os.makedirs(logpath)
|
||||||
handler = RotatingFileHandler(logpath + r"/myTS3.log", encoding='utf-8', maxBytes=1*1024*1024, backupCount=10)
|
handler = RotatingFileHandler(logpath + r"/myTS3.log", encoding='utf-8', maxBytes=1*1024*1024, backupCount=10)
|
||||||
logformat = logging.Formatter("%(asctime)s %(levelname)8s %(message)s", "%Y-%m-%d %H:%M:%S")
|
logformat = logging.Formatter("%(asctime)s %(levelname)8s %(message)s", "%Y-%m-%d %H:%M:%S")
|
||||||
handler.setFormatter(logformat)
|
handler.setFormatter(logformat)
|
||||||
log.addHandler(handler)
|
log.addHandler(handler)
|
||||||
log.setLevel(lvl)
|
log.setLevel(logging.getLevelName(lvl))
|
||||||
|
|
||||||
return log
|
return log
|
||||||
|
|
||||||
|
|
||||||
|
def changeLevel(log, lvl):
|
||||||
|
"""
|
||||||
|
Change the loglevel after creation
|
||||||
|
"""
|
||||||
|
log.setLevel(logging.getLevelName(lvl))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
exit()
|
exit()
|
||||||
|
|||||||
Reference in New Issue
Block a user