Compare commits
No commits in common. "master" and "9822d7770c7cea1b76a14de378452364a83d806d" have entirely different histories.
master
...
9822d7770c
@ -21,7 +21,7 @@ The bridge can be configured via `config.toml` at either the current working dir
|
|||||||
[general]
|
[general]
|
||||||
jid = "discord.server.example" # JID of the server component
|
jid = "discord.server.example" # JID of the server component
|
||||||
secret = "secret" # Component secret
|
secret = "secret" # Component secret
|
||||||
server = "server.example" # Address of the actual XMPP server
|
server = "server.example # Address of the actual XMPP server
|
||||||
port = 5869 # Component port
|
port = 5869 # Component port
|
||||||
discord_token "...." # Token of your Discord bot
|
discord_token "...." # Token of your Discord bot
|
||||||
|
|
||||||
|
6
setup.py
6
setup.py
@ -9,10 +9,10 @@ setup(
|
|||||||
license = "GPLc3",
|
license = "GPLc3",
|
||||||
packages = find_packages(),
|
packages = find_packages(),
|
||||||
install_requires = [
|
install_requires = [
|
||||||
"requests==2.27.1",
|
"requests>=2.26.0",
|
||||||
"slixmpp==1.7.1",
|
"slixmpp>=1.7.1",
|
||||||
"nextcord",
|
"nextcord",
|
||||||
"toml==0.10.2"
|
"toml>=0.10.2"
|
||||||
],
|
],
|
||||||
extra_require = {
|
extra_require = {
|
||||||
"dev": [
|
"dev": [
|
||||||
|
@ -206,10 +206,6 @@ class BridgeComponent(ComponentXMPP):
|
|||||||
wh = None
|
wh = None
|
||||||
for webhook in await dchannel.webhooks():
|
for webhook in await dchannel.webhooks():
|
||||||
if webhook.name == "discord-xmpp-bridge":
|
if webhook.name == "discord-xmpp-bridge":
|
||||||
if not webhook.is_authenticated():
|
|
||||||
_logger.info("Webhook for %s has no token. Deleting and recreating" % muc)
|
|
||||||
await webhook.delete(reason="Webhook has no token. Will recreate")
|
|
||||||
else:
|
|
||||||
wh = webhook
|
wh = webhook
|
||||||
break
|
break
|
||||||
if not wh:
|
if not wh:
|
||||||
@ -530,15 +526,7 @@ def main():
|
|||||||
general["port"],
|
general["port"],
|
||||||
general["discord_token"],
|
general["discord_token"],
|
||||||
config)
|
config)
|
||||||
for xep in [
|
for xep in [ "0030", "0199", "0045", "0084", "0153", "0054", "0060" ]:
|
||||||
"0030",
|
|
||||||
"0199",
|
|
||||||
"0045",
|
|
||||||
"0084",
|
|
||||||
"0153",
|
|
||||||
"0054",
|
|
||||||
"0060"
|
|
||||||
]:
|
|
||||||
xmpp.register_plugin(f"xep_{xep}")
|
xmpp.register_plugin(f"xep_{xep}")
|
||||||
|
|
||||||
logging.basicConfig(stream=sys.stdout, level=verbosity)
|
logging.basicConfig(stream=sys.stdout, level=verbosity)
|
||||||
|
Loading…
Reference in New Issue
Block a user