Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed discord author parsing in replied messages for MirahezeLogbot #3588

Merged
merged 7 commits into from
Jan 9, 2024
Merged

Fixed discord author parsing in replied messages for MirahezeLogbot #3588

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
509fe0b
Add support for logging messages from MirahezeRelay bot [Untested]
pixDeVl Jan 6, 2024
167ed59
Fix author mapping in adminlogbot.py for discord authors
pixDeVl Jan 6, 2024
58b445d
Fix issue with parsing discord author in replies
pixDeVl Jan 7, 2024
69af09e
Merge branch 'master' of https://github.com/pixDeVl/MirahezePuppet
pixDeVl Jan 7, 2024
20a5789
Fixed parsing discord author in replied messages
pixDeVl Jan 7, 2024
def20ce
Merge branch 'master' into master
Universal-Omega Jan 7, 2024
41e97b5
Merge branch 'master' into master
Universal-Omega Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions modules/irc/files/logbot/adminlogbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@ def on_pubmsg(self, con, event):
line = event.arguments[0]
if rest == self.config.relay_host:
import re
parsed = re.search(r'<(?P<discord>[a-z0-9._]*)> (?P<message>.*)', line)
discord_author = "@" + parsed.group('discord')
line = parsed.group('message')
parsed = re.search(r'<(?P<discord>[ a-z0-9._]*)> (?P<message>.*)', line)
if parsed.group('discord') is not None and parsed.group('message') is not None:
discord = parsed.group('discord').split()[0]
discord_author = "@" + discord
line = parsed.group('message')
if author in self.config.author_map:
author = self.config.author_map[author]
if discord_author in self.config.author_map:
Expand Down
Loading