notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update fjoin to use the new API everywhere

Browse Source
This commit is contained in:
Vgr E. Barry 2017-02-06 13:15:49 -05:00
parent 749310e564
commit 32409b8f76
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/wolfgame.py
View File

@ -996,33 +996,41 @@ def fjoin(var, wrapper, message):
break break
fake = True fake = True
for i in range(int(first), int(last)+1): for i in range(int(first), int(last)+1):
user = users._add(wrapper.source.client, nick=str(i)) # FIXME user = users.FakeUser.from_nick(str(i))
evt.data["join_player"](var, type(wrapper)(user, wrapper.target), forced=True, who=wrapper.source) evt.data["join_player"](var, type(wrapper)(user, wrapper.target), forced=True, who=wrapper.source)
continue continue
if not tojoin: if not tojoin:
continue continue
ul = list(var.USERS.keys())
ull = [u.lower() for u in ul] maybe_user = None
if tojoin.lower() not in ull or not var.USERS[ul[ull.index(tojoin.lower())]]["inchan"]:
if not is_fake_nick(tojoin) or not botconfig.DEBUG_MODE: for user in wrapper.target.users:
if not noticed: # important if users.equals(user.nick, tojoin):
wrapper.send(wrapper.source.nick+messages["fjoin_in_chan"]) maybe_user = user
break
else:
if not users.predicate(tojoin) or botconfig.DEBUG_MODE:
if not noticed: # important
wrapper.send("{0}{1}".format(wrapper.source, messages["fjoin_in_chan"]))
noticed = True noticed = True
continue continue
if not is_fake_nick(tojoin):
tojoin = ul[ull.index(tojoin.lower())].strip() if maybe_user is not None:
if not botconfig.DEBUG_MODE and var.ACCOUNTS_ONLY: if not botconfig.DEBUG_MODE and var.ACCOUNTS_ONLY:
if not users.get(tojoin).account or users.get(tojoin).account == "*": if maybe_user.account is None:
wrapper.pm(messages["account_not_logged_in"].format(tojoin)) wrapper.pm(messages["account_not_logged_in"].format(maybe_user))
return return
elif botconfig.DEBUG_MODE: elif botconfig.DEBUG_MODE:
fake = True fake = True
if tojoin != users.Bot.nick:
evt.data["join_player"](var, type(wrapper)(users._add(wrapper.source.client, nick=tojoin), wrapper.target), forced=True, who=wrapper.source) if maybe_user is not users.Bot:
if maybe_user is None:
maybe_user = users.FakeUser.from_nick(tojoin)
evt.data["join_player"](var, type(wrapper)(maybe_user, wrapper.target), forced=True, who=wrapper.source)
else: else:
wrapper.pm(messages["not_allowed"]) wrapper.pm(messages["not_allowed"])
if fake: if fake:
wrapper.send(messages["fjoin_success"].format(wrapper.source.nick, len(list_players()))) wrapper.send(messages["fjoin_success"].format(wrapper.source, len(list_players())))
@cmd("fleave", "fquit", flag="A", pm=True, phases=("join", "day", "night")) @cmd("fleave", "fquit", flag="A", pm=True, phases=("join", "day", "night"))
def fleave(cli, nick, chan, rest): def fleave(cli, nick, chan, rest):