17 Commits

Author SHA1 Message Date
6bd1234d3d This commit closes #45 2023-10-15 17:40:56 +02:00
154db69f20 Update dependency pillow to ~=10.1.0 (#48)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [pillow](https://python-pillow.org) ([source](https://github.com/python-pillow/Pillow), [changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)) | minor | `~=10.0.0` -> `~=10.1.0` |

---

### Release Notes

<details>
<summary>python-pillow/Pillow (pillow)</summary>

### [`v10.1.0`](https://github.com/python-pillow/Pillow/blob/HEAD/CHANGES.rst#1010-2023-10-15)

[Compare Source](https://github.com/python-pillow/Pillow/compare/10.0.1...10.1.0)

-   Added TrueType default font to allow for different sizes [#&#8203;7354](https://github.com/python-pillow/Pillow/issues/7354)
    \[radarhere]

-   Fixed invalid argument warning [#&#8203;7442](https://github.com/python-pillow/Pillow/issues/7442)
    \[radarhere]

-   Added ImageOps cover method [#&#8203;7412](https://github.com/python-pillow/Pillow/issues/7412)
    \[radarhere, hugovk]

-   Catch struct.error from truncated EXIF when reading JPEG DPI [#&#8203;7458](https://github.com/python-pillow/Pillow/issues/7458)
    \[radarhere]

-   Consider default image when selecting mode for PNG save_all [#&#8203;7437](https://github.com/python-pillow/Pillow/issues/7437)
    \[radarhere]

-   Support BGR;15, BGR;16 and BGR;24 access, unpacking and putdata [#&#8203;7303](https://github.com/python-pillow/Pillow/issues/7303)
    \[radarhere]

-   Added CMYK to RGB unpacker [#&#8203;7310](https://github.com/python-pillow/Pillow/issues/7310)
    \[radarhere]

-   Improved flexibility of XMP parsing [#&#8203;7274](https://github.com/python-pillow/Pillow/issues/7274)
    \[radarhere]

-   Support reading 8-bit YCbCr TIFF images [#&#8203;7415](https://github.com/python-pillow/Pillow/issues/7415)
    \[radarhere]

-   Allow saving I;16B images as PNG [#&#8203;7302](https://github.com/python-pillow/Pillow/issues/7302)
    \[radarhere]

-   Corrected drawing I;16 points and writing I;16 text [#&#8203;7257](https://github.com/python-pillow/Pillow/issues/7257)
    \[radarhere]

-   Set blue channel to 128 for BC5S [#&#8203;7413](https://github.com/python-pillow/Pillow/issues/7413)
    \[radarhere]

-   Increase flexibility when reading IPTC fields [#&#8203;7319](https://github.com/python-pillow/Pillow/issues/7319)
    \[radarhere]

-   Set C palette to be empty by default [#&#8203;7289](https://github.com/python-pillow/Pillow/issues/7289)
    \[radarhere]

-   Added gs_binary to control Ghostscript use on all platforms [#&#8203;7392](https://github.com/python-pillow/Pillow/issues/7392)
    \[radarhere]

-   Read bounding box information from the trailer of EPS files if specified [#&#8203;7382](https://github.com/python-pillow/Pillow/issues/7382)
    \[nopperl, radarhere]

-   Added reading 8-bit color DDS images [#&#8203;7426](https://github.com/python-pillow/Pillow/issues/7426)
    \[radarhere]

-   Added has_transparency_data [#&#8203;7420](https://github.com/python-pillow/Pillow/issues/7420)
    \[radarhere, hugovk]

-   Fixed bug when reading BC5S DDS images [#&#8203;7401](https://github.com/python-pillow/Pillow/issues/7401)
    \[radarhere]

-   Prevent TIFF orientation from being applied more than once [#&#8203;7383](https://github.com/python-pillow/Pillow/issues/7383)
    \[radarhere]

-   Use previous pixel alpha for QOI_OP_RGB [#&#8203;7357](https://github.com/python-pillow/Pillow/issues/7357)
    \[radarhere]

-   Added BC5U reading [#&#8203;7358](https://github.com/python-pillow/Pillow/issues/7358)
    \[radarhere]

-   Allow getpixel() to accept a list [#&#8203;7355](https://github.com/python-pillow/Pillow/issues/7355)
    \[radarhere, homm]

-   Allow GaussianBlur and BoxBlur to accept a sequence of x and y radii [#&#8203;7336](https://github.com/python-pillow/Pillow/issues/7336)
    \[radarhere]

-   Expand JPEG buffer size when saving optimized or progressive [#&#8203;7345](https://github.com/python-pillow/Pillow/issues/7345)
    \[radarhere]

-   Added session type check for Linux in ImageGrab.grabclipboard() [#&#8203;7332](https://github.com/python-pillow/Pillow/issues/7332)
    \[TheNooB2706, radarhere, hugovk]

-   Allow "loop=None" when saving GIF images [#&#8203;7329](https://github.com/python-pillow/Pillow/issues/7329)
    \[radarhere]

-   Fixed transparency when saving P mode images to PDF [#&#8203;7323](https://github.com/python-pillow/Pillow/issues/7323)
    \[radarhere]

-   Added saving LA images as PDFs [#&#8203;7299](https://github.com/python-pillow/Pillow/issues/7299)
    \[radarhere]

-   Set SMaskInData to 1 for PDFs with alpha [#&#8203;7316](https://github.com/python-pillow/Pillow/issues/7316), [#&#8203;7317](https://github.com/python-pillow/Pillow/issues/7317)
    \[radarhere]

-   Changed Image mode property to be read-only by default [#&#8203;7307](https://github.com/python-pillow/Pillow/issues/7307)
    \[radarhere]

-   Silence exceptions in *repr_jpeg* and *repr_png* [#&#8203;7266](https://github.com/python-pillow/Pillow/issues/7266)
    \[mtreinish, radarhere]

-   Do not use transparency when saving GIF if it has been removed when normalizing mode [#&#8203;7284](https://github.com/python-pillow/Pillow/issues/7284)
    \[radarhere]

-   Fix missing symbols when libtiff depends on libjpeg [#&#8203;7270](https://github.com/python-pillow/Pillow/issues/7270)
    \[heitbaum]

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4zNS4wIiwidXBkYXRlZEluVmVyIjoiMzYuMzUuMCIsInRhcmdldEJyYW5jaCI6ImRldiJ9-->

Reviewed-on: https://git.end-play.xyz/profitroll/TelegramPoster/pulls/48
Co-authored-by: Renovate <renovate@git.end-play.xyz>
Co-committed-by: Renovate <renovate@git.end-play.xyz>
2023-10-15 17:47:05 +03:00
e719da7750 Update dependency uvloop to v0.18.0 (#46)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [uvloop](https://github.com/MagicStack/uvloop) | minor | `==0.17.0` -> `==0.18.0` |

---

### Release Notes

<details>
<summary>MagicStack/uvloop (uvloop)</summary>

### [`v0.18.0`](https://github.com/MagicStack/uvloop/releases/tag/v0.18.0)

[Compare Source](https://github.com/MagicStack/uvloop/compare/v0.17.0...v0.18.0)

# Fixes

-   CI fixes ([#&#8203;520](https://github.com/MagicStack/uvloop/issues/520), [#&#8203;553](https://github.com/MagicStack/uvloop/issues/553))
    (by [@&#8203;altendky](https://github.com/altendky) in [`7783f1c`](https://github.com/MagicStack/uvloop/commit/7783f1c5), [@&#8203;dulmandakh](https://github.com/dulmandakh) in [`1dd40f1`](https://github.com/MagicStack/uvloop/commit/1dd40f17))

-   Make extract_stack resilient to lacking frames. ([#&#8203;563](https://github.com/MagicStack/uvloop/issues/563))
    (by [@&#8203;jhance](https://github.com/jhance) in [`0687643`](https://github.com/MagicStack/uvloop/commit/06876434) for [#&#8203;563](https://github.com/MagicStack/uvloop/issues/563))

-   Port uvloop to Python 3.12 ([#&#8203;570](https://github.com/MagicStack/uvloop/issues/570))
    (by [@&#8203;1st1](https://github.com/1st1), [@&#8203;fantix](https://github.com/fantix) in [`9f82bd7`](https://github.com/MagicStack/uvloop/commit/9f82bd74) for [#&#8203;569](https://github.com/MagicStack/uvloop/issues/569))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4zNS4wIiwidXBkYXRlZEluVmVyIjoiMzYuMzUuMCIsInRhcmdldEJyYW5jaCI6ImRldiJ9-->

Reviewed-on: https://git.end-play.xyz/profitroll/TelegramPoster/pulls/46
Co-authored-by: Renovate <renovate@git.end-play.xyz>
Co-committed-by: Renovate <renovate@git.end-play.xyz>
2023-10-15 17:46:55 +03:00
1d88076285 exp is now exc 2023-08-16 13:27:23 +02:00
5e8506cc12 Attempt to work around #40 2023-08-16 13:20:25 +02:00
235fa37252 Small config reading fix 2023-08-14 15:20:48 +02:00
176f5d35c3 Dependencies cleanup 2023-08-14 14:58:11 +02:00
cd26990b7e Migrate to async_pymongo 2023-08-14 14:52:02 +02:00
5b56919b80 Update dependency libbot to v2.0.1 (#39)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| libbot | patch | `==2.0.0` -> `==2.0.1` |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4zNS4wIiwidXBkYXRlZEluVmVyIjoiMzYuMzUuMCIsInRhcmdldEJyYW5jaCI6ImRldiJ9-->

Reviewed-on: #39
Co-authored-by: Renovate <renovate@git.end-play.xyz>
Co-committed-by: Renovate <renovate@git.end-play.xyz>
2023-08-11 11:31:19 +03:00
0e9bed1277 Update dependency libbot to v2 (#38)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| libbot | major | `==0.2.2` -> `==2.0.0` |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS41NC4wIiwidXBkYXRlZEluVmVyIjoiMzUuNTQuMCJ9-->

Reviewed-on: #38
Co-authored-by: Renovate <renovate@git.end-play.xyz>
Co-committed-by: Renovate <renovate@git.end-play.xyz>
2023-08-07 13:07:58 +03:00
fb37da4195 Bump libbot to 0.2.2 2023-08-06 22:20:27 +02:00
065f704923 Update dependency libbot to v1.9 (#35)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| libbot | minor | `==1.8` -> `==1.9` |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS41NC4wIiwidXBkYXRlZEluVmVyIjoiMzUuNTQuMCJ9-->

Co-authored-by: Renovate <renovate@git.end-play.xyz>
Reviewed-on: #35
Co-authored-by: Renovate <renovate@noreply.localhost>
Co-committed-by: Renovate <renovate@noreply.localhost>
2023-07-26 15:28:42 +03:00
a45f6b620f Update dependency black to ~=23.7.0 (#34)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | minor | `~=23.3.0` -> `~=23.7.0` |

---

### Release Notes

<details>
<summary>psf/black</summary>

### [`v23.7.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#&#8203;2370)

[Compare Source](https://github.com/psf/black/compare/23.3.0...23.7.0)

##### Highlights

-   Runtime support for Python 3.7 has been removed. Formatting 3.7 code will still be
    supported until further notice ([#&#8203;3765](https://github.com/psf/black/issues/3765))

##### Stable style

-   Fix a bug where an illegal trailing comma was added to return type annotations using
    PEP 604 unions ([#&#8203;3735](https://github.com/psf/black/issues/3735))
-   Fix several bugs and crashes where comments in stub files were removed or mishandled
    under some circumstances ([#&#8203;3745](https://github.com/psf/black/issues/3745))
-   Fix a crash with multi-line magic comments like `type: ignore` within parentheses
    ([#&#8203;3740](https://github.com/psf/black/issues/3740))
-   Fix error in AST validation when *Black* removes trailing whitespace in a type comment
    ([#&#8203;3773](https://github.com/psf/black/issues/3773))

##### Preview style

-   Implicitly concatenated strings used as function args are no longer wrapped inside
    parentheses ([#&#8203;3640](https://github.com/psf/black/issues/3640))
-   Remove blank lines between a class definition and its docstring ([#&#8203;3692](https://github.com/psf/black/issues/3692))

##### Configuration

-   The `--workers` argument to *Black* can now be specified via the `BLACK_NUM_WORKERS`
    environment variable ([#&#8203;3743](https://github.com/psf/black/issues/3743))
-   `.pytest_cache`, `.ruff_cache` and `.vscode` are now excluded by default ([#&#8203;3691](https://github.com/psf/black/issues/3691))
-   Fix *Black* not honouring `pyproject.toml` settings when running `--stdin-filename`
    and the `pyproject.toml` found isn't in the current working directory ([#&#8203;3719](https://github.com/psf/black/issues/3719))
-   *Black* will now error if `exclude` and `extend-exclude` have invalid data types in
    `pyproject.toml`, instead of silently doing the wrong thing ([#&#8203;3764](https://github.com/psf/black/issues/3764))

##### Packaging

-   Upgrade mypyc from 0.991 to 1.3 ([#&#8203;3697](https://github.com/psf/black/issues/3697))
-   Remove patching of Click that mitigated errors on Python 3.6 with `LANG=C` ([#&#8203;3768](https://github.com/psf/black/issues/3768))

##### Parser

-   Add support for the new PEP 695 syntax in Python 3.12 ([#&#8203;3703](https://github.com/psf/black/issues/3703))

##### Performance

-   Speed up *Black* significantly when the cache is full ([#&#8203;3751](https://github.com/psf/black/issues/3751))
-   Avoid importing `IPython` in a case where we wouldn't need it ([#&#8203;3748](https://github.com/psf/black/issues/3748))

##### Output

-   Use aware UTC datetimes internally, avoids deprecation warning on Python 3.12 ([#&#8203;3728](https://github.com/psf/black/issues/3728))
-   Change verbose logging to exactly mirror *Black*'s logic for source discovery ([#&#8203;3749](https://github.com/psf/black/issues/3749))

##### *Blackd*

-   The `blackd` argument parser now shows the default values for options in their help
    text ([#&#8203;3712](https://github.com/psf/black/issues/3712))

##### Integrations

-   Black is now tested with
    [`PYTHONWARNDEFAULTENCODING = 1`](https://docs.python.org/3/library/io.html#io-encoding-warning)
    ([#&#8203;3763](https://github.com/psf/black/issues/3763))
-   Update GitHub Action to display black output in the job summary ([#&#8203;3688](https://github.com/psf/black/issues/3688))

##### Documentation

-   Add a CITATION.cff file to the root of the repository, containing metadata on how to
    cite this software ([#&#8203;3723](https://github.com/psf/black/issues/3723))
-   Update the *classes* and *exceptions* documentation in Developer reference to match
    the latest code base ([#&#8203;3755](https://github.com/psf/black/issues/3755))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS41NC4wIiwidXBkYXRlZEluVmVyIjoiMzUuNTQuMCJ9-->

Co-authored-by: Renovate <renovate@git.end-play.xyz>
Reviewed-on: https://git.end-play.xyz/profitroll/TelegramPoster/pulls/34
Co-authored-by: Renovate <renovate@noreply.localhost>
Co-committed-by: Renovate <renovate@noreply.localhost>
2023-07-11 11:20:23 +03:00
fe8b562a7e master (#33)
Reviewed-on: #33
2023-07-06 17:35:12 +03:00
63164d2169 Merge branch 'master' into dev 2023-07-06 15:21:15 +03:00
be288776d9 max_concurrent_transmissions reduced to 1 2023-07-06 14:19:56 +02:00
0c73c51936 unauthorized_client will be created when needed 2023-07-03 14:42:55 +02:00
14 changed files with 111 additions and 95 deletions

View File

@@ -50,7 +50,7 @@ class PyroClient(PyroClient):
def __init__(self, scheduler: AsyncIOScheduler): def __init__(self, scheduler: AsyncIOScheduler):
super().__init__(locales_root=Path("locale"), scheduler=scheduler) super().__init__(locales_root=Path("locale"), scheduler=scheduler)
self.version: float = 0.2 self.version: float = 0.3
self.owner: int = self.config["bot"]["owner"] self.owner: int = self.config["bot"]["owner"]
self.admins: List[int] = self.config["bot"]["admins"] + [ self.admins: List[int] = self.config["bot"]["admins"] + [
@@ -104,8 +104,8 @@ class PyroClient(PyroClient):
logger.warning( logger.warning(
"Could not send startup message to bot owner. Perhaps user has not started the bot yet." "Could not send startup message to bot owner. Perhaps user has not started the bot yet."
) )
except Exception as exp: except Exception as exc:
logger.exception("Update check failed due to %s: %s", exp, format_exc()) logger.exception("Update check failed due to %s: %s", exc, format_exc())
if self.config["mode"]["post"]: if self.config["mode"]["post"]:
if self.config["posting"]["use_interval"]: if self.config["posting"]["use_interval"]:
@@ -141,7 +141,7 @@ class PyroClient(PyroClient):
async def submit_media( async def submit_media(
self, id: str self, id: str
) -> Tuple[Union[Message, None], Union[str, None]]: ) -> Tuple[Union[Message, None], Union[str, None]]:
db_entry = col_submitted.find_one({"_id": ObjectId(id)}) db_entry = await col_submitted.find_one({"_id": ObjectId(id)})
submission = None submission = None
if db_entry is None: if db_entry is None:
@@ -155,8 +155,8 @@ class PyroClient(PyroClient):
filepath = await self.download_media( filepath = await self.download_media(
submission, file_name=self.config["locations"]["tmp"] + sep submission, file_name=self.config["locations"]["tmp"] + sep
) )
except Exception as exp: except Exception as exc:
raise SubmissionUnavailableError() from exp raise SubmissionUnavailableError() from exc
elif not Path( elif not Path(
f"{self.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}/{db_entry['temp']['file']}", f"{self.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}/{db_entry['temp']['file']}",
@@ -204,8 +204,8 @@ class PyroClient(PyroClient):
# ), # ),
# caption="queue", # caption="queue",
# ) # )
except UnexpectedStatus as exp: except UnexpectedStatus as exc:
raise SubmissionUnsupportedError(str(filepath)) from exp raise SubmissionUnsupportedError(str(filepath)) from exc
response_dict = ( response_dict = (
{} {}
@@ -226,7 +226,7 @@ class PyroClient(PyroClient):
) )
raise SubmissionDuplicatesError(str(filepath), duplicates) raise SubmissionDuplicatesError(str(filepath), duplicates)
col_submitted.find_one_and_update( await col_submitted.find_one_and_update(
{"_id": ObjectId(id)}, {"$set": {"done": True}} {"_id": ObjectId(id)}, {"$set": {"done": True}}
) )
@@ -258,12 +258,12 @@ class PyroClient(PyroClient):
* `PyroUser`: PyroUser object * `PyroUser`: PyroUser object
""" """
if ( if (
col_users.find_one( await col_users.find_one(
{"id": user.id if isinstance(user, User) else user} {"id": user.id if isinstance(user, User) else user}
) # type: ignore ) # type: ignore
is None is None
): ):
col_users.insert_one( await col_users.insert_one(
{ {
"id": user.id if isinstance(user, User) else user, "id": user.id if isinstance(user, User) else user,
"locale": user.language_code if isinstance(user, User) else None, "locale": user.language_code if isinstance(user, User) else None,
@@ -273,7 +273,7 @@ class PyroClient(PyroClient):
} }
) # type: ignore ) # type: ignore
db_record = col_users.find_one( db_record = await col_users.find_one(
{"id": user.id if isinstance(user, User) else user} {"id": user.id if isinstance(user, User) else user}
) # type: ignore ) # type: ignore

View File

@@ -20,19 +20,19 @@ class PyroUser:
cooldown: datetime cooldown: datetime
subscription: dict subscription: dict
async def update_locale(self, locale: str): async def update_locale(self, locale: str) -> None:
col_users.update_one({"_id": self._id}, {"$set": {"locale": locale}}) await col_users.update_one({"_id": self._id}, {"$set": {"locale": locale}})
async def update_cooldown(self, time: datetime = datetime.now()): async def update_cooldown(self, time: datetime = datetime.now()) -> None:
col_users.update_one({"_id": self._id}, {"$set": {"cooldown": time}}) await col_users.update_one({"_id": self._id}, {"$set": {"cooldown": time}})
async def block(self) -> None: async def block(self) -> None:
"""Ban user from using command and submitting content.""" """Ban user from using command and submitting content."""
col_users.update_one({"_id": self._id}, {"$set": {"banned": True}}) await col_users.update_one({"_id": self._id}, {"$set": {"banned": True}})
async def unblock(self) -> None: async def unblock(self) -> None:
"""Allow user to use command and submit posts again.""" """Allow user to use command and submit posts again."""
col_users.update_one({"_id": self._id}, {"$set": {"banned": False}}) await col_users.update_one({"_id": self._id}, {"$set": {"banned": False}})
async def is_limited(self, app: Union[PyroClient, None] = None) -> bool: async def is_limited(self, app: Union[PyroClient, None] = None) -> bool:
"""Check if user is on a cooldown after submitting something. """Check if user is on a cooldown after submitting something.
@@ -41,11 +41,9 @@ class PyroUser:
`bool`: Must be `True` if on the cooldown and `False` if not `bool`: Must be `True` if on the cooldown and `False` if not
""" """
admins = ( admins = (
app.admins
if app is not None
else (
await config_get("admins", "bot") + [await config_get("owner", "bot")] await config_get("admins", "bot") + [await config_get("owner", "bot")]
) if app is None
else app.admins
) )
return (datetime.now() - self.cooldown).total_seconds() < ( return (datetime.now() - self.cooldown).total_seconds() < (

View File

@@ -6,7 +6,7 @@
"api_id": 0, "api_id": 0,
"api_hash": "", "api_hash": "",
"bot_token": "", "bot_token": "",
"max_concurrent_transmissions": 3, "max_concurrent_transmissions": 1,
"scoped_commands": true "scoped_commands": true
}, },
"database": { "database": {
@@ -83,7 +83,8 @@
"address_external": "https://photos.domain.com", "address_external": "https://photos.domain.com",
"username": "", "username": "",
"password": "", "password": "",
"album": "" "album": "",
"timeout": 15.0
} }
}, },
"caption": { "caption": {

View File

@@ -118,7 +118,7 @@ async def authorize(custom_session: Union[ClientSession, None] = None) -> str:
unauthorized_client = Client( unauthorized_client = Client(
base_url=sync.config_get("address", "posting", "api"), base_url=sync.config_get("address", "posting", "api"),
timeout=5.0, timeout=sync.config_get("timeout", "posting", "api"),
verify_ssl=True, verify_ssl=True,
raise_on_unexpected_status=True, raise_on_unexpected_status=True,
follow_redirects=False, follow_redirects=False,
@@ -142,7 +142,7 @@ if not isinstance(login_token, Token):
client = AuthenticatedClient( client = AuthenticatedClient(
base_url=sync.config_get("address", "posting", "api"), base_url=sync.config_get("address", "posting", "api"),
timeout=5.0, timeout=sync.config_get("timeout", "posting", "api"),
verify_ssl=True, verify_ssl=True,
raise_on_unexpected_status=True, raise_on_unexpected_status=True,
token=login_token.access_token, token=login_token.access_token,

View File

@@ -27,13 +27,14 @@ parser.add_argument("--create-album", action="store_true")
args = parser.parse_args() args = parser.parse_args()
unauthorized_client = Client( if args.create_user or args.create_album:
unauthorized_client = Client(
base_url=sync.config_get("address", "posting", "api"), base_url=sync.config_get("address", "posting", "api"),
timeout=5.0, timeout=5.0,
verify_ssl=True, verify_ssl=True,
raise_on_unexpected_status=True, raise_on_unexpected_status=True,
follow_redirects=False, follow_redirects=False,
) )
async def cli_create_user() -> None: async def cli_create_user() -> None:
@@ -57,8 +58,8 @@ async def cli_create_user() -> None:
none = input( none = input(
"Alright. If you have email confirmation enabled - please confirm registration by using the link in your email. After that press Enter. Otherwise just press Enter." "Alright. If you have email confirmation enabled - please confirm registration by using the link in your email. After that press Enter. Otherwise just press Enter."
) )
except Exception as exp: except Exception as exc:
print(f"Could not create a user due to {exp}", flush=True) print(f"Could not create a user due to {exc}", flush=True)
print_exc() print_exc()
exit() exit()
if not args.create_album: if not args.create_album:
@@ -96,8 +97,8 @@ async def cli_create_album() -> None:
result_2 = await album_create(client=client, name=name, title=title) result_2 = await album_create(client=client, name=name, title=title)
# asyncio.run(create_album(name, title)) # asyncio.run(create_album(name, title))
await config_set("album", name, "posting", "api") await config_set("album", name, "posting", "api")
except Exception as exp: except Exception as exc:
print(f"Could not create an album due to {exp}", flush=True) print(f"Could not create an album due to {exc}", flush=True)
print_exc() print_exc()
exit() exit()
print("You're done!", flush=True) print("You're done!", flush=True)

18
modules/custom_filters.py Normal file
View File

@@ -0,0 +1,18 @@
"""Custom message filters"""
from pyrogram import filters
from pyrogram.types import Message
from classes.pyroclient import PyroClient
async def _mode_post_func(_, __: PyroClient, message: Message):
return __.config["mode"]["post"]
async def _mode_submit_func(_, __: PyroClient, message: Message):
return __.config["mode"]["submit"]
mode_post = filters.create(_mode_post_func)
mode_submit = filters.create(_mode_submit_func)

View File

@@ -1,11 +1,9 @@
"""Module that provides all database columns""" """Module that provides all database columns"""
from pymongo import MongoClient from async_pymongo import AsyncClient
from ujson import loads from libbot import sync
with open("config.json", "r", encoding="utf-8") as f: db_config = sync.config_get("database")
db_config = loads(f.read())["database"]
f.close()
if db_config["user"] is not None and db_config["password"] is not None: if db_config["user"] is not None and db_config["password"] is not None:
con_string = "mongodb://{0}:{1}@{2}:{3}/{4}".format( con_string = "mongodb://{0}:{1}@{2}:{3}/{4}".format(
@@ -20,15 +18,9 @@ else:
db_config["host"], db_config["port"], db_config["name"] db_config["host"], db_config["port"], db_config["name"]
) )
db_client = MongoClient(con_string) db_client = AsyncClient(con_string)
db = db_client.get_database(name=db_config["name"]) db = db_client.get_database(name=db_config["name"])
collections = db.list_collection_names()
for collection in ["sent", "users", "submitted"]:
if collection not in collections:
db.create_collection(collection)
col_sent = db.get_collection("sent") col_sent = db.get_collection("sent")
col_users = db.get_collection("users") col_users = db.get_collection("users")
col_submitted = db.get_collection("submitted") col_submitted = db.get_collection("submitted")

View File

@@ -77,12 +77,12 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
try: try:
response: File = await func_iter[1](id=media.id, client=client) response: File = await func_iter[1](id=media.id, client=client)
except Exception as exp: except Exception as exc:
print_exc() print_exc()
logger.error("Media is invalid: %s", exp) logger.error("Media is invalid: %s", exc)
if app.config["reports"]["error"]: if app.config["reports"]["error"]:
await app.send_message( await app.send_message(
app.owner, f"Media is invalid: {exp}" app.owner, f"Media is invalid: {exc}"
) )
return return
@@ -103,11 +103,11 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
).results[0] ).results[0]
try: try:
response: File = await func[1](id=media.id, client=client) response: File = await func[1](id=media.id, client=client)
except Exception as exp: except Exception as exc:
print_exc() print_exc()
logger.error("Media is invalid: %s", exp) logger.error("Media is invalid: %s", exc)
if app.config["reports"]["error"]: if app.config["reports"]["error"]:
await app.send_message(app.owner, f"Media is invalid: {exp}") await app.send_message(app.owner, f"Media is invalid: {exc}")
return return
except (KeyError, AttributeError, TypeError, IndexError): except (KeyError, AttributeError, TypeError, IndexError):
@@ -179,7 +179,7 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
del response del response
submitted = col_submitted.find_one({"temp.file": media.filename}) submitted = await col_submitted.find_one({"temp.file": media.filename})
if submitted is not None and submitted["caption"] is not None: if submitted is not None and submitted["caption"] is not None:
caption = submitted["caption"].strip() caption = submitted["caption"].strip()
@@ -217,19 +217,19 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
caption=caption, caption=caption,
disable_notification=app.config["posting"]["silent"], disable_notification=app.config["posting"]["silent"],
) )
except Exception as exp: except Exception as exc:
logger.error( logger.error(
"Could not send media %s (%s) due to %s", media.filename, media.id, exp "Could not send media %s (%s) due to %s", media.filename, media.id, exc
) )
if app.config["reports"]["error"]: if app.config["reports"]["error"]:
await app.send_message( await app.send_message(
app.owner, app.owner,
app._("post_exception", "message").format(exp, format_exc()), app._("post_exception", "message").format(exc, format_exc()),
) )
# rmtree(path.join(app.config['locations']['tmp'], tmp_dir), ignore_errors=True) # rmtree(path.join(app.config['locations']['tmp'], tmp_dir), ignore_errors=True)
return return
col_sent.insert_one( await col_sent.insert_one(
{ {
"date": datetime.now(), "date": datetime.now(),
"image": media.id, "image": media.id,
@@ -253,14 +253,14 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
str(app.config["posting"]["silent"]), str(app.config["posting"]["silent"]),
) )
except Exception as exp: except Exception as exc:
logger.error( logger.error(
"Could not send content due to %s. Traceback: %s", exp, format_exc() "Could not send content due to %s. Traceback: %s", exc, format_exc()
) )
if app.config["reports"]["error"]: if app.config["reports"]["error"]:
await app.send_message( await app.send_message(
app.owner, app.owner,
app._("post_exception", "message").format(exp, format_exc()), app._("post_exception", "message").format(exc, format_exc()),
) )
try: try:
rmtree( rmtree(

View File

@@ -25,7 +25,7 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
user = await app.find_user(clb.from_user) user = await app.find_user(clb.from_user)
fullclb = str(clb.data).split("_") fullclb = str(clb.data).split("_")
db_entry = col_submitted.find_one({"_id": ObjectId(fullclb[2])}) db_entry = await col_submitted.find_one({"_id": ObjectId(fullclb[2])})
try: try:
submission = await app.submit_media(fullclb[2]) submission = await app.submit_media(fullclb[2])
@@ -43,21 +43,21 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
show_alert=True, show_alert=True,
) )
return return
except SubmissionDuplicatesError as exp: except SubmissionDuplicatesError as exc:
await clb.answer( await clb.answer(
text=app._("sub_duplicates_found", "callback", locale=user.locale), text=app._("sub_duplicates_found", "callback", locale=user.locale),
show_alert=True, show_alert=True,
) )
await clb.message.reply_text( await clb.message.reply_text(
app._("sub_media_duplicates_list", "message", locale=user.locale).format( app._("sub_media_duplicates_list", "message", locale=user.locale).format(
"\n".join(exp.duplicates) "\n".join(exc.duplicates)
), ),
quote=True, quote=True,
) )
logger.info( logger.info(
"Submission with ID '%s' could not be accepted because of the duplicates: %s", "Submission with ID '%s' could not be accepted because of the duplicates: %s",
fullclb[2], fullclb[2],
str(exp.duplicates), str(exc.duplicates),
) )
return return
@@ -127,7 +127,7 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
user = await app.find_user(clb.from_user) user = await app.find_user(clb.from_user)
fullclb = str(clb.data).split("_") fullclb = str(clb.data).split("_")
db_entry = col_submitted.find_one_and_delete({"_id": ObjectId(fullclb[2])}) db_entry = await col_submitted.find_one_and_delete({"_id": ObjectId(fullclb[2])})
if ( if (
db_entry["temp"]["uuid"] is not None db_entry["temp"]["uuid"] is not None
@@ -146,7 +146,7 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
submission = await app.get_messages( submission = await app.get_messages(
db_entry["user"], db_entry["telegram"]["msg_id"] db_entry["user"], db_entry["telegram"]["msg_id"]
) )
except Exception as exp: except Exception as exc:
await clb.answer( await clb.answer(
text=app._("sub_msg_unavail", "message", locale=user.locale), text=app._("sub_msg_unavail", "message", locale=user.locale),
show_alert=True, show_alert=True,

View File

@@ -3,9 +3,14 @@ from pyrogram.client import Client
from pyrogram.types import Message from pyrogram.types import Message
from classes.pyroclient import PyroClient from classes.pyroclient import PyroClient
from modules import custom_filters
@Client.on_message(~filters.scheduled & filters.command(["start"], prefixes="/")) @Client.on_message(
custom_filters.mode_submit
& ~filters.scheduled
& filters.command(["start"], prefixes="/")
)
async def cmd_start(app: PyroClient, msg: Message): async def cmd_start(app: PyroClient, msg: Message):
user = await app.find_user(msg.from_user) user = await app.find_user(msg.from_user)
@@ -16,7 +21,9 @@ async def cmd_start(app: PyroClient, msg: Message):
@Client.on_message( @Client.on_message(
~filters.scheduled & filters.command(["rules", "help"], prefixes="/") custom_filters.mode_submit
& ~filters.scheduled
& filters.command(["rules", "help"], prefixes="/")
) )
async def cmd_rules(app: PyroClient, msg: Message): async def cmd_rules(app: PyroClient, msg: Message):
user = await app.find_user(msg.from_user) user = await app.find_user(msg.from_user)

View File

@@ -123,16 +123,16 @@ async def cmd_import(app: PyroClient, msg: Message):
for name in handle.namelist() for name in handle.namelist()
] ]
_ = await asyncio.gather(*tasks) _ = await asyncio.gather(*tasks)
except Exception as exp: except Exception as exc:
logger.error( logger.error(
"Could not import '%s' due to %s: %s", "Could not import '%s' due to %s: %s",
answer.document.file_name, answer.document.file_name,
exp, exc,
format_exc(), format_exc(),
) )
await answer.reply_text( await answer.reply_text(
app._("import_unpack_error", "message", locale=user.locale).format( app._("import_unpack_error", "message", locale=user.locale).format(
exp, format_exc() exc, format_exc()
) )
) )
return return
@@ -165,12 +165,12 @@ async def cmd_import(app: PyroClient, msg: Message):
compress=False, compress=False,
caption="queue", caption="queue",
) )
except UnexpectedStatus as exp: except UnexpectedStatus as exc:
logger.error( logger.error(
"Could not upload '%s' from '%s': %s", "Could not upload '%s' from '%s': %s",
filename, filename,
Path(f"{app.config['locations']['tmp']}/{tmp_dir}"), Path(f"{app.config['locations']['tmp']}/{tmp_dir}"),
exp, exc,
) )
await msg.reply_text( await msg.reply_text(
app._( app._(

View File

@@ -4,10 +4,12 @@ from pyrogram.client import Client
from pyrogram.types import Message, User from pyrogram.types import Message, User
from classes.pyroclient import PyroClient from classes.pyroclient import PyroClient
from modules import custom_filters
@Client.on_message( @Client.on_message(
~filters.scheduled custom_filters.mode_post
& ~filters.scheduled
& filters.chat(sync.config_get("comments", "posting")) & filters.chat(sync.config_get("comments", "posting"))
& filters.reply & filters.reply
& filters.command(["report"], prefixes=["", "/"]) & filters.command(["report"], prefixes=["", "/"])

View File

@@ -13,6 +13,7 @@ from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
from classes.enums.submission_types import SubmissionType from classes.enums.submission_types import SubmissionType
from classes.exceptions import SubmissionDuplicatesError, SubmissionUnsupportedError from classes.exceptions import SubmissionDuplicatesError, SubmissionUnsupportedError
from classes.pyroclient import PyroClient from classes.pyroclient import PyroClient
from modules import custom_filters
from modules.database import col_submitted from modules.database import col_submitted
from modules.utils import USERS_WITH_CONTEXT from modules.utils import USERS_WITH_CONTEXT
@@ -20,7 +21,7 @@ logger = logging.getLogger(__name__)
@Client.on_message( @Client.on_message(
~filters.scheduled & filters.private & filters.photo custom_filters.mode_submit & ~filters.scheduled & filters.private & filters.photo
| filters.video | filters.video
# | filters.animation # | filters.animation
| filters.document | filters.document
@@ -152,7 +153,7 @@ async def get_submission(app: PyroClient, msg: Message):
+ sep, + sep,
) )
inserted = col_submitted.insert_one( inserted = await col_submitted.insert_one(
{ {
"user": msg.from_user.id, "user": msg.from_user.id,
"date": datetime.now(), "date": datetime.now(),
@@ -165,7 +166,7 @@ async def get_submission(app: PyroClient, msg: Message):
) )
else: else:
inserted = col_submitted.insert_one( inserted = await col_submitted.insert_one(
{ {
"user": msg.from_user.id, "user": msg.from_user.id,
"date": datetime.now(), "date": datetime.now(),
@@ -237,16 +238,16 @@ async def get_submission(app: PyroClient, msg: Message):
quote=True, quote=True,
) )
return return
except SubmissionDuplicatesError as exp: except SubmissionDuplicatesError as exc:
await msg.reply_text( await msg.reply_text(
app._( app._(
"sub_media_duplicates_list", "message", locale=user.locale "sub_media_duplicates_list", "message", locale=user.locale
).format("\n".join(exp.duplicates)), ).format("\n".join(exc.duplicates)),
quote=True, quote=True,
) )
return return
except Exception as exp: except Exception as exc:
await msg.reply_text(format_exc(), quote=True) await msg.reply_text(exc, quote=True)
return return
elif ( elif (
msg.from_user.id not in app.admins msg.from_user.id not in app.admins
@@ -270,12 +271,12 @@ async def get_submission(app: PyroClient, msg: Message):
) )
) )
return return
except SubmissionDuplicatesError as exp: except SubmissionDuplicatesError as exc:
await msg.reply_text( await msg.reply_text(
app._("sub_dup", "message", locale=user.locale), quote=True app._("sub_dup", "message", locale=user.locale), quote=True
) )
return return
except Exception as exp: except Exception as exc:
await app.send_message( await app.send_message(
app.owner, app.owner,
app._( app._(

View File

@@ -1,15 +1,11 @@
aiohttp~=3.8.4 aiohttp~=3.8.4
black~=23.3.0
convopyro==0.5 convopyro==0.5
pillow~=10.0.0 pillow~=10.1.0
psutil~=5.9.4
pykeyboard==0.1.5 pykeyboard==0.1.5
pymongo~=4.4.0
pyrogram==2.0.106
python_dateutil==2.8.2
pytimeparse~=1.1.8 pytimeparse~=1.1.8
tgcrypto==1.2.5 tgcrypto==1.2.5
uvloop==0.17.0 uvloop==0.18.0
--extra-index-url https://git.end-play.xyz/api/packages/profitroll/pypi/simple --extra-index-url https://git.end-play.xyz/api/packages/profitroll/pypi/simple
libbot[speed,pyrogram]==1.8 async_pymongo==0.1.4
libbot[speed,pyrogram]==2.0.1
photosapi_client==0.5.0 photosapi_client==0.5.0