Merge branch 'modmail-api' of https://github.com/verixx/modmail into modmail-api

kyb3r · kyb3r · commit 6fde9bda07d1 · 2019-01-04T03:03:44.000+11:00
diff --git a/app.json b/app.json
@@ -28,8 +28,8 @@
         "required": false
     },
     "MODMAIL_API_TOKEN": {
-        "description": "Api token from https://dashboard.modmail.tk",
+        "description": "API token from https://modmail.tk",
         "required": true
     }
   }
-}
+}
diff --git a/cogs/modmail.py b/cogs/modmail.py
@@ -385,7 +385,7 @@ async def unblock(self, ctx, id=None):
             await ctx.send(embed=em)
         else:
             em.title = 'Error'
-            em.description = f'{mention} is not already blocked'
+            em.description = f'{mention} is not blocked'
             em.color = discord.Color.red()
 
             await ctx.send(embed=em)

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@`
`28`	`28`	`"required": false`
`29`	`29`	`},`
`30`	`30`	`"MODMAIL_API_TOKEN": {`
`31`		`- "description": "Api token from https://dashboard.modmail.tk",`
	`31`	`+ "description": "API token from https://modmail.tk",`
`32`	`32`	`"required": true`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		`-}`
	`35`	`+}`