Skip to content

Commit c38b73e

Browse files
committed
Merged from master and removed code plugin
2 parents 58e25b0 + 764c538 commit c38b73e

File tree

5 files changed

+89
-79
lines changed

5 files changed

+89
-79
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ We love your input! We want to make contributing to this project as easy and tra
1111
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!
1212

1313
## We Develop with Github
14-
We use github to host code, to track issues and feature requests, as well as accept pull requests.
14+
We use GitHub to host code, to track issues and feature requests, as well as accept pull requests.
1515

1616
## We Use [Git Flow](https://atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
17-
![Simple Image Of A Git Flow Workflow](https://nvie.com/img/hotfix-branches@2x.png)
17+
![Simple Image Of A Git Flow Workflow](https://nvie.com/img/hotfix-branches@2x.png)
1818
When contributing to this project please make sure you follow this and name your branches appropriately!
1919

2020
## All Code Changes Happen Through Pull Requests

README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@
55
<br>
66
<br>
77

8+
<a href="#">
9+
<img src="https://img.shields.io/badge/Latest%20Version-v3.2.2-7289da?style=for-the-badge&logo=data:image/gif;base64,R0lGODlhGAAYAPcAAAAAADQ+Yj5MdThCaEFOekNQfWt5e1lqfEdVhVpriVx1iVtsnFZpll1xlF1znFx5mGNtjGR7hWNzjGd5iWJunGNslmN0lGl1lGN5lWt7lWR0nGp1nWR5nGt8nHJ9l3J9jFxto1xtqlZqqF5zpF15pV10rVx5q1Z2ql1us150s114sV50uVd1smJupGNurGN0pGp1pGR6o2t7o2F0rml0rGR5rGt8q3J9pGNus2Fvu2Bzs2p2smR5s2t7tGF0u2N6vGp7u2l1uXJ+uGJ1wWV7w2l+xWl+yl5zwHWDiWyCmHODnHiGmHSLkW2CpGuEqnSCpHqMo3ODrHWKrXyMq3iHp3yTqGyEtWqFunKDs3uLtHSGvXSMvHuMu3eItnyTs3yTu3iUuW+RsV+ApmuCxG2Dy22LxnSMxHuMxHGGzXSLzXqLzXWFxXyTw3uSy3WSx26E0W+N2m+L1XKG03SL1XmL1HOL2HmL23WF2XiS1m+QyHOK4XmL4XaH4nGM5ImXm4WOlJSjnoOOq4OOpYSUrImXqJOcqYONt4OUtIybtIOUu4ycvImYt5OcuIyiqZekqYyiupOjvJurvJimtp+yvqKruae2ua23trLCucPHvIOMxoOUxIuaw4eYyJKbyISW1YiW0o2kyJWlxJqpxZWkzJury5aoxp6xxZ2zyZio1Jyy2Yuk0aOsyKOyxKOzzKy8zKq2yLO7xqOr1KSz1Ku706W026y73Ki21bK716u75LS95KSu4Zyx6bPDzLjGx63B2LPD1LTE3LvL3brI17/S2bbKzrTE47rF47zM5L3M67bH577R5L7R67zK8rjM8MLM3MPK1sTT3crU3MjW2dLZ2srUy8PN5MTO68nP68jL48TS5MnT5cbR68jS7M3b7Mva5dTb6MTO8srO8szF8MXR8snS8c3a8cnY+NXb9tDL7dnm6dzk8tro99Pq9uTp6+r17fr77eTr/efr+Oz09OXz/Ov0/e37/uj39fX19fX89fz+9vP1/fX9/f7//vr2/ODl4sK75yH5BAEAAAAALAAAAAAYABgAAAj/AAEAmFOnoMGDCAvGmRNHYMKHEOdIhEgRIcGKGDMeTJVO00WNBj194/frFik5IOvgqdaP371N26xpefORYq57/HI+s7Vtmy0eKCmmapcz575FPXt+SfHmociiRae1SroNWIoVTQ2uxAk15yJg1awl7ZSCaUE82uRxhTpt1TNXq0Ip2pSobIqCc0iVoqsI0ipXr1bhywfVXxYdiA3Sourz2dqc8lbNQJz4bDWqix73E7ZjhgrKOjYmvfWLbZcZqCdTPjjHGLdtibi2U5Q6NWiEqqq64ifvVe3at1nX2tTuWQ/QyIMfxHOGi+rkyeMklPMDuvWaBqlbj469IPUU2ykPCOw+53t4AAEBADs=">
10+
</a>
11+
12+
<br>
13+
814
<a href="https://heroku.com/deploy?template=https://github.com/kyb3r/modmail">
915
<img src="https://img.shields.io/badge/deploy_to-heroku-997FBC.svg?style=for-the-badge&logo=Heroku">
1016
</a>
1117

1218
<a href="https://github.com/kyb3r/modmail/">
13-
<img src="https://api.modmail.tk/badges/instances.svg" alt="Bot instances">
19+
<img src="https://api.logviewer.tech/badges/instances.svg" alt="Bot instances">
1420
</a>
1521

1622
<a href="https://discord.gg/j5e9p8w">
@@ -100,9 +106,9 @@ To configure automatic updates:
100106
- Then go to the Deploy tab in your [Heroku account](https://dashboard.heroku.com/apps) of your bot app, select GitHub and connect your fork (usually by typing "Modmail").
101107
- Turn on auto-deploy for the `master` branch.
102108

103-
### Hosting for patrons
109+
### Hosting for Patreons
104110

105-
If you don't want to go through the trouble of setting up your very own Modmail bot, and/or want to support this project, we offer the all inclusive installation, hosting and maintenance of your Modmail with [**Patron**](https://patreon.com/kyber). Join our [Modmail Discord Server](https://discord.gg/etJNHCQ) for more info!
111+
If you don't want to go through the trouble of setting up your very own Modmail bot, and/or want to support this project, we offer the all inclusive installation, hosting and maintenance of your Modmail with [**Patreon**](https://patreon.com/kyber). Join our [Modmail Discord Server](https://discord.gg/etJNHCQ) for more info!
106112

107113
### Locally
108114

@@ -171,7 +177,11 @@ $ docker run --env-file .env user/modmail
171177
Special thanks to our sponsors for supporting the project.
172178

173179
<a href='https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ/featured'>
174-
<img height=150 src='https://i.imgur.com/WyzaPKY.png' style='margin:10'>
180+
<img height=150 src='https://i.imgur.com/WyzaPKY.png' style='margin:10px'>
181+
</a>
182+
183+
<a href='https://discord.gg/PmHHVt9'>
184+
<img height=150 src='https://imgur.com/8F18l3v.png' style='margin:10px'>
175185
</a>
176186

177187
Become a sponsor on [Patreon](https://patreon.com/kyber).

SPONSORS.json

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
[
2-
{
3-
"embed":{
4-
"description":"This is a youtube channel that provides high quality reddit content. Videos are uploaded regularly so you are never out of funny, interesting or even creepy content!",
5-
"color":15114050,
6-
"footer":{
7-
"icon_url":"https://i.imgur.com/fvNKUks.png",
8-
"text":"I am a robot, son of Daniel (UK)"
9-
},
10-
"thumbnail":{
11-
"url":"https://i.imgur.com/WyzaPKY.png"
12-
},
13-
"author":{
14-
"name":"Sir Reddit",
15-
"url":"https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1",
16-
"icon_url":"https://i.imgur.com/WyzaPKY.png"
17-
},
18-
"fields":[
19-
{
20-
"name":"Subscribe!",
21-
"value":"[**Click Here**](https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1)"
2+
{
3+
"embed": {
4+
"description": "This is a youtube channel that provides high quality reddit content. Videos are uploaded regularly so you are never out of funny, interesting or even creepy content!",
5+
"color": 15114050,
6+
"footer": {
7+
"icon_url": "https://i.imgur.com/fvNKUks.png",
8+
"text": "I am a robot, son of Daniel (UK)"
229
},
23-
{
24-
"name":"Discord Server!",
25-
"value":"[**Click Here**](https://discord.gg/V8ErqHb)"
26-
}
27-
]
28-
}
29-
},
30-
{
31-
"embed":{
32-
"title":"Hey there! ",
33-
"description":"Nice to see you here! u can support us by subscribing on youtube -> [Youtube](https://www.youtube.com/user/RoomieOfficial) <-and also join our discord! [Discord](https://discord.gg/qdujXC8)",
34-
"url":"https://discord.gg/qdujXC8",
35-
"color":13003681,
36-
"footer":{
37-
"icon_url":"https://imgur.com/Mrc9pLd.gif",
38-
"text":"footer text"
39-
},
40-
"thumbnail":{
41-
"url":"https://imgur.com/Mrc9pLd.gif"
42-
},
43-
"image":{
44-
"url":"https://imgur.com/ZUFiL6b.gif"
45-
},
46-
"author":{
47-
"name":"Roomieofficial",
48-
"url":"https://discord.gg/qdujXC8",
49-
"icon_url":"https://imgur.com/6hBkt7Z.png"
50-
},
51-
"fields":[
52-
{
53-
"name":"What is all this about🤔 ",
54-
"value":"We are mainly focused on everything that has anything to do with music or singing! "
10+
"thumbnail": {
11+
"url": "https://i.imgur.com/WyzaPKY.png"
5512
},
56-
{
57-
"name":"Youtube🙄",
58-
"value":"U will get great content if you follow our [Youtube](https://www.youtube.com/user/RoomieOfficial) with weekly uploads"
13+
"author": {
14+
"name": "Sir Reddit",
15+
"url": "https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1",
16+
"icon_url": "https://i.imgur.com/WyzaPKY.png"
5917
},
60-
{
61-
"name":"Discord😁",
62-
"value":"Make sure to join our [Discord](https://discord.gg/qdujXC8) We have weekly events, 24/7 chats and more! "
63-
}
64-
]
65-
}
66-
}
18+
"fields": [
19+
{
20+
"name": "Subscribe!",
21+
"value": "[**Click Here**](https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1)"
22+
},
23+
{
24+
"name": "Discord Server!",
25+
"value": "[**Click Here**](https://discord.gg/V8ErqHb)"
26+
}
27+
]
28+
}
29+
},
30+
{
31+
"embed": {
32+
"title": "Hey there!",
33+
"description": "Nice to see you here! You can support us by subscribing on youtube -> [Youtube](https://www.youtube.com/user/RoomieOfficial) <- and also join our [Discord](https://discord.gg/djwMSQ)!",
34+
"url": "https://discord.gg/djwMSQ",
35+
"color": 13003681,
36+
"footer": {
37+
"icon_url": "https://imgur.com/Mrc9pLd.gif",
38+
"text": "everyone is a clown"
39+
},
40+
"thumbnail": {
41+
"url": "https://imgur.com/Mrc9pLd.gif"
42+
},
43+
"image": {
44+
"url": "https://imgur.com/ZUFiL6b.gif"
45+
},
46+
"author": {
47+
"name": "Roomieofficial",
48+
"url": "https://discord.gg/djwMSQ",
49+
"icon_url": "https://imgur.com/6hBkt7Z.png"
50+
},
51+
"fields": [
52+
{
53+
"name": "What is all this about 🤔",
54+
"value": "We are mainly focused on everything that has anything to do with music or singing! "
55+
},
56+
{
57+
"name": "Youtube 🙄",
58+
"value": "U will get great content if you follow our [Youtube](https://www.youtube.com/user/RoomieOfficial) with weekly uploads."
59+
},
60+
{
61+
"name": "Discord 😁",
62+
"value": "Make sure to join our [Discord](https://discord.gg/djwMSQ) We have weekly events, 24/7 chats and more!"
63+
}
64+
]
65+
}
66+
}
6767
]

bot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ async def post_metadata(self):
11311131
"last_updated": str(datetime.utcnow()),
11321132
}
11331133

1134-
async with self.session.post("https://api.modmail.tk/metadata", json=data):
1134+
async with self.session.post("https://api.logviewer.tech/metadata", json=data):
11351135
logger.debug("Uploading metadata to Modmail server.")
11361136

11371137
async def before_post_metadata(self):

plugins/registry.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,6 @@
7171
"icon_url": "https://images.ionadev.ml/b/ZIDUUsl.png",
7272
"thumbnail_url": "https://images.ionadev.ml/b/ZIDUUsl.png"
7373
},
74-
"code": {
75-
"repository": "officialpiyush/modmail-plugins",
76-
"branch": "master",
77-
"description": "Run Codes from discord bot. Similar to R.Danny's longue Commands",
78-
"bot_version": "2.20.1",
79-
"title": "Code Plugin",
80-
"icon_url": "https://images.ionadev.ml/b/ZIDUUsl.png",
81-
"thumbnail_url": "https://images.ionadev.ml/b/ZIDUUsl.png"
82-
},
8374
"dm-on-join": {
8475
"repository": "officialpiyush/modmail-plugins",
8576
"branch": "master",
@@ -178,5 +169,14 @@
178169
"title": "Moderate your server",
179170
"icon_url": "https://cdn.discordapp.com/attachments/539943767562780704/601485194196680704/wGFmzZq.png",
180171
"thumbnail_url": "https://cdn.discordapp.com/attachments/539943767562780704/601485194196680704/wGFmzZq.png"
181-
}
172+
},
173+
"serverstats": {
174+
"repository": "dazvise/modmail-plugins",
175+
"branch": "master",
176+
"description": "Interesting and accurate statistics about your server.",
177+
"bot_version": "2.20.1",
178+
"title": "Server Stats",
179+
"icon_url": "https://i.gyazo.com/fadb70740e83f2448b23ffe192a1f32d.png",
180+
"thumbnail_url": "https://i.gyazo.com/fadb70740e83f2448b23ffe192a1f32d.png"
181+
}
182182
}

0 commit comments

Comments
 (0)