Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team on [discord](https://discord.gg/etJNHCQ). All
reported by contacting the project team on [discord](https://discord.gg/cnUpwrnpYb). All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ We love your input! We want to make contributing to this project as easy and tra
- Proposing new features
- Becoming a maintainer

If you are proposing new features, please discuss them with us in the [development server](https://discord.gg/etJNHCQ) before you start working on them!
If you are proposing new features, please discuss them with us in the [development server](https://discord.gg/cnUpwrnpYb) before you start working on them!

## We Develop with Github
We use GitHub to host code, to track issues and feature requests, as well as accept pull requests.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Discord Server
url: https://discord.gg/etJNHCQ
url: https://discord.gg/cnUpwrnpYb
about: Please ask hosting-related questions here before creating an issue.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1443,7 +1443,7 @@ Thread channels will now default to being private (`@everyone`'s read message pe
- Log URLs are moved to their own collection.
- Log URLs are now `https://logs.modmail.tk/LOGKEY`, no more numbers before the log key.
- We still support the numbers to not break everyone's URLs so quickly, but both work at the moment.
- This is a huge change to the backend logging, and there might be migration errors. If so, please contact us in our [Discord server](https://discord.gg/2fMbf2N).
- This is a huge change to the backend logging, and there might be migration errors. If so, please contact us in our [Discord server](https://discord.gg/cnUpwrnpYb).

# v2.5.2

Expand Down
2 changes: 1 addition & 1 deletion PRIVACY.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The bot owner can opt out of this data collection by setting `data_collection` t

### Data deletion

Data can be deleted with a request in a DM to our [support server](https://discord.gg/etJNHCQ)'s Modmail bot.
Data can be deleted with a request in a DM to our [support server](https://discord.gg/zmdYe3ZVHG)'s Modmail bot.

## The Data You Collect

Expand Down
4 changes: 2 additions & 2 deletions bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -1801,11 +1801,11 @@ def main():
else:
if "ubuntu" in platform.version().lower() or "debian" in platform.version().lower():
logger.error(
"Unable to import cairosvg, try running `sudo apt-get install libpangocairo-1.0-0` or report on our support server with your OS details: https://discord.gg/etJNHCQ"
"Unable to import cairosvg, try running `sudo apt-get install libpangocairo-1.0-0` or report on our support server with your OS details: https://discord.gg/cnUpwrnpYb"
)
else:
logger.error(
"Unable to import cairosvg, report on our support server with your OS details: https://discord.gg/etJNHCQ"
"Unable to import cairosvg, report on our support server with your OS details: https://discord.gg/cnUpwrnpYb"
)
sys.exit(0)

Expand Down
2 changes: 1 addition & 1 deletion cogs/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ async def about(self, ctx):
embed.set_author(
name="Modmail - About",
icon_url=self.bot.user.display_avatar.url,
url="https://discord.gg/F34cRU8",
url="https://discord.gg/cnUpwrnpYb",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix this merge conflict and then we can approve.

)
embed.set_thumbnail(url=self.bot.user.display_avatar.url)

Expand Down