Minidodo
17c776faec
-> !wants -> !orgs info -> special cmd's -> !assist -> "afk" for players without active account -> !loot add <item_ref> <count> => nolonger breaks !account Changes: -> grouped !tara, !gaunt, .. into !wb -> Display the most recent news entry on logon (default: enabled) -> improved grouping of !items -> Added the option to authentificate WS connections (Datanet module). This is used in special cases, where the Websocket Server requires the clien tto authentificate itself. (Server sends "#auth", client responds with the auth string) -> Add main name to relaying (priv <-> org) [default: disabled] -> Added logon/logoff messages back -> restricted default access to "dangerous" commands to moderator -> Added optional logging (Private Channel, Org Channel, Tells, ... disabled by default) Rewrite of the Tower Module. -> More verbosity, if enabled in config. by default, GAS and Hot timer only. -> !hot displays currently hot (and in penalty) sites, and these which go hot in < 60 minutes -> !attacks filterable by PF and Site -> display current contract QL's grouped by org: !contracts (requires managed cache)
115 lines
4.6 KiB
Python
115 lines
4.6 KiB
Python
import time
|
|
|
|
from core.chat_blob import ChatBlob
|
|
from core.command_param_types import Any, Int, Const, Options, Item
|
|
from core.decorators import instance, command
|
|
|
|
|
|
@instance()
|
|
class WantsController:
|
|
def inject(self, registry):
|
|
self.db = registry.get_instance("db")
|
|
self.text = registry.get_instance("text")
|
|
self.account_service = registry.get_instance("account_service")
|
|
|
|
def start(self):
|
|
self.db.exec("CREATE TABLE IF NOT EXISTS wants ("
|
|
"id INT PRIMARY KEY AUTO_INCREMENT, "
|
|
"char_id INT NOT NULL, "
|
|
"want TEXT NOT NULL,"
|
|
"created_at INT NOT NULL,"
|
|
"INDEX `char_id` (`char_id`))")
|
|
|
|
@command(command="wants", params=[], access_level="member",
|
|
description="Show your wants")
|
|
def wants_list_cmd(self, request):
|
|
alts = self.account_service.get_alts(request.sender.char_id)
|
|
|
|
cnt = 0
|
|
blob = ""
|
|
for alt in alts:
|
|
data = self.db.query("SELECT * FROM wants WHERE char_id = ? ORDER BY created_at DESC", [alt.char_id])
|
|
alt_cnt = len(data)
|
|
cnt += alt_cnt
|
|
|
|
if alt_cnt:
|
|
for row in data:
|
|
blob += "%s %s\n\n" % (row.want, self.text.make_tellcmd("Remove", "wants remove %d" % row.id))
|
|
|
|
return ChatBlob("Wants for %s (%d)" % (alts[0].name, cnt), blob)
|
|
|
|
@command(command="wants", params=[Const("add"), Any("item")], access_level="member",
|
|
description="Add a want")
|
|
def wants_add_cmd(self, request, _, want):
|
|
self.db.exec("INSERT INTO wants (char_id, want, created_at) "
|
|
"VALUES (?, ?, ?)",
|
|
[request.sender.char_id, want, int(time.time())])
|
|
|
|
return "Want added successfully."
|
|
|
|
@command(command="wants", params=[Options(["rem", "remove"]), Int("want_id")], access_level="member",
|
|
description="Remove a want")
|
|
def wants_remove_cmd(self, request, _, want_id):
|
|
want = self.db.query_single("SELECT n.*, p.name FROM wants n "
|
|
"LEFT JOIN player p ON n.char_id = p.char_id "
|
|
"WHERE n.id = ?",
|
|
[want_id])
|
|
|
|
if not want:
|
|
return f"Could not find want with ID <highlight>{want_id:d}</highlight>."
|
|
|
|
if self.account_service.get_main(request.sender.char_id).char_id \
|
|
!= self.account_service.get_main(want.char_id).char_id:
|
|
return f"You must be a confirmed alt of <highlight>{want.name}</highlight> to remove this want."
|
|
|
|
self.db.exec("DELETE FROM wants WHERE id = ?", [want_id])
|
|
|
|
return f"Want with ID <highlight>{want_id:d}</highlight> deleted successfully."
|
|
|
|
@command(command="wants", params=[Const("search"), Item("item")], access_level="member",
|
|
description="Search wants by itemref")
|
|
def wants_search_itemref_cmd(self, request, _, item):
|
|
return self.search_wants(item.name)
|
|
|
|
@command(command="wants", params=[Const("search"), Any("name")], access_level="member",
|
|
description="Search wants by name")
|
|
def wants_search_name_cmd(self, request, _, wants_search):
|
|
return self.search_wants(wants_search)
|
|
|
|
def search_wants(self, wants_search):
|
|
wants = self.db.query("SELECT w.char_id, w.want, p.name FROM wants w "
|
|
"LEFT JOIN player p ON w.char_id = p.char_id "
|
|
"WHERE want LIKE ?",
|
|
[f"%{wants_search}%"])
|
|
|
|
blob = ""
|
|
for want in wants:
|
|
alts = self.account_service.get_alts(want.char_id)
|
|
main_name = alts[0].name
|
|
blob += f"<header2>{main_name}</header2>\n{want.want}\n\n"
|
|
|
|
return ChatBlob(f"Search Results ({len(wants)})", blob)
|
|
|
|
@command(command="wants", params=[Const("list")], access_level="member",
|
|
description="Shows all wants")
|
|
def wants_all_cmd(self, request, _):
|
|
|
|
sql = "SELECT w.*, p.name FROM wants w \
|
|
LEFT JOIN account a ON w.char_id = a.char_id \
|
|
LEFT JOIN account a2 ON (a2.main = a.main) \
|
|
LEFT JOIN player p ON p.char_id = COALESCE(a2.char_id, w.char_id) \
|
|
WHERE a2.char_id = a2.main \
|
|
ORDER BY p.name"
|
|
data = self.db.query(sql)
|
|
|
|
blob = ""
|
|
current_main_name = ""
|
|
for want in data:
|
|
if want.name != current_main_name:
|
|
blob += f"\n<header2>{want.name}</header2>\n"
|
|
current_main_name = want.name
|
|
|
|
blob += want.want + "\n"
|
|
|
|
return ChatBlob(f"Wants List ({len(data)})", blob)
|