From d1b1bf2a1441b536fbf324095dc970b723a21b0c Mon Sep 17 00:00:00 2001 From: miteruzo Date: Wed, 6 Nov 2024 03:57:57 +0900 Subject: [PATCH] =?UTF-8?q?#1=20=E5=9E=8B=E5=AE=9A=E7=BE=A9=E3=81=8C?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E3=81=A0=E3=81=8C=EF=BC=8C=E5=8B=95?= =?UTF-8?q?=E4=BD=9C=E3=81=AF=E5=95=8F=E9=A1=8C=E3=81=AA=E3=81=84=E3=81=A8?= =?UTF-8?q?=E6=80=9D=C3=A3=C2=81=E3=81=AF=E3=82=8C=E3=82=8B=E3=81=9F?= =?UTF-8?q?=E3=82=81=E6=9C=AC=E7=95=AA=E3=81=AB=E7=A7=BB=E3=81=99=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- atproto.pyi | 49 ++++++++++++++++++++++ atproto/models.pyi | 0 eloquent.pyi | 1 + main.py | 21 +++++++--- nico.py | 101 +++++++++++++++++++++++++++++++++------------ nizika_nico | 2 +- 6 files changed, 141 insertions(+), 33 deletions(-) create mode 100644 atproto.pyi create mode 100644 atproto/models.pyi create mode 120000 eloquent.pyi diff --git a/atproto.pyi b/atproto.pyi new file mode 100644 index 0000000..ed46197 --- /dev/null +++ b/atproto.pyi @@ -0,0 +1,49 @@ +from datetime import datetime + +from atproto import models + + +class Client: + app: AppNamespace + + def get_current_time_iso (self) -> datetime: ... + + def get_post_thread ( + self, + uri: str, + parent_height: int | None = None + ) -> Response: ... + + def follow (self, did: str) -> None: ... + + +class AppNamespace: + bsky: AppBskyNamespace + + +class AppBskyNamespace: + notification: AppBskyNotificationNamespace + + +class AppBskyNotificationNamespace: + def list_notifications (self) -> Response: ... + + def update_seen (self, seen: dict[str, datetime]) -> None: ... + + +class Response: + notifications: list[Notification] + thread: (ThreadViewPost + | models.AppBskyFeedDefs.NotFoundPost + | models.AppBskyFeedDefs.BlockedPost) + + +class Notification: + is_read: bool + reason: str + uri: str + author: ProfileView + + +class ProfileView: + did: str diff --git a/atproto/models.pyi b/atproto/models.pyi new file mode 100644 index 0000000..e69de29 diff --git a/eloquent.pyi b/eloquent.pyi new file mode 120000 index 0000000..a074ddf --- /dev/null +++ b/eloquent.pyi @@ -0,0 +1 @@ +db/eloquent.pyi \ No newline at end of file diff --git a/main.py b/main.py index ca5d5a2..0fb39f0 100644 --- a/main.py +++ b/main.py @@ -70,8 +70,8 @@ def main ( client.login (account.USER_ID, account.PASSWORD) - kiriban_list: list[tuple[int, nico.VideoInfo]] = nico.get_kiriban_list () got_kiriban_at: date = datetime.now ().date () - timedelta (days = datetime.now ().hour < 15) + kiriban_list: list[tuple[int, nico.VideoInfo]] = nico.get_kiriban_list (got_kiriban_at) kiriban_interval: timedelta = ((get_kiriban_dt_to_update () - datetime.now ()) / len (kiriban_list)) next_kiriban_at = datetime.now () @@ -109,8 +109,17 @@ def main ( root = records[-1]['strong_ref'])) if kiriban_list and datetime.now () >= next_kiriban_at: - (views_count, video_code) = ( + (views_count, video_info) = ( kiriban_list.pop (random.randint (0, len (kiriban_list) - 1))) + uri = f"https://www.nicovideo.jp/watch/{ video_info['contentId'] }" + (title, description, thumbnail) = get_embed_info (uri) + try: + upload = client.com.atproto.repo.upload_blob ( + io.BytesIO (requests.get (thumbnail, + timeout = 60).content)) + thumb = upload.blob + except Timeout: + thumb = None embed_external = models.AppBskyEmbedExternal.Main ( external = models.AppBskyEmbedExternal.External ( title = title, @@ -118,11 +127,11 @@ def main ( thumb = thumb, uri = uri)) client.post (Talk.main (f""" -ニコニコの『{ datum['title'] }』という動画が{ views_count }再生を突破しました。 -つけられたタグは「{ '」、「'.join (datum['tags']) }」です。 +ニコニコの『{ video_info['title'] }』という動画が{ views_count }再生を突破しました。 +つけられたタグは「{ '」、「'.join (video_info['tags']) }」です。 概要には次のように書かれています： ```html -{ datum['description'] } +{ video_info['description'] } ``` このことについて、ニジカちゃんからのお祝いメッセージを下さい。"""), embed = embed_external) @@ -167,7 +176,7 @@ def main ( if now.hour == 15: if got_kiriban_at < datetime.now ().date (): - kiriban_list = nico.get_kiriban_list () + kiriban_list = nico.get_kiriban_list (datetime.now ().date ()) got_kiriban_at = datetime.now ().date () kiriban_interval = ((get_kiriban_dt_to_update () - datetime.now ()) / len (kiriban_list)) diff --git a/nico.py b/nico.py index f0bf887..5009a18 100644 --- a/nico.py +++ b/nico.py @@ -2,19 +2,32 @@ ニコニコのニジカ動画取得モヂュール """ +import os +from datetime import date, timedelta from typing import TypedDict, cast import requests from bs4 import BeautifulSoup from requests.exceptions import Timeout +from eloquent import DatabaseManager, Model -from db.models import Video +from db.models import Tag, Video, VideoHistory, VideoTag -KIRIBAN_VIEWS_COUNTS = { *range (100, 1_000, 100), - *range (1_000, 10_000, 1_000), - *range (10_000, 1_000_001, 10_000), - 194, 245, 510, 114_514, 1_940, 2_450, 5_100, 24_500, - 51_000, 2_424 } +CONFIG: dict[str, DbConfig] = { 'mysql': { 'driver': 'mysql', + 'host': 'localhost', + 'database': 'nizika_nico', + 'user': os.environ['MYSQL_USER'], + 'password': os.environ['MYSQL_PASS'], + 'prefix': '' } } + +DB = DatabaseManager (CONFIG) +Model.set_connection_resolver (DB) + +KIRIBAN_VIEWS_COUNTS: set[int] = { *range (100, 1_000, 100), + *range (1_000, 10_000, 1_000), + *range (10_000, 1_000_001, 10_000), + 194, 245, 510, 114_514, 1_940, 2_450, 5_100, 24_500, + 51_000, 2_424 } class VideoInfo (TypedDict): @@ -46,25 +59,7 @@ def get_latest_deerjika ( except Exception: return None - bs = get_bs_from_url ('https://www.nicovideo.jp/watch/' - + video_info['contentId']) - if bs is None: - return None - - try: - title = bs.find ('title') - if title is None: - return None - video_info['title'] = '-'.join (title.text.split ('-')[:(-1)])[:(-1)] - - tags: str = bs.find ('meta', attrs = { 'name': 'keywords' }).get ('content') # type: ignore - video_info['tags'] = tags.split (',') - - video_info['description'] = bs.find ('meta', attrs = { 'name': 'description' }).get ('content') # type: ignore - except Exception: - return None - - return cast (VideoInfo, video_info) + return get_video_info (video_info['contentId']) def get_bs_from_url ( @@ -100,8 +95,62 @@ def get_bs_from_url ( return BeautifulSoup (req.text, 'html.parser') +def get_video_info ( + video_code: str, +) -> VideoInfo | None: + video_info: dict[str, str | list[str]] = { 'contentId': video_code } + + bs = get_bs_from_url (f"https://www.nicovideo.jp/watch/{ video_code }") + if bs is None: + return None + + try: + title = bs.find ('title') + if title is None: + return None + video_info['title'] = '-'.join (title.text.split ('-')[:(-1)])[:(-1)] + + tags: str = bs.find ('meta', attrs = { 'name': 'keywords' }).get ('content') # type: ignore + video_info['tags'] = tags.split (',') + + video_info['description'] = bs.find ('meta', attrs = { 'name': 'description' }).get ('content') # type: ignore + except Exception: + return None + + return cast (VideoInfo, video_info) + + def get_kiriban_list ( + base_date: date, ) -> list[tuple[int, VideoInfo]]: kiriban_list: list[tuple[int, VideoInfo]] = [] - + latest_fetched_at = cast (date, VideoHistory.max ('fetched_at')) + previous_fetched_at = cast (date, (VideoHistory + .where ('fetched_at', '<', latest_fetched_at) + .max ('fetched_at'))) + + for kiriban_views_count in KIRIBAN_VIEWS_COUNTS: + targets = ({ vh.video.code for vh in (VideoHistory + .where ('fetched_at', latest_fetched_at) + .where ('views_count', '>=', kiriban_views_count) + .get ()) } + - { vh.video.code for vh in (VideoHistory + .where ('fetched_at', previous_fetched_at) + .where ('views_count', '>=', kiriban_views_count) + .get ()) }) + for code in targets: + video_info = get_video_info (code) + if video_info is not None: + kiriban_list.append ((kiriban_views_count, video_info)) + + return kiriban_list + + +class DbConfig (TypedDict): + driver: str + host: str + database: str + user: str + password: str + prefix: str diff --git a/nizika_nico b/nizika_nico index 67b76e6..b2f5f81 160000 --- a/nizika_nico +++ b/nizika_nico @@ -1 +1 @@ -Subproject commit 67b76e6dd4d9b9332ba6774656d0ffc8a94be997 +Subproject commit b2f5f81ca8615781d79d807fe92f7824653cea22