Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Add/remove people from channels before received.join/received.part events

Browse source
This commit is contained in:
jesopo 2019-04-15 14:41:09 +01:00
parent cf9898d5bd
commit e12ad21c1a
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/line_handler/channel.py
View file

@ -74,39 +74,44 @@ def join(events, event):
if realname: if realname:
user.realname = realname user.realname = realname
if event["server"].is_own_nickname(event["prefix"].nickname): is_self = event["server"].is_own_nickname(event["prefix"].nickname)
if is_self:
channel = event["server"].channels.add(channel_name) channel = event["server"].channels.add(channel_name)
else:
channel = event["server"].channels.get(channel_name)
channel.add_user(user)
user.join_channel(channel)
if is_self:
if channel.name in event["server"].attempted_join: if channel.name in event["server"].attempted_join:
del event["server"].attempted_join[channel.name] del event["server"].attempted_join[channel.name]
events.on("self.join").call(channel=channel, server=event["server"], events.on("self.join").call(channel=channel, server=event["server"],
account=account, realname=realname) account=account, realname=realname)
channel.send_mode() channel.send_mode()
else: else:
channel = event["server"].channels.get(channel_name)
events.on("received.join").call(channel=channel, user=user, events.on("received.join").call(channel=channel, user=user,
server=event["server"], account=account, realname=realname) server=event["server"], account=account, realname=realname)
channel.add_user(user)
user.join_channel(channel)
def part(events, event): def part(events, event):
channel = event["server"].channels.get(event["args"][0]) channel = event["server"].channels.get(event["args"][0])
user = event["server"].get_user(event["prefix"].nickname) user = event["server"].get_user(event["prefix"].nickname)
reason = event["args"].get(1) reason = event["args"].get(1)
if not event["server"].is_own_nickname(event["prefix"].nickname):
events.on("received.part").call(channel=channel, reason=reason,
user=user, server=event["server"])
else:
events.on("self.part").call(channel=channel, reason=reason,
server=event["server"])
event["server"].channels.remove(channel)
channel.remove_user(user) channel.remove_user(user)
user.part_channel(channel) user.part_channel(channel)
if not len(user.channels): if not len(user.channels):
event["server"].remove_user(user) event["server"].remove_user(user)
if not event["server"].is_own_nickname(event["prefix"].nickname):
events.on("received.part").call(channel=channel, reason=reason,
user=user, server=event["server"])
else:
event["server"].channels.remove(channel)
events.on("self.part").call(channel=channel, reason=reason,
server=event["server"])
def handle_324(event): def handle_324(event):
channel = event["server"].channels.get(event["args"][1]) channel = event["server"].channels.get(event["args"][1])
modes = event["args"][2] modes = event["args"][2]

2
modules/permissions/__init__.py
View file

@ -14,7 +14,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.part") @utils.hook("received.part")
def on_part(self, event): def on_part(self, event):
if len(event["user"].channels) == 1 and event["user" if len(event["user"].channels) == 0 and event["user"
].identified_account_override: ].identified_account_override:
event["user"].send_notice("You no longer share any channels " event["user"].send_notice("You no longer share any channels "
"with me so you have been signed out") "with me so you have been signed out")