Merge branch 'master' of github.com:yagop/telegram-bot

This commit is contained in:
yago 2015-03-04 23:38:10 +01:00
commit 52c961bdb7
3 changed files with 17 additions and 17 deletions

View File

@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
{description}
Copyright (C) {year} {fullname}
Copyright (C) 2015 Yago Pérez
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

View File

@ -10,9 +10,9 @@ return {
description = "When user sends image URL (ends with png, jpg, jpeg) download and send it to origin.",
usage = "",
patterns = {
"(https?://[%w-_%.%?%.:/%+=&]+.png)$",
"(https?://[%w-_%.%?%.:/%+=&]+.jpg)$",
"(https?://[%w-_%.%?%.:/%+=&]+.jpeg)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.png)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.jpg)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.jpeg)$",
},
run = run
}

View File

@ -8,16 +8,16 @@ return {
description = "When user sends media URL (ends with gif, mp4, pdf, etc.) download and send it to origin.",
usage = "",
patterns = {
"(https?://[%w-_%.%?%.:/%+=&]+.gif)$",
"(https?://[%w-_%.%?%.:/%+=&]+.mp4)$",
"(https?://[%w-_%.%?%.:/%+=&]+.pdf)$",
"(https?://[%w-_%.%?%.:/%+=&]+.ogg)$",
"(https?://[%w-_%.%?%.:/%+=&]+.zip)$",
"(https?://[%w-_%.%?%.:/%+=&]+.mp3)$",
"(https?://[%w-_%.%?%.:/%+=&]+.rar)$",
"(https?://[%w-_%.%?%.:/%+=&]+.wmv)$",
"(https?://[%w-_%.%?%.:/%+=&]+.doc)$",
"(https?://[%w-_%.%?%.:/%+=&]+.avi)$"
"(https?://[%w-_%.%?%.:/%+=&]+%.gif)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.mp4)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.pdf)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.ogg)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.zip)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.mp3)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.rar)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.wmv)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.doc)$",
"(https?://[%w-_%.%?%.:/%+=&]+%.avi)$"
},
run = run
}