Update domain name references to pyrogram.org

This commit is contained in:
Dan 2019-05-19 21:40:41 +02:00
parent 2032cec4d0
commit 0dc953c320
11 changed files with 48 additions and 40 deletions

View File

@ -5,7 +5,7 @@
<br> <br>
<b>Telegram MTProto API Framework for Python</b> <b>Telegram MTProto API Framework for Python</b>
<br> <br>
<a href="https://docs.pyrogram.ml"> <a href="https://docs.pyrogram.org">
Documentation Documentation
</a> </a>
@ -66,7 +66,7 @@ ground up in Python and C. It enables you to easily create custom apps for both
### Requirements ### Requirements
- Python 3.4 or higher. - Python 3.4 or higher.
- A [Telegram API key](https://docs.pyrogram.ml/intro/setup#api-keys). - A [Telegram API key](https://docs.pyrogram.org/intro/setup#api-keys).
### Installing ### Installing
@ -76,11 +76,11 @@ pip3 install pyrogram
### Resources ### Resources
- The Docs contain lots of resources to help you getting started with Pyrogram: https://docs.pyrogram.ml. - The Docs contain lots of resources to help you getting started with Pyrogram: https://docs.pyrogram.org.
- Reading [Examples in this repository](https://github.com/pyrogram/pyrogram/tree/master/examples) is also a good way - Reading [Examples in this repository](https://github.com/pyrogram/pyrogram/tree/master/examples) is also a good way
for learning how Pyrogram works. for learning how Pyrogram works.
- Seeking extra help? Don't be shy, come join and ask our [Community](https://t.me/PyrogramChat)! - Seeking extra help? Don't be shy, come join and ask our [Community](https://t.me/PyrogramChat)!
- For other requests you can send an [Email](mailto:admin@pyrogram.ml) or a [Message](https://t.me/haskell). - For other requests you can send an [Email](mailto:dan@pyrogram.org) or a [Message](https://t.me/haskell).
### Contributing ### Contributing

View File

@ -113,7 +113,7 @@ html_theme = 'sphinx_rtd_theme'
# documentation. # documentation.
# #
html_theme_options = { html_theme_options = {
'canonical_url': "https://docs.pyrogram.ml/", 'canonical_url': "https://docs.pyrogram.org/",
'collapse_navigation': True, 'collapse_navigation': True,
'sticky_navigation': False, 'sticky_navigation': False,
'logo_only': True, 'logo_only': True,

View File

@ -4,7 +4,7 @@ Welcome to Pyrogram
.. raw:: html .. raw:: html
<div align="center"> <div align="center">
<a href="https://docs.pyrogram.ml"> <a href="https://docs.pyrogram.org">
<div><img src="_static/logo.png" alt="Pyrogram Logo"></div> <div><img src="_static/logo.png" alt="Pyrogram Logo"></div>
</a> </a>
</div> </div>
@ -45,7 +45,7 @@ C. It enables you to easily create custom apps for both user and bot identities
`MTProto API`_. `MTProto API`_.
.. _Telegram: https://telegram.org .. _Telegram: https://telegram.org
.. _MTProto API: topics/faq#what-can-mtproto-do-more-than-the-bot-api .. _MTProto API: topics/mtproto-vs-botapi#what-is-the-mtproto-api
How the Documentation is Organized How the Documentation is Organized
---------------------------------- ----------------------------------
@ -62,7 +62,7 @@ First Steps
- `Handling Updates`_ - How to handle Telegram updates. - `Handling Updates`_ - How to handle Telegram updates.
- `Error Handling`_ - How to handle API errors correctly. - `Error Handling`_ - How to handle API errors correctly.
.. _Quick Start: intro/start .. _Quick Start: intro/quickstart
.. _Calling Methods: start/invoking .. _Calling Methods: start/invoking
.. _Handling Updates: start/updates .. _Handling Updates: start/updates
.. _Error Handling: start/errors .. _Error Handling: start/errors
@ -80,26 +80,26 @@ API Reference
.. _Available Types: api/types .. _Available Types: api/types
.. _Bound Methods: api/bound-methods .. _Bound Methods: api/bound-methods
Relevant Topics Meta
^^^^^^^^^^^^^^^ ^^^^
- `Smart Plugins`_ - How to modularize your application.
- `Advanced Usage`_ - How to use Telegram's raw API.
- `Release Notes`_ - Release notes for Pyrogram releases.
- `Pyrogram FAQ`_ - Answers to common Pyrogram questions. - `Pyrogram FAQ`_ - Answers to common Pyrogram questions.
- `Pyrogram Glossary`_ - A list of words with brief explanations. - `Pyrogram Glossary`_ - A list of words with brief explanations.
- `Release Notes`_ - Release notes for Pyrogram releases.
- `Powered by Pyrogram`_ - A collection of Pyrogram Projects.
- `Support Pyrogram Development`_ - Ways to show your appreciation.
.. _Smart Plugins: topics/smart-plugins .. _Pyrogram FAQ: meta/faq
.. _Advanced Usage: topics/advanced-usage .. _Pyrogram Glossary: meta/glossary
.. _Release Notes: topics/releases .. _Release Notes: meta/releases
.. _Pyrogram FAQ: topics/faq .. _Powered by Pyrogram: meta/powered-by
.. _Pyrogram Glossary: topics/glossary .. _Support Pyrogram Development: meta/support-pyrogram
.. toctree:: .. toctree::
:hidden: :hidden:
:caption: Introduction :caption: Introduction
intro/start intro/quickstart
intro/install intro/install
intro/setup intro/setup
@ -107,7 +107,7 @@ Relevant Topics
:hidden: :hidden:
:caption: Getting Started :caption: Getting Started
intro/auth start/auth
start/invoking start/invoking
start/updates start/updates
start/errors start/errors
@ -139,12 +139,20 @@ Relevant Topics
topics/text-formatting topics/text-formatting
topics/proxy topics/proxy
topics/bots-interaction topics/bots-interaction
topics/mtproto-vs-botapi
topics/test-servers topics/test-servers
topics/advanced-usage topics/advanced-usage
topics/voice-calls topics/voice-calls
topics/releases
topics/faq .. toctree::
topics/glossary :hidden:
:caption: Meta
meta/faq
meta/glossary
meta/releases
meta/powered-by
meta/support-pyrogram
.. toctree:: .. toctree::
:hidden: :hidden:

View File

@ -20,7 +20,7 @@ import datetime
import os import os
import re import re
canonical = "https://docs.pyrogram.ml" canonical = "https://docs.pyrogram.org/"
dirs = { dirs = {
"start": ("weekly", 0.9), "start": ("weekly", 0.9),

View File

@ -20,7 +20,7 @@ To use this mode, pass "markdown" in the *parse_mode* field when using
__italic text__ __italic text__
[inline URL](https://docs.pyrogram.ml/) [inline URL](https://docs.pyrogram.org/)
[inline mention of a user](tg://user?id=23122162) [inline mention of a user](tg://user?id=23122162)
@ -43,7 +43,7 @@ The following tags are currently supported:
<i>italic</i>, <em>italic</em> <i>italic</i>, <em>italic</em>
<a href="http://docs.pyrogram.ml/">inline URL</a> <a href="http://docs.pyrogram.org/">inline URL</a>
<a href="tg://user?id=23122162">inline mention of a user</a> <a href="tg://user?id=23122162">inline mention of a user</a>
@ -66,7 +66,7 @@ Examples
"**bold**, " "**bold**, "
"__italic__, " "__italic__, "
"[mention](tg://user?id=23122162), " "[mention](tg://user?id=23122162), "
"[URL](https://docs.pyrogram.ml), " "[URL](https://docs.pyrogram.org), "
"`code`, " "`code`, "
"```" "```"
"for i in range(10):\n" "for i in range(10):\n"
@ -84,7 +84,7 @@ Examples
"<b>bold</b>, " "<b>bold</b>, "
"<i>italic</i>, " "<i>italic</i>, "
"<a href=\"tg://user?id=23122162\">mention</a>, " "<a href=\"tg://user?id=23122162\">mention</a>, "
"<a href=\"https://pyrogram.ml/\">URL</a>, " "<a href=\"https://pyrogram.org/\">URL</a>, "
"<code>code</code>, " "<code>code</code>, "
"<pre>" "<pre>"
"for i in range(10):\n" "for i in range(10):\n"

View File

@ -39,7 +39,7 @@ with app:
), ),
InlineKeyboardButton( # Opens a web URL InlineKeyboardButton( # Opens a web URL
"URL", "URL",
url="https://docs.pyrogram.ml" url="https://docs.pyrogram.org"
), ),
], ],
[ # Second row [ # Second row

View File

@ -22,12 +22,12 @@ def answer(client, inline_query):
input_message_content=InputTextMessageContent( input_message_content=InputTextMessageContent(
"Here's how to install **Pyrogram**" "Here's how to install **Pyrogram**"
), ),
url="https://docs.pyrogram.ml/start/Installation", url="https://docs.pyrogram.org/intro/install",
description="How to install Pyrogram", description="How to install Pyrogram",
thumb_url="https://i.imgur.com/JyxrStE.png", thumb_url="https://i.imgur.com/JyxrStE.png",
reply_markup=InlineKeyboardMarkup( reply_markup=InlineKeyboardMarkup(
[ [
[InlineKeyboardButton("Open website", url="https://docs.pyrogram.ml/start/Installation")] [InlineKeyboardButton("Open website", url="https://docs.pyrogram.org/intro/install")]
] ]
) )
), ),
@ -37,12 +37,12 @@ def answer(client, inline_query):
input_message_content=InputTextMessageContent( input_message_content=InputTextMessageContent(
"Here's how to use **Pyrogram**" "Here's how to use **Pyrogram**"
), ),
url="https://docs.pyrogram.ml/start/Usage", url="https://docs.pyrogram.org/start/invoking",
description="How to use Pyrogram", description="How to use Pyrogram",
thumb_url="https://i.imgur.com/JyxrStE.png", thumb_url="https://i.imgur.com/JyxrStE.png",
reply_markup=InlineKeyboardMarkup( reply_markup=InlineKeyboardMarkup(
[ [
[InlineKeyboardButton("Open website", url="https://docs.pyrogram.ml/start/Usage")] [InlineKeyboardButton("Open website", url="https://docs.pyrogram.org/start/invoking")]
] ]
) )
) )

View File

@ -8,7 +8,7 @@ from pyrogram import Client, Emoji, Filters
TARGET = "PyrogramChat" # Target chat. Can also be a list of multiple chat ids/usernames TARGET = "PyrogramChat" # Target chat. Can also be a list of multiple chat ids/usernames
MENTION = "[{}](tg://user?id={})" # User mention markup MENTION = "[{}](tg://user?id={})" # User mention markup
MESSAGE = "{} Welcome to [Pyrogram](https://docs.pyrogram.ml/)'s group chat {}!" # Welcome message MESSAGE = "{} Welcome to [Pyrogram](https://docs.pyrogram.org/)'s group chat {}!" # Welcome message
app = Client("my_account") app = Client("my_account")

View File

@ -275,7 +275,7 @@ class Client(Methods, BaseClient):
log.warning('\nWARNING: You are using a bot token as session name!\n' log.warning('\nWARNING: You are using a bot token as session name!\n'
'This usage will be deprecated soon. Please use a session file name to load ' 'This usage will be deprecated soon. Please use a session file name to load '
'an existing session and the bot_token argument to create new sessions.\n' 'an existing session and the bot_token argument to create new sessions.\n'
'More info: https://docs.pyrogram.ml/start/Setup#bot-authorization\n') 'More info: https://docs.pyrogram.org/intro/auth#bot-authorization\n')
self.load_config() self.load_config()
self.load_session() self.load_session()
@ -1091,7 +1091,7 @@ class Client(Methods, BaseClient):
else: else:
raise AttributeError( raise AttributeError(
"No API Key found. " "No API Key found. "
"More info: https://docs.pyrogram.ml/intro/setup#configuration" "More info: https://docs.pyrogram.org/intro/setup#configuration"
) )
for option in ["app_version", "device_model", "system_version", "lang_code"]: for option in ["app_version", "device_model", "system_version", "lang_code"]:

View File

@ -56,7 +56,7 @@ except ImportError:
log.warning( log.warning(
"TgCrypto is missing! " "TgCrypto is missing! "
"Pyrogram will work the same, but at a much slower speed. " "Pyrogram will work the same, but at a much slower speed. "
"More info: https://docs.pyrogram.ml/resources/TgCrypto" "More info: https://docs.pyrogram.org/topics/tgcrypto"
) )

View File

@ -126,13 +126,13 @@ if len(argv) > 1 and argv[1] in ["bdist_wheel", "install", "develop"]:
setup( setup(
name="Pyrogram", name="Pyrogram",
version=version, version=version,
description="Telegram MTProto API Client Library for Python", description="Telegram MTProto API Client Library and Framework for Python",
long_description=readme, long_description=readme,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
url="https://github.com/pyrogram", url="https://github.com/pyrogram",
download_url="https://github.com/pyrogram/pyrogram/releases/latest", download_url="https://github.com/pyrogram/pyrogram/releases/latest",
author="Dan Tès", author="Dan Tès",
author_email="admin@pyrogram.ml", author_email="dan@pyrogram.org",
license="LGPLv3+", license="LGPLv3+",
classifiers=[ classifiers=[
"Development Status :: 4 - Beta", "Development Status :: 4 - Beta",
@ -162,7 +162,7 @@ setup(
"Tracker": "https://github.com/pyrogram/pyrogram/issues", "Tracker": "https://github.com/pyrogram/pyrogram/issues",
"Community": "https://t.me/PyrogramChat", "Community": "https://t.me/PyrogramChat",
"Source": "https://github.com/pyrogram/pyrogram", "Source": "https://github.com/pyrogram/pyrogram",
"Documentation": "https://docs.pyrogram.ml", "Documentation": "https://docs.pyrogram.org",
}, },
python_requires="~=3.4", python_requires="~=3.4",
packages=find_packages(exclude=["compiler*"]), packages=find_packages(exclude=["compiler*"]),