commit bfd693d6c44da12ad2eb2a2dcaa006f0f938d3c0 · zenfyr.dev/xpost

+6 -1

cross/attachments.py

···

       2
       2
        
       

     

       3
       3
        
       

     

       4
       4
        
       @dataclass

     

       5
       5
       -
       class Attachment():

     

       5
       5
       +
       class Attachment:

     

       6
       6
        
           pass

     

       7
       7
       +
       

     

       7
       8
        
       

     

       8
       9
        
       @dataclass

     

       9
       10
        
       class SpoilerAttachment(Attachment):

     

       10
       11
        
           spoiler: str

     

       12
       12
       +
       

     

       11
       13
        
       

     

       12
       14
        
       @dataclass

     

       13
       15
        
       class LanguagesAttachment(Attachment):

     

       14
       16
        
           langs: list[str]

     

       15
       17
        
       

     

       18
       18
       +
       

     

       16
       19
        
       @dataclass

     

       17
       20
        
       class SensitiveAttachment(Attachment):

     

       18
       21
        
           sensitive: bool

     

       22
       22
       +
       

     

       19
       23
        
       

     

       20
       24
        
       @dataclass

     

       21
       25
        
       class RemoteUrlAttachment(Attachment):

     

       22
       26
        
           url: str

     

       27
       27
       +
       

     

       23
       28
        
       

     

       24
       29
        
       @dataclass

     

       25
       30
        
       class QuoteAttachment(Attachment):

+4

cross/fragments.py

···

       1
       1
        
       from dataclasses import dataclass

     

       2
       2
        
       

     

       3
       3
       +
       

     

       3
       4
        
       @dataclass

     

       4
       5
        
       class Fragment:

     

       5
       6
        
           start: int

     

       6
       7
        
           end: int

     

       8
       8
       +
       

     

       7
       9
        
       

     

       8
       10
        
       @dataclass

     

       9
       11
        
       class LinkFragment(Fragment):

     

       10
       12
        
           url: str

     

       11
       13
        
       

     

       14
       14
       +
       

     

       12
       15
        
       @dataclass

     

       13
       16
        
       class TagFragment(Fragment):

     

       14
       17
        
           tag: str

     

       18
       18
       +
       

     

       15
       19
        
       

     

       16
       20
        
       @dataclass

     

       17
       21
        
       class MentionFragment(Fragment):

+6 -3

cross/post.py

···

       1
       1
        
       from dataclasses import dataclass, field

     

       2
       2
       +
       from typing import TypeVar

     

       3
       3
       +
       

     

       2
       4
        
       from cross.attachments import Attachment

     

       3
       5
        
       from cross.fragments import Fragment

     

       4
       4
       -
       from typing import TypeVar

     

       5
       6
        
       

     

       6
       6
       -
       T = TypeVar('T', bound=Attachment)

     

       7
       7
       +
       T = TypeVar("T", bound=Attachment)

     

       8
       8
       +
       

     

       7
       9
        
       

     

       8
       10
        
       class AttachmentKeeper:

     

       9
       11
        
           def __init__(self) -> None:

     
···

       20
       22
        
                   raise TypeError(f"Expected {cls.__name__}, got {type(instance).__name__}")

     

       21
       23
        
               return instance

     

       22
       24
        
       

     

       25
       25
       +
       

     

       23
       26
        
       @dataclass

     

       24
       27
        
       class Post:

     

       25
       28
        
           id: str

     

       26
       29
        
           parent_id: str | None

     

       27
       27
       -
           text: str # utf-8 text

     

       30
       30
       +
           text: str  # utf-8 text

     

       28
       31
        
           attachments: AttachmentKeeper

     

       29
       32
        
           fragments: list[Fragment] = field(default_factory=list)

+15 -5

cross/service.py

···

       1
       1
       -
       from pathlib import Path

     

       2
       1
        
       import sqlite3

     

       2
       2
       +
       from pathlib import Path

     

       3
       3
        
       from typing import Callable, cast

     

       4
       4
        
       

     

       5
       5
       +
       from cross.post import Post

     

       5
       6
        
       from database.connection import get_conn

     

       6
       7
        
       from util.util import LOGGER

     

       7
       8
        
       

     

       8
       8
       -
       from cross.post import Post

     

       9
       9
        
       

     

       10
       10
        
       class Service:

     

       11
       11
        
           def __init__(self, url: str, db: Path) -> None:

     
···

       33
       33
        
           def close(self):

     

       34
       34
        
               self.conn.close()

     

       35
       35
        
       

     

       36
       36
       +
       

     

       36
       37
        
       class OutputService(Service):

     

       37
       38
        
           def accept_post(self, post: Post):

     

       38
       39
        
               LOGGER.warning("NOT IMPLEMENTED (%s), accept_post %s", self.url, post.id)

     
···

       41
       42
        
               LOGGER.warning("NOT IMPLEMENTED (%s), delete_post %s", self.url, post_id)

     

       42
       43
        
       

     

       43
       44
        
           def accept_repost(self, repost_id: str, reposted_id: str):

     

       44
       44
       -
               LOGGER.warning("NOT IMPLEMENTED (%s), accept_repost %s of %s", self.url, repost_id, reposted_id)

     

       45
       45
       +
               LOGGER.warning(

     

       46
       46
       +
                   "NOT IMPLEMENTED (%s), accept_repost %s of %s",

     

       47
       47
       +
                   self.url,

     

       48
       48
       +
                   repost_id,

     

       49
       49
       +
                   reposted_id,

     

       50
       50
       +
               )

     

       45
       51
        
       

     

       46
       52
        
           def delete_repost(self, repost_id: str):

     

       47
       53
        
               LOGGER.warning("NOT IMPLEMENTED (%s), delete_repost %s", self.url, repost_id)

     

       48
       54
        
       

     

       49
       49
       -
       class InputService(Service):

     

       50
       55
        
       

     

       51
       51
       -
           async def listen(self, outputs: list[OutputService], submitter: Callable[[Callable[[], None]], None]):  # pyright: ignore[reportUnusedParameter]

     

       56
       56
       +
       class InputService(Service):

     

       57
       57
       +
           async def listen(

     

       58
       58
       +
               self,

     

       59
       59
       +
               outputs: list[OutputService],

     

       60
       60
       +
               submitter: Callable[[Callable[[], None]], None],

     

       61
       61
       +
           ):  # pyright: ignore[reportUnusedParameter]

     

       52
       62
        
               pass

+2 -1

database/connection.py

···

       1
       1
       +
       import sqlite3

     

       1
       2
        
       from pathlib import Path

     

       2
       2
       -
       import sqlite3

     

       3
       3
       +
       

     

       3
       4
        
       

     

       4
       5
        
       def get_conn(db: Path) -> sqlite3.Connection:

     

       5
       6
        
           conn = sqlite3.connect(db, autocommit=True, check_same_thread=False)

+1 -1

database/migrations.py

···

       1
       1
        
       import sqlite3

     

       2
       2
        
       from pathlib import Path

     

       3
       3
        
       

     

       4
       4
       -
       from util.util import LOGGER

     

       5
       4
        
       from database.connection import get_conn

     

       5
       5
       +
       from util.util import LOGGER

     

       6
       6
        
       

     

       7
       7
        
       

     

       8
       8
        
       class DatabaseMigrator:

+2 -2

env.py

···

       1
       1
        
       import os

     

       2
       2
        
       

     

       3
       3
       -
       DATA_DIR = os.environ.get('DATA_DIR') or "./data"

     

       4
       4
       -
       MIGRATIONS_DIR = os.environ.get('MIGRATIONS_DIR') or "./migrations"

     

       3
       3
       +
       DATA_DIR = os.environ.get("DATA_DIR") or "./data"

     

       4
       4
       +
       MIGRATIONS_DIR = os.environ.get("MIGRATIONS_DIR") or "./migrations"

+3 -2

main.py

···

       53
       53
        
           thread = threading.Thread(target=worker, args=(task_queue,), daemon=True)

     

       54
       54
        
           thread.start()

     

       55
       55
        
       

     

       56
       56
       -
           LOGGER.info("Connecting to %s...", 'TODO') # TODO

     

       56
       56
       +
           LOGGER.info("Connecting to %s...", "TODO")  # TODO

     

       57
       57
        
           try:

     

       58
       58
        
               task_queue.put(lambda: print("hi"))

     

       59
       59
       -
               sleep(10) # TODO

     

       59
       59
       +
               sleep(10)  # TODO

     

       60
       60
        
           except KeyboardInterrupt:

     

       61
       61
        
               LOGGER.info("Stopping...")

     

       62
       62
        
       

     

       63
       63
        
           task_queue.join()

     

       64
       64
        
           task_queue.put(None)

     

       65
       65
        
           thread.join()

     

       66
       66
       +
       

     

       66
       67
        
       

     

       67
       68
        
       if __name__ == "__main__":

     

       68
       69
        
           main()

+2 -1

misskey/info.py

···

       1
       1
        
       from abc import ABC, abstractmethod

     

       2
       2
       -
       from cross.service import Service

     

       3
       2
        
       

     

       4
       3
        
       import requests

     

       5
       4
        
       

     

       5
       5
       +
       from cross.service import Service

     

       6
       6
        
       from util.util import LOGGER

     

       7
       7
       +
       

     

       7
       8
        
       

     

       8
       9
        
       class MisskeyService(ABC, Service):

     

       9
       10
        
           def verify_credentials(self):

+3 -4

misskey/input.py

···

       1
       1
        
       import asyncio

     

       2
       2
       -
       from dataclasses import dataclass, field

     

       3
       2
        
       import json

     

       4
       4
       -
       from pathlib import Path

     

       5
       3
        
       import re

     

       6
       6
       -
       from typing import Any, Callable, override

     

       7
       4
        
       import uuid

     

       5
       5
       +
       from dataclasses import dataclass, field

     

       6
       6
       +
       from pathlib import Path

     

       7
       7
       +
       from typing import Any, Callable, override

     

       8
       8
        
       

     

       9
       9
        
       import websockets

     

       10
       10
        
       

     
···

       85
       85
        
                           async for msg in ws:

     

       86
       86
        
                               LOGGER.info(msg)  # TODO

     

       87
       87
        
       

     

       88
       88
       -
                       #keepalive = asyncio.create_task(self._send_keepalive(ws))

     

       89
       88
        
                       listen = asyncio.create_task(listen_for_messages())

     

       90
       89
        
       

     

       91
       90
        
                       _ = await asyncio.gather(listen)