comparing eda2549322ddcd09f89d4a406795521b5f3d2e98 and next on zenfyr.dev/xpost

+2 -1

.tangled/workflows/run-tests.yml

···

       7
       7
        
       dependencies:

     

       8
       8
        
         nixpkgs:

     

       9
       9
        
           - uv

     

       10
       10
       +
           - python312

     

       10
       11
        
       

     

       11
       12
        
       steps:

     

       12
       13
        
         - name: run tests

     

       13
       14
        
           command: |

     

       14
       14
       -
             uv run pytest -vv

     

       15
       15
       +
             uv run --python python3.12 pytest -vv

+8 -3

README.md

···

       1
       1
       -
       # XPost

     

       1
       1
       +
       # xpost next

     

       2
       2
       +
       

     

       3
       3
       +
       > [!NOTE]

     

       4
       4
       +
       > this is the dev branch for xpost next, a full rewrite of xpost. the older version is available on the master branch.

     

       5
       5
       +
       >

     

       6
       6
       +
       > planned work for this branch can be found and tracked here: https://tangled.org/@zenfyr.dev/xpost/issues/1

     

       2
       7
        
       

     

       3
       3
       -
       XPost is a social media cross-posting tool that differs from others by using streaming APIs to allow instant, zero-input cross-posting. this means you can continue posting on your preferred platform without using special apps.

     

       8
       8
       +
       xpost is a social media cross-posting tool that differs from others by using streaming APIs to allow instant, zero-input cross-posting. this means you can continue posting on your preferred platform without using special apps.

     

       4
       9
        
       

     

       5
       5
       -
       XPost tries to support as many features as possible. for example, when cross-posting from mastodon to bluesky, unsupported file types will be attached as links. posts with mixed media or too many files will be split and spread across text.

     

       10
       10
       +
       xpost tries to support as many features as possible. for example, when cross-posting from mastodon to bluesky, unsupported file types will be attached as links. posts with mixed media or too many files will be split and spread across text.

-87

bluesky/facets.py

···

       1
       1
       -
       from typing import Any, override

     

       2
       2
       -
       import cross.fragments as f

     

       3
       3
       -
       from util.splitter import FragmentSplitter, canonical_label

     

       4
       4
       -
       

     

       5
       5
       -
       LINK = 'app.bsky.richtext.facet#link'

     

       6
       6
       -
       TAG = 'app.bsky.richtext.facet#tag'

     

       7
       7
       -
       MENTION = "app.bsky.richtext.facet#mention"

     

       8
       8
       -
       

     

       9
       9
       -
       class BskySplitter(FragmentSplitter):

     

       10
       10
       -
           def __init__(self):

     

       11
       11
       -
               super().__init__(300, 30)

     

       12
       12
       -
       

     

       13
       13
       -
           @override

     

       14
       14
       -
           def normalize_link(self, label: str, url: str) -> str:

     

       15
       15
       -
               if canonical_label(label, url):

     

       16
       16
       -
                   nlabel = url.split("://", 1)[1]

     

       17
       17
       -
                   if len(nlabel) <= self.urllen:

     

       18
       18
       -
                       return nlabel

     

       19
       19
       -
                   return nlabel[: self.urllen - 1] + "…"

     

       20
       20
       -
               return label

     

       21
       21
       -
       

     

       22
       22
       -
       # TODO handle extending overlapping fragments somehow

     

       23
       23
       -
       def parse_facets(

     

       24
       24
       -
           text: str,

     

       25
       25
       -
           facets: list[dict[str, Any]] | None

     

       26
       26
       -
       ) -> tuple[str, list[f.Fragment]]:

     

       27
       27
       -
           if not facets:

     

       28
       28
       -
               return text, []

     

       29
       29
       -
       

     

       30
       30
       -
           btext = text.encode("utf-8")

     

       31
       31
       -
           nbytes = bytearray()

     

       32
       32
       -
           last_original_byte_index = 0

     

       33
       33
       -
           fragments: list[f.Fragment] = []

     

       34
       34
       -
       

     

       35
       35
       -
           for facet in facets:

     

       36
       36
       -
               original_start: int = facet['index']['byteStart']

     

       37
       37
       -
               original_end: int = facet['index']['byteEnd']

     

       38
       38
       -
       

     

       39
       39
       -
               if last_original_byte_index < original_start:

     

       40
       40
       -
                   nbytes.extend(btext[last_original_byte_index:original_start])

     

       41
       41
       -
       

     

       42
       42
       -
               fdict = {feat['$type']: feat for feat in facet.get('features', [])}

     

       43
       43
       -
       

     

       44
       44
       -
               original_label_bytes = btext[original_start:original_end]

     

       45
       45
       -
               original_label_str = original_label_bytes.decode("utf-8")

     

       46
       46
       -
       

     

       47
       47
       -
               nlabel_bytes = original_label_bytes

     

       48
       48
       -
       

     

       49
       49
       -
               if LINK in fdict:

     

       50
       50
       -
                   url: str = fdict.pop(LINK)['uri']

     

       51
       51
       -
                   label = original_label_str

     

       52
       52
       -
       

     

       53
       53
       -
                   split = url.split("://", 1)

     

       54
       54
       -
                   full_url = False

     

       55
       55
       -
                   if len(split) > 1:

     

       56
       56
       -
                       if split[1].startswith(label):

     

       57
       57
       -
                           full_url = True

     

       58
       58
       -
                       if label.endswith("...") and split[1].startswith(label[:-3]):

     

       59
       59
       -
                           full_url = True

     

       60
       60
       -
       

     

       61
       61
       -
                   if full_url:

     

       62
       62
       -
                       nlabel_bytes = url.encode("utf-8")

     

       63
       63
       -
       

     

       64
       64
       -
                   nstart = len(nbytes)

     

       65
       65
       -
                   nbytes.extend(nlabel_bytes)

     

       66
       66
       -
                   nend = len(nbytes)

     

       67
       67
       -
       

     

       68
       68
       -
                   fragments.append(f.LinkFragment(start=nstart, end=nend, url=url))

     

       69
       69
       -
               else:

     

       70
       70
       -
                   nstart = len(nbytes)

     

       71
       71
       -
                   nbytes.extend(nlabel_bytes)

     

       72
       72
       -
                   nend = len(nbytes)

     

       73
       73
       -
       

     

       74
       74
       -
               if TAG in fdict:

     

       75
       75
       -
                   tag: str = fdict.pop(TAG)['tag']

     

       76
       76
       -
                   fragments.append(f.TagFragment(start=nstart, end=nend, tag=tag))

     

       77
       77
       -
       

     

       78
       78
       -
               if MENTION in fdict:

     

       79
       79
       -
                   did: str = fdict.pop(MENTION)['did']

     

       80
       80
       -
                   fragments.append(f.MentionFragment(start=nstart, end=nend, uri=did))

     

       81
       81
       -
       

     

       82
       82
       -
               last_original_byte_index = original_end

     

       83
       83
       -
       

     

       84
       84
       -
           if last_original_byte_index < len(btext):

     

       85
       85
       -
               nbytes.extend(btext[last_original_byte_index:])

     

       86
       86
       -
       

     

       87
       87
       -
           return nbytes.decode("utf-8"), fragments

+3 -4

bluesky/input.py

···

       8
       8
        
       import websockets

     

       9
       9
        
       

     

       10
       10
        
       from atproto.util import AtUri

     

       11
       11
       -
       from bluesky.facets import parse_facets

     

       11
       11
       +
       from bluesky.tokens import tokenize_post

     

       12
       12
        
       from bluesky.info import SERVICE, BlueskyService, validate_and_transform

     

       13
       13
        
       from cross.attachments import (

     

       14
       14
        
           LabelsAttachment,

     
···

       76
       76
        
                       )

     

       77
       77
        
                       return

     

       78
       78
        
       

     

       79
       79
       -
               text, fragments = parse_facets(record["text"], record.get('facets'))

     

       80
       80
       -
               post = Post(id=post_uri, parent_id=parent_uri, text=text)

     

       81
       81
       -
               post.fragments.extend(fragments)

     

       79
       79
       +
               tokens = tokenize_post(record["text"], record.get('facets', {}))

     

       80
       80
       +
               post = Post(id=post_uri, parent_id=parent_uri, tokens=tokens)

     

       82
       81
        
       

     

       83
       82
        
               did, _, rid = AtUri.record_uri(post_uri)

     

       84
       83
        
               post.attachments.put(

+95

bluesky/tokens.py

···

       1
       1
       +
       from cross.tokens import LinkToken, MentionToken, TagToken, TextToken, Token

     

       2
       2
       +
       

     

       3
       3
       +
       

     

       4
       4
       +
       def tokenize_post(text: str, facets: list[dict]) -> list[Token]:

     

       5
       5
       +
           def decode(ut8: bytes) -> str:

     

       6
       6
       +
               return ut8.decode(encoding="utf-8")

     

       7
       7
       +
       

     

       8
       8
       +
           if not text:

     

       9
       9
       +
               return []

     

       10
       10
       +
           ut8_text = text.encode(encoding="utf-8")

     

       11
       11
       +
           if not facets:

     

       12
       12
       +
               return [TextToken(text=decode(ut8_text))]

     

       13
       13
       +
       

     

       14
       14
       +
           slices: list[tuple[int, int, str, str]] = []

     

       15
       15
       +
       

     

       16
       16
       +
           for facet in facets:

     

       17
       17
       +
               features: list[dict] = facet.get("features", [])

     

       18
       18
       +
               if not features:

     

       19
       19
       +
                   continue

     

       20
       20
       +
       

     

       21
       21
       +
               # we don't support overlapping facets/features

     

       22
       22
       +
               feature = features[0]

     

       23
       23
       +
               feature_type = feature["$type"]

     

       24
       24
       +
               index = facet["index"]

     

       25
       25
       +
               match feature_type:

     

       26
       26
       +
                   case "app.bsky.richtext.facet#tag":

     

       27
       27
       +
                       slices.append(

     

       28
       28
       +
                           (index["byteStart"], index["byteEnd"], "tag", feature["tag"])

     

       29
       29
       +
                       )

     

       30
       30
       +
                   case "app.bsky.richtext.facet#link":

     

       31
       31
       +
                       slices.append(

     

       32
       32
       +
                           (index["byteStart"], index["byteEnd"], "link", feature["uri"])

     

       33
       33
       +
                       )

     

       34
       34
       +
                   case "app.bsky.richtext.facet#mention":

     

       35
       35
       +
                       slices.append(

     

       36
       36
       +
                           (index["byteStart"], index["byteEnd"], "mention", feature["did"])

     

       37
       37
       +
                       )

     

       38
       38
       +
       

     

       39
       39
       +
           if not slices:

     

       40
       40
       +
               return [TextToken(text=decode(ut8_text))]

     

       41
       41
       +
       

     

       42
       42
       +
           slices.sort(key=lambda s: s[0])

     

       43
       43
       +
           unique: list[tuple[int, int, str, str]] = []

     

       44
       44
       +
           current_end = 0

     

       45
       45
       +
           for start, end, ttype, val in slices:

     

       46
       46
       +
               if start >= current_end:

     

       47
       47
       +
                   unique.append((start, end, ttype, val))

     

       48
       48
       +
                   current_end = end

     

       49
       49
       +
       

     

       50
       50
       +
           if not unique:

     

       51
       51
       +
               return [TextToken(text=decode(ut8_text))]

     

       52
       52
       +
       

     

       53
       53
       +
           tokens: list[Token] = []

     

       54
       54
       +
           prev = 0

     

       55
       55
       +
       

     

       56
       56
       +
           for start, end, ttype, val in unique:

     

       57
       57
       +
               if start > prev:

     

       58
       58
       +
                   # text between facets

     

       59
       59
       +
                   tokens.append(TextToken(text=decode(ut8_text[prev:start])))

     

       60
       60
       +
               # facet token

     

       61
       61
       +
               match ttype:

     

       62
       62
       +
                   case "link":

     

       63
       63
       +
                       label = decode(ut8_text[start:end])

     

       64
       64
       +
       

     

       65
       65
       +
                       # try to unflatten links

     

       66
       66
       +
                       split = val.split("://", 1)

     

       67
       67
       +
                       if len(split) > 1:

     

       68
       68
       +
                           if split[1].startswith(label):

     

       69
       69
       +
                               tokens.append(LinkToken(href=val))

     

       70
       70
       +
                               prev = end

     

       71
       71
       +
                               continue

     

       72
       72
       +
       

     

       73
       73
       +
                           if label.endswith("...") and split[1].startswith(label[:-3]):

     

       74
       74
       +
                               tokens.append(LinkToken(href=val))

     

       75
       75
       +
                               prev = end

     

       76
       76
       +
                               continue

     

       77
       77
       +
       

     

       78
       78
       +
                       tokens.append(LinkToken(href=val, label=label))

     

       79
       79
       +
                   case "tag":

     

       80
       80
       +
                       tag = decode(ut8_text[start:end])

     

       81
       81
       +
                       tokens.append(TagToken(tag=tag[1:] if tag.startswith("#") else tag))

     

       82
       82
       +
                   case "mention":

     

       83
       83
       +
                       mention = decode(ut8_text[start:end])

     

       84
       84
       +
                       tokens.append(

     

       85
       85
       +
                           MentionToken(

     

       86
       86
       +
                               username=mention[1:] if mention.startswith("@") else mention,

     

       87
       87
       +
                               uri=val,

     

       88
       88
       +
                           )

     

       89
       89
       +
                       )

     

       90
       90
       +
               prev = end

     

       91
       91
       +
       

     

       92
       92
       +
           if prev < len(ut8_text):

     

       93
       93
       +
               tokens.append(TextToken(text=decode(ut8_text[prev:])))

     

       94
       94
       +
       

     

       95
       95
       +
           return tokens

-25

cross/fragments.py

···

       1
       1
       -
       from dataclasses import dataclass

     

       2
       2
       -
       

     

       3
       3
       -
       

     

       4
       4
       -
       @dataclass(kw_only=True)

     

       5
       5
       -
       class Fragment:

     

       6
       6
       -
           start: int

     

       7
       7
       -
           end: int

     

       8
       8
       -
       

     

       9
       9
       -
       

     

       10
       10
       -
       @dataclass(kw_only=True)

     

       11
       11
       -
       class LinkFragment(Fragment):

     

       12
       12
       -
           url: str

     

       13
       13
       -
       

     

       14
       14
       -
       

     

       15
       15
       -
       @dataclass(kw_only=True)

     

       16
       16
       -
       class TagFragment(Fragment):

     

       17
       17
       -
           tag: str

     

       18
       18
       -
       

     

       19
       19
       -
       

     

       20
       20
       -
       @dataclass(kw_only=True)

     

       21
       21
       -
       class MentionFragment(Fragment):

     

       22
       22
       -
           uri: str

     

       23
       23
       -
       

     

       24
       24
       -
       

     

       25
       25
       -
       NON_OVERLAPPING: set[type[Fragment]] = {LinkFragment, TagFragment, MentionFragment}

+3 -3

cross/post.py

···

       2
       2
        
       from typing import TypeVar

     

       3
       3
        
       

     

       4
       4
        
       from cross.attachments import Attachment

     

       5
       5
       -
       from cross.fragments import Fragment

     

       5
       5
       +
       from cross.tokens import Token

     

       6
       6
        
       

     

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

     

       8
       8
        
       

     
···

       30
       30
        
       class Post:

     

       31
       31
        
           id: str

     

       32
       32
        
           parent_id: str | None

     

       33
       33
       -
           text: str  # utf-8 text

     

       33
       33
       +
           tokens: list[Token]

     

       34
       34
       +
           text_type: str = "text/plain"

     

       34
       35
        
           attachments: AttachmentKeeper = field(default_factory=AttachmentKeeper)

     

       35
       35
       -
           fragments: list[Fragment] = field(default_factory=list)

+57 -5

cross/service.py

···

       1
       1
       +
       import logging

     

       1
       2
        
       import sqlite3

     

       2
       3
        
       from abc import ABC, abstractmethod

     

       3
       4
        
       from typing import Any, Callable, cast

     

       4
       4
       -
       import logging

     

       5
       5
        
       

     

       6
       6
        
       from cross.post import Post

     

       7
       7
        
       from database.connection import DatabasePool

     
···

       44
       44
        
               _ = cursor.execute("SELECT * FROM posts WHERE id = ?", (id,))

     

       45
       45
        
               return cast(sqlite3.Row, cursor.fetchone())

     

       46
       46
        
       

     

       47
       47
       +
           def _get_mappings(

     

       48
       48
       +
               self, original: int, service: str, user: str

     

       49
       49
       +
           ) -> list[sqlite3.Row]:

     

       50
       50
       +
               cursor = self.db.get_conn().cursor()

     

       51
       51
       +
               _ = cursor.execute(

     

       52
       52
       +
                   """

     

       53
       53
       +
                   SELECT *

     

       54
       54
       +
                   FROM posts AS p

     

       55
       55
       +
                   JOIN mappings AS m

     

       56
       56
       +
                     ON p.id = m.mapped

     

       57
       57
       +
                   WHERE m.original = ?

     

       58
       58
       +
                     AND p.service = ?

     

       59
       59
       +
                     AND p.user = ?

     

       60
       60
       +
                   ORDER BY p.id;

     

       61
       61
       +
                   """,

     

       62
       62
       +
                   (original, service, user),

     

       63
       63
       +
               )

     

       64
       64
       +
               return cursor.fetchall()

     

       65
       65
       +
       

     

       66
       66
       +
           def _find_mapped_thread(

     

       67
       67
       +
               self, parent: str, iservice: str, iuser: str, oservice: str, ouser: str

     

       68
       68
       +
           ):

     

       69
       69
       +
               reply_data = self._get_post(iservice, iuser, parent)

     

       70
       70
       +
               if not reply_data:

     

       71
       71
       +
                   return None

     

       72
       72
       +
       

     

       73
       73
       +
               reply_mappings: list[sqlite3.Row] | None = self._get_mappings(

     

       74
       74
       +
                   reply_data["id"], oservice, ouser

     

       75
       75
       +
               )

     

       76
       76
       +
               if not reply_mappings:

     

       77
       77
       +
                   return None

     

       78
       78
       +
       

     

       79
       79
       +
               reply_identifier: sqlite3.Row = reply_mappings[-1]

     

       80
       80
       +
               root_identifier: sqlite3.Row = reply_mappings[0]

     

       81
       81
       +
       

     

       82
       82
       +
               if reply_data["root_id"]:

     

       83
       83
       +
                   root_data = self._get_post_by_id(reply_data["root_id"])

     

       84
       84
       +
                   if not root_data:

     

       85
       85
       +
                       return None

     

       86
       86
       +
       

     

       87
       87
       +
                   root_mappings = self._get_mappings(reply_data["root_id"], oservice, ouser)

     

       88
       88
       +
                   if not root_mappings:

     

       89
       89
       +
                       return None

     

       90
       90
       +
                   root_identifier = root_mappings[0]

     

       91
       91
       +
       

     

       92
       92
       +
               return (

     

       93
       93
       +
                   root_identifier[0],  # real ids

     

       94
       94
       +
                   reply_identifier[0],

     

       95
       95
       +
                   reply_data["root_id"],  # db ids

     

       96
       96
       +
                   reply_data["id"],

     

       97
       97
       +
               )

     

       98
       98
       +
       

     

       47
       99
        
           def _insert_post(self, post_data: dict[str, Any]):

     

       48
       100
        
               values = [post_data.get(col) for col in columns]

     

       49
       101
        
               cursor = self.db.get_conn().cursor()

     
···

       80
       132
        
       

     

       81
       133
        
       

     

       82
       134
        
       class OutputService(Service):

     

       83
       83
       -
           def accept_post(self, post: Post):

     

       135
       135
       +
           def accept_post(self, service: str, user: str, post: Post):

     

       84
       136
        
               self.log.warning("NOT IMPLEMENTED (%s), accept_post %s", self.url, post.id)

     

       85
       137
        
       

     

       86
       86
       -
           def delete_post(self, post_id: str):

     

       138
       138
       +
           def delete_post(self, service: str, user: str, post_id: str):

     

       87
       139
        
               self.log.warning("NOT IMPLEMENTED (%s), delete_post %s", self.url, post_id)

     

       88
       140
        
       

     

       89
       89
       -
           def accept_repost(self, repost_id: str, reposted_id: str):

     

       141
       141
       +
           def accept_repost(self, service: str, user: str, repost_id: str, reposted_id: str):

     

       90
       142
        
               self.log.warning(

     

       91
       143
        
                   "NOT IMPLEMENTED (%s), accept_repost %s of %s",

     

       92
       144
        
                   self.url,

     
···

       94
       146
        
                   reposted_id,

     

       95
       147
        
               )

     

       96
       148
        
       

     

       97
       97
       -
           def delete_repost(self, repost_id: str):

     

       149
       149
       +
           def delete_repost(self, service: str, user: str, repost_id: str):

     

       98
       150
        
               self.log.warning("NOT IMPLEMENTED (%s), delete_repost %s", self.url, repost_id)

     

       99
       151
        
       

     

       100
       152

+23

cross/tokens.py

···

       1
       1
       +
       from dataclasses import dataclass

     

       2
       2
       +
       

     

       3
       3
       +
       @dataclass(kw_only=True)

     

       4
       4
       +
       class Token:

     

       5
       5
       +
           pass

     

       6
       6
       +
       

     

       7
       7
       +
       @dataclass(kw_only=True)

     

       8
       8
       +
       class TextToken(Token):

     

       9
       9
       +
           text: str

     

       10
       10
       +
       

     

       11
       11
       +
       @dataclass(kw_only=True)

     

       12
       12
       +
       class LinkToken(Token):

     

       13
       13
       +
           href: str

     

       14
       14
       +
           label: str | None = None

     

       15
       15
       +
       

     

       16
       16
       +
       @dataclass(kw_only=True)

     

       17
       17
       +
       class TagToken(Token):

     

       18
       18
       +
           tag: str

     

       19
       19
       +
       

     

       20
       20
       +
       @dataclass(kw_only=True)

     

       21
       21
       +
       class MentionToken(Token):

     

       22
       22
       +
           username: str

     

       23
       23
       +
           uri: str | None = None

+31 -6

mastodon/info.py

···

       7
       7
        
       from cross.service import Service

     

       8
       8
        
       from util.util import normalize_service_url

     

       9
       9
        
       

     

       10
       10
       +
       

     

       10
       11
        
       def validate_and_transform(data: dict[str, Any]):

     

       11
       11
       -
           if 'token' not in data or 'instance' not in data:

     

       12
       12
       +
           if "token" not in data or "instance" not in data:

     

       12
       13
        
               raise KeyError("Missing required values 'token' or 'instance'")

     

       13
       14
        
       

     

       14
       15
        
           data["instance"] = normalize_service_url(data["instance"])

     

       16
       16
       +
       

     

       15
       17
        
       

     

       16
       18
        
       @dataclass(kw_only=True)

     

       17
       19
        
       class InstanceInfo:

     
···

       22
       24
        
           image_size_limit: int = 16777216

     

       23
       25
        
           video_size_limit: int = 103809024

     

       24
       26
        
       

     

       27
       27
       +
           text_format: str = "text/plain"

     

       28
       28
       +
       

     

       25
       29
        
           @classmethod

     

       26
       30
        
           def from_api(cls, data: dict[str, Any]) -> "InstanceInfo":

     

       27
       31
        
               config: dict[str, Any] = {}

     
···

       39
       43
        
                           "characters_reserved_per_url"

     

       40
       44
        
                       ]

     

       41
       45
        
       

     

       46
       46
       +
                   # glitch content type

     

       47
       47
       +
                   if "supported_mime_types" in statuses_config:

     

       48
       48
       +
                       text_mimes: list[str] = statuses_config["supported_mime_types"]

     

       49
       49
       +
       

     

       50
       50
       +
                       if "text/x.misskeymarkdown" in text_mimes:

     

       51
       51
       +
                           config["text_format"] = "text/x.misskeymarkdown"

     

       52
       52
       +
                       elif "text/markdown" in text_mimes:

     

       53
       53
       +
                           config["text_format"] = "text/markdown"

     

       54
       54
       +
       

     

       42
       55
        
               if "media_attachments" in data:

     

       43
       43
       -
                   media_config: dict[str, Any] = data.get("media_attachments", {})

     

       56
       56
       +
                   media_config: dict[str, Any] = data["media_attachments"]

     

       44
       57
        
                   if "image_size_limit" in media_config:

     

       45
       58
        
                       config["image_size_limit"] = media_config["image_size_limit"]

     

       46
       59
        
                   if "video_size_limit" in media_config:

     
···

       53
       66
        
                   config["image_size_limit"] = data["upload_limit"]

     

       54
       67
        
                   config["video_size_limit"] = data["upload_limit"]

     

       55
       68
        
       

     

       69
       69
       +
               if "pleroma" in data:

     

       70
       70
       +
                   pleroma: dict[str, Any] = data["pleroma"]

     

       71
       71
       +
                   if "metadata" in pleroma:

     

       72
       72
       +
                       metadata: dict[str, Any] = pleroma["metadata"]

     

       73
       73
       +
                       if "post_formats" in metadata:

     

       74
       74
       +
                           post_formats: list[str] = metadata["post_formats"]

     

       75
       75
       +
       

     

       76
       76
       +
                           if "text/x.misskeymarkdown" in post_formats:

     

       77
       77
       +
                               config["text_format"] = "text/x.misskeymarkdown"

     

       78
       78
       +
                           elif "text/markdown" in post_formats:

     

       79
       79
       +
                               config["text_format"] = "text/markdown"

     

       80
       80
       +
       

     

       56
       81
        
               return InstanceInfo(**config)

     

       57
       82
        
       

     

       58
       83
        
       

     

       59
       84
        
       class MastodonService(ABC, Service):

     

       60
       85
        
           def verify_credentials(self):

     

       61
       86
        
               token = self._get_token()

     

       62
       62
       -
               responce = requests.get(

     

       87
       87
       +
               response = requests.get(

     

       63
       88
        
                   f"{self.url}/api/v1/accounts/verify_credentials",

     

       64
       89
        
                   headers={"Authorization": f"Bearer {token}"},

     

       65
       90
        
               )

     

       66
       66
       -
               if responce.status_code != 200:

     

       91
       91
       +
               if response.status_code != 200:

     

       67
       92
        
                   self.log.error("Failed to validate user credentials!")

     

       68
       68
       -
                   responce.raise_for_status()

     

       69
       69
       -
               return dict(responce.json())

     

       93
       93
       +
                   response.raise_for_status()

     

       94
       94
       +
               return dict(response.json())

     

       70
       95
        
       

     

       71
       96
        
           def fetch_instance_info(self):

     

       72
       97
        
               token = self._get_token()

+7 -8

mastodon/input.py

···

       54
       54
        
               self.options: MastodonInputOptions = options

     

       55
       55
        
       

     

       56
       56
        
               self.log.info("Verifying %s credentails...", self.url)

     

       57
       57
       -
               responce = self.verify_credentials()

     

       58
       58
       -
               self.user_id: str = responce["id"]

     

       57
       57
       +
               response = self.verify_credentials()

     

       58
       58
       +
               self.user_id: str = response["id"]

     

       59
       59
        
       

     

       60
       60
        
               self.log.info("Getting %s configuration...", self.url)

     

       61
       61
       -
               responce = self.fetch_instance_info()

     

       62
       62
       -
               self.streaming_url: str = responce["urls"]["streaming_api"]

     

       61
       61
       +
               response = self.fetch_instance_info()

     

       62
       62
       +
               self.streaming_url: str = response["urls"]["streaming_api"]

     

       63
       63
        
       

     

       64
       64
        
           @override

     

       65
       65
        
           def _get_token(self) -> str:

     
···

       109
       109
        
                           "Skipping %s, parent %s not found in db", status["id"], in_reply

     

       110
       110
        
                       )

     

       111
       111
        
                       return

     

       112
       112
       -
               parser = StatusParser()

     

       112
       112
       +
               parser = StatusParser(status)

     

       113
       113
        
               parser.feed(status["content"])

     

       114
       114
       -
               text, fragments = parser.get_result()

     

       114
       114
       +
               tokens = parser.get_result()

     

       115
       115
        
       

     

       116
       116
       -
               post = Post(id=status["id"], parent_id=in_reply, text=text)

     

       117
       117
       -
               post.fragments.extend(fragments)

     

       116
       116
       +
               post = Post(id=status["id"], parent_id=in_reply, tokens=tokens)

     

       118
       117
        
       

     

       119
       118
        
               if quote:

     

       120
       119
        
                   post.attachments.put(QuoteAttachment(quoted_id=quote['id'], quoted_user=self.user_id))

+138 -4

mastodon/output.py

···

       1
       1
        
       from dataclasses import dataclass

     

       2
       2
        
       from typing import Any, override

     

       3
       3
        
       

     

       4
       4
       +
       import requests

     

       5
       5
       +
       

     

       6
       6
       +
       from cross.attachments import (

     

       7
       7
       +
           LanguagesAttachment,

     

       8
       8
       +
           QuoteAttachment,

     

       9
       9
       +
           RemoteUrlAttachment,

     

       10
       10
       +
           SensitiveAttachment,

     

       11
       11
       +
       )

     

       12
       12
       +
       from cross.post import Post

     

       4
       13
        
       from cross.service import OutputService

     

       5
       14
        
       from database.connection import DatabasePool

     

       6
       15
        
       from mastodon.info import InstanceInfo, MastodonService, validate_and_transform

     
···

       32
       41
        
               self.options: MastodonOutputOptions = options

     

       33
       42
        
       

     

       34
       43
        
               self.log.info("Verifying %s credentails...", self.url)

     

       35
       35
       -
               responce = self.verify_credentials()

     

       36
       36
       -
               self.user_id: str = responce["id"]

     

       44
       44
       +
               response = self.verify_credentials()

     

       45
       45
       +
               self.user_id: str = response["id"]

     

       37
       46
        
       

     

       38
       47
        
               self.log.info("Getting %s configuration...", self.url)

     

       39
       39
       -
               responce = self.fetch_instance_info()

     

       40
       40
       -
               self.instance_info: InstanceInfo = InstanceInfo.from_api(responce)

     

       48
       48
       +
               response = self.fetch_instance_info()

     

       49
       49
       +
               self.instance_info: InstanceInfo = InstanceInfo.from_api(response)

     

       50
       50
       +
       

     

       51
       51
       +
           def accept_post(self, service: str, user: str, post: Post):

     

       52
       52
       +
               new_root_id: int | None = None

     

       53
       53
       +
               new_parent_id: int | None = None

     

       54
       54
       +
       

     

       55
       55
       +
               reply_ref: str | None = None

     

       56
       56
       +
               if post.parent_id:

     

       57
       57
       +
                   thread = self._find_mapped_thread(

     

       58
       58
       +
                       post.parent_id, service, user, self.url, self.user_id

     

       59
       59
       +
                   )

     

       60
       60
       +
       

     

       61
       61
       +
                   if not thread:

     

       62
       62
       +
                       self.log.error("Failed to find thread tuple in the database!")

     

       63
       63
       +
                       return

     

       64
       64
       +
                   _, reply_ref, new_root_id, new_parent_id = thread

     

       65
       65
       +
       

     

       66
       66
       +
               quote = post.attachments.get(QuoteAttachment)

     

       67
       67
       +
               if quote:

     

       68
       68
       +
                   if quote.quoted_user != user:

     

       69
       69
       +
                       self.log.info("Quoted other user, skipping!")

     

       70
       70
       +
                       return

     

       71
       71
       +
       

     

       72
       72
       +
                   quoted_post = self._get_post(service, user, quote.quoted_id)

     

       73
       73
       +
                   if not quoted_post:

     

       74
       74
       +
                       self.log.error("Failed to find quoted post in the database!")

     

       75
       75
       +
                       return

     

       76
       76
       +
       

     

       77
       77
       +
                   quoted_mappings = self._get_mappings(quoted_post["id"], self.url, self.user_id)

     

       78
       78
       +
                   if not quoted_mappings:

     

       79
       79
       +
                       self.log.error("Failed to find mappings for quoted post!")

     

       80
       80
       +
                       return

     

       81
       81
       +
       

     

       82
       82
       +
                   quoted_local_id = quoted_mappings[-1][0]

     

       83
       83
       +
                   # TODO resolve service identifier

     

       84
       84
       +
       

     

       85
       85
       +
               post_tokens = post.tokens.copy()

     

       86
       86
       +
       

     

       87
       87
       +
               remote_url = post.attachments.get(RemoteUrlAttachment)

     

       88
       88
       +
               if remote_url and remote_url.url and post.text_type == "text/x.misskeymarkdown":

     

       89
       89
       +
                   # TODO stip mfm

     

       90
       90
       +
                   pass

     

       91
       91
       +
       

     

       92
       92
       +
               raw_statuses = [] # TODO split tokens and media across posts

     

       93
       93
       +
               if not raw_statuses:

     

       94
       94
       +
                   self.log.error("Failed to split post into statuses!")

     

       95
       95
       +
                   return

     

       96
       96
       +
       

     

       97
       97
       +
               langs = post.attachments.get(LanguagesAttachment)

     

       98
       98
       +
               sensitive = post.attachments.get(SensitiveAttachment)

     

       99
       99
       +
       

     

       100
       100
       +
               if langs and langs.langs:

     

       101
       101
       +
                   pass # TODO

     

       102
       102
       +
       

     

       103
       103
       +
               if sensitive and sensitive.sensitive:

     

       104
       104
       +
                   pass # TODO

     

       105
       105
       +
       

     

       106
       106
       +
           def delete_post(self, service: str, user: str, post_id: str):

     

       107
       107
       +
               post = self._get_post(service, user, post_id)

     

       108
       108
       +
               if not post:

     

       109
       109
       +
                   self.log.info("Post not found in db, skipping delete..")

     

       110
       110
       +
                   return

     

       111
       111
       +
       

     

       112
       112
       +
               mappings = self._get_mappings(post["id"], self.url, self.user_id)

     

       113
       113
       +
               for mapping in mappings[::-1]:

     

       114
       114
       +
                   self.log.info("Deleting '%s'...", mapping["identifier"])

     

       115
       115
       +
                   requests.delete(

     

       116
       116
       +
                       f"{self.url}/api/v1/statuses/{mapping['identifier']}",

     

       117
       117
       +
                       headers={"Authorization": f"Bearer {self._get_token()}"},

     

       118
       118
       +
                   )

     

       119
       119
       +
                   self._delete_post_by_id(mapping["id"])

     

       120
       120
       +
       

     

       121
       121
       +
           def accept_repost(self, service: str, user: str, repost_id: str, reposted_id: str):

     

       122
       122
       +
               reposted = self._get_post(service, user, reposted_id)

     

       123
       123
       +
               if not reposted:

     

       124
       124
       +
                   self.log.info("Post not found in db, skipping repost..")

     

       125
       125
       +
                   return

     

       126
       126
       +
       

     

       127
       127
       +
               mappings = self._get_mappings(reposted["id"], self.url, self.user_id)

     

       128
       128
       +
               if mappings:

     

       129
       129
       +
                   rsp = requests.post(

     

       130
       130
       +
                       f"{self.url}/api/v1/statuses/{mappings[0]['identifier']}/reblog",

     

       131
       131
       +
                       headers={"Authorization": f"Bearer {self._get_token()}"},

     

       132
       132
       +
                   )

     

       133
       133
       +
       

     

       134
       134
       +
                   if rsp.status_code != 200:

     

       135
       135
       +
                       self.log.error(

     

       136
       136
       +
                           "Failed to boost status! status_code: %s, msg: %s",

     

       137
       137
       +
                           rsp.status_code,

     

       138
       138
       +
                           rsp.content,

     

       139
       139
       +
                       )

     

       140
       140
       +
                       return

     

       141
       141
       +
       

     

       142
       142
       +
                   self._insert_post(

     

       143
       143
       +
                       {

     

       144
       144
       +
                           "user": self.user_id,

     

       145
       145
       +
                           "service": self.url,

     

       146
       146
       +
                           "identifier": rsp.json()["id"],

     

       147
       147
       +
                           "reposted": mappings[0]["id"],

     

       148
       148
       +
                       }

     

       149
       149
       +
                   )

     

       150
       150
       +
                   inserted = self._get_post(self.url, self.user_id, rsp.json()["id"])

     

       151
       151
       +
                   if not inserted:

     

       152
       152
       +
                       raise ValueError("Inserted post not found!")

     

       153
       153
       +
                   self._insert_post_mapping(reposted["id"], inserted["id"])

     

       154
       154
       +
       

     

       155
       155
       +
           def delete_repost(self, service: str, user: str, repost_id: str):

     

       156
       156
       +
               repost = self._get_post(service, user, repost_id)

     

       157
       157
       +
               if not repost:

     

       158
       158
       +
                   self.log.info("Repost not found in db, skipping delete..")

     

       159
       159
       +
                   return

     

       160
       160
       +
       

     

       161
       161
       +
               mappings = self._get_mappings(repost["id"], self.url, self.user_id)

     

       162
       162
       +
               rmappings = self._get_mappings(repost["reposted"], self.url, self.user_id)

     

       163
       163
       +
       

     

       164
       164
       +
               if mappings and rmappings:

     

       165
       165
       +
                   self.log.info(

     

       166
       166
       +
                       "Removing '%s' Repost of '%s'...",

     

       167
       167
       +
                       mappings[0]["identifier"],

     

       168
       168
       +
                       rmappings[0]["identifier"],

     

       169
       169
       +
                   )

     

       170
       170
       +
                   requests.post(

     

       171
       171
       +
                       f"{self.url}/api/v1/statuses/{rmappings[0]['identifier']}/unreblog",

     

       172
       172
       +
                       headers={"Authorization": f"Bearer {self._get_token()}"},

     

       173
       173
       +
                   )

     

       174
       174
       +
                   self._delete_post_by_id(mappings[0]["id"])

     

       41
       175
        
       

     

       42
       176
        
           @override

     

       43
       177
        
           def _get_token(self) -> str:

+20 -25

mastodon/parser.py

···

       1
       1
       -
       from typing import override

     

       2
       2
       -
       import cross.fragments as f

     

       3
       3
       -
       from util.html import HTMLToFragmentsParser

     

       1
       1
       +
       from typing import Any, override

     

       4
       2
        
       

     

       3
       3
       +
       from cross.tokens import LinkToken, MentionToken, TagToken

     

       4
       4
       +
       from util.html import HTMLToTokensParser

     

       5
       5
        
       

     

       6
       6
       -
       class StatusParser(HTMLToFragmentsParser):

     

       7
       7
       -
           def __init__(self) -> None:

     

       6
       6
       +
       

     

       7
       7
       +
       class StatusParser(HTMLToTokensParser):

     

       8
       8
       +
           def __init__(self, status: dict[str, Any]) -> None:

     

       8
       9
        
               super().__init__()

     

       10
       10
       +
               self.tags: set[str] = set(tag["url"] for tag in status.get("tags", []))

     

       11
       11
       +
               self.mentions: set[str] = set(m["url"] for m in status.get("mentions", []))

     

       9
       12
        
       

     

       10
       13
        
           @override

     

       11
       14
        
           def handle_a_endtag(self):

     

       12
       12
       -
               current_end = len(self.text)

     

       13
       13
       -
               start, _attr = self._tag_stack.pop("a")

     

       15
       15
       +
               label, _attr = self._tag_stack.pop("a")

     

       14
       16
        
       

     

       15
       15
       -
               href = _attr.get('href')

     

       16
       16
       -
               if href and current_end > start:

     

       17
       17
       -
                   cls = _attr.get('class', '')

     

       17
       17
       +
               href = _attr.get("href")

     

       18
       18
       +
               if href:

     

       19
       19
       +
                   cls = _attr.get("class", "")

     

       18
       20
        
                   if cls:

     

       19
       19
       -
                       if 'hashtag' in cls:

     

       20
       20
       -
                           tag = self.text[start:current_end]

     

       21
       21
       -
                           tag = tag[1:] if tag.startswith('#') else tag

     

       21
       21
       +
                       if "hashtag" in cls and href in self.tags:

     

       22
       22
       +
                           tag = label[1:] if label.startswith("#") else label

     

       22
       23
        
       

     

       23
       23
       -
                           self.fragments.append(

     

       24
       24
       -
                               f.TagFragment(start=start, end=current_end, tag=tag)

     

       25
       25
       -
                           )

     

       24
       24
       +
                           self.tokens.append(TagToken(tag=tag))

     

       26
       25
        
                           return

     

       27
       27
       -
                       if 'mention' in cls: # TODO put the full acct in the fragment

     

       28
       28
       -
                           mention = self.text[start:current_end]

     

       29
       29
       -
                           mention = mention[1:] if mention.startswith('@') else mention

     

       30
       30
       -
                           self.fragments.append(

     

       31
       31
       -
                               f.MentionFragment(start=start, end=current_end, uri=mention)

     

       32
       32
       -
                           )

     

       26
       26
       +
                       if "mention" in cls and href in self.mentions:

     

       27
       27
       +
                           username = label[1:] if label.startswith("@") else label

     

       28
       28
       +
       

     

       29
       29
       +
                           self.tokens.append(MentionToken(username=username, uri=href))

     

       33
       30
        
                           return

     

       34
       34
       -
                   self.fragments.append(

     

       35
       35
       -
                       f.LinkFragment(start=start, end=current_end, url=href)

     

       36
       36
       -
                   )

     

       31
       31
       +
                   self.tokens.append(LinkToken(href=href, label=label))

+4 -4

misskey/info.py

···

       7
       7
        
       

     

       8
       8
        
       class MisskeyService(ABC, Service):

     

       9
       9
        
           def verify_credentials(self):

     

       10
       10
       -
               responce = requests.post(

     

       10
       10
       +
               response = requests.post(

     

       11
       11
        
                   f"{self.url}/api/i",

     

       12
       12
        
                   json={"i": self._get_token()},

     

       13
       13
        
                   headers={"Content-Type": "application/json"},

     

       14
       14
        
               )

     

       15
       15
       -
               if responce.status_code != 200:

     

       15
       15
       +
               if response.status_code != 200:

     

       16
       16
        
                   self.log.error("Failed to validate user credentials!")

     

       17
       17
       -
                   responce.raise_for_status()

     

       18
       18
       -
               return dict(responce.json())

     

       17
       17
       +
                   response.raise_for_status()

     

       18
       18
       +
               return dict(response.json())

     

       19
       19
        
       

     

       20
       20
        
           @abstractmethod

     

       21
       21
        
           def _get_token(self) -> str:

+11 -5

misskey/input.py

···

       55
       55
        
               self.options: MisskeyInputOptions = options

     

       56
       56
        
       

     

       57
       57
        
               self.log.info("Verifying %s credentails...", self.url)

     

       58
       58
       -
               responce = self.verify_credentials()

     

       59
       59
       -
               self.user_id: str = responce["id"]

     

       58
       58
       +
               response = self.verify_credentials()

     

       59
       59
       +
               self.user_id: str = response["id"]

     

       60
       60
        
       

     

       61
       61
        
           @override

     

       62
       62
        
           def _get_token(self) -> str:

     
···

       104
       104
        
                       )

     

       105
       105
        
                       return

     

       106
       106
        
       

     

       107
       107
       +
               mention_handles: dict = note.get("mentionHandles") or {}

     

       108
       108
       +
               tags: list[str] = note.get("tags") or []

     

       109
       109
       +
       

     

       110
       110
       +
               handles: list[tuple[str, str]] = []

     

       111
       111
       +
               for key, value in mention_handles.items():

     

       112
       112
       +
                   handles.append((value, value))

     

       113
       113
       +
       

     

       107
       114
        
               parser = MarkdownParser()  # TODO MFM parser

     

       108
       108
       -
               text, fragments = parser.parse(note.get("text", ""))

     

       109
       109
       -
               post = Post(id=note["id"], parent_id=reply["id"] if reply else None, text=text)

     

       110
       110
       -
               post.fragments.extend(fragments)

     

       115
       115
       +
               tokens = parser.parse(note.get("text", ""), tags, handles)

     

       116
       116
       +
               post = Post(id=note["id"], parent_id=reply["id"] if reply else None, tokens=tokens)

     

       111
       117
        
       

     

       112
       118
        
               post.attachments.put(RemoteUrlAttachment(url=self.url + "/notes/" + note["id"]))

     

       113
       119
        
               if renote:

-16

tests/util/html_test.py

···

       1
       1
       -
       import html

     

       2
       2
       -
       from util.html import HTMLToFragmentsParser

     

       3
       3
       -
       import cross.fragments as f

     

       4
       4
       -
       import pytest

     

       5
       5
       -
       

     

       6
       6
       -
       @pytest.fixture()

     

       7
       7
       -
       def parser():

     

       8
       8
       -
           return HTMLToFragmentsParser()

     

       9
       9
       -
       

     

       10
       10
       -
       def test_html(parser: HTMLToFragmentsParser):

     

       11
       11
       -
           input = "<p><del>excuse</del>  <em>me</em>, <strong>test</strong> post</p><blockquote><p>very testy <a href=\"https://google.com\" target=\"_blank\" rel=\"nofollow noopener\">post</a></p></blockquote><pre><code>cat &lt;&lt; food<br></code></pre>"

     

       12
       12
       -
           parser.feed(input)

     

       13
       13
       -
           text, fragments = parser.get_result()

     

       14
       14
       -
       

     

       15
       15
       -
           # TODO

     

       16
       16
       -
           #assert text == "~~excuse~~  *me*, **test** post\n\n> very testy post\n\n```\ncat << food\n```\n"

-161

tests/util/markdown_test.py

···

       1
       1
       -
       from util.markdown import MarkdownParser

     

       2
       2
       -
       import cross.fragments as f

     

       3
       3
       -
       import pytest

     

       4
       4
       -
       

     

       5
       5
       -
       EMOJI = "🤬🤬"

     

       6
       6
       -
       

     

       7
       7
       -
       

     

       8
       8
       -
       @pytest.fixture()

     

       9
       9
       -
       def parser():

     

       10
       10
       -
           return MarkdownParser()

     

       11
       11
       -
       

     

       12
       12
       -
       

     

       13
       13
       -
       def test_empty(parser: MarkdownParser):

     

       14
       14
       -
           text, frgs = parser.parse("")

     

       15
       15
       -
           assert text == ""

     

       16
       16
       -
           assert frgs == []

     

       17
       17
       -
       

     

       18
       18
       -
       

     

       19
       19
       -
       def test_no_formatting(parser: MarkdownParser):

     

       20
       20
       -
           text, frgs = parser.parse("text no formatting!")

     

       21
       21
       -
           assert text == "text no formatting!"

     

       22
       22
       -
           assert frgs == []

     

       23
       23
       -
       

     

       24
       24
       -
       

     

       25
       25
       -
       def test_link(parser: MarkdownParser):

     

       26
       26
       -
           text, frgs = parser.parse("https://google.com")

     

       27
       27
       -
           assert text == "https://google.com"

     

       28
       28
       -
           assert len(frgs) == 1

     

       29
       29
       -
       

     

       30
       30
       -
           frg = frgs[0]

     

       31
       31
       -
           assert isinstance(frg, f.LinkFragment)

     

       32
       32
       -
           assert frg.start == 0 and frg.end == 18

     

       33
       33
       -
           assert frg.url == "https://google.com"

     

       34
       34
       -
       

     

       35
       35
       -
       

     

       36
       36
       -
       def test_link_emojis(parser: MarkdownParser):

     

       37
       37
       -
           input = f"{EMOJI} https://google.com"

     

       38
       38
       -
           text, frgs = parser.parse(input)

     

       39
       39
       -
           assert text == input

     

       40
       40
       -
           assert len(frgs) == 1

     

       41
       41
       -
       

     

       42
       42
       -
           frg = frgs[0]

     

       43
       43
       -
           assert isinstance(frg, f.LinkFragment)

     

       44
       44
       -
           assert frg.start == 9 and frg.end == 27

     

       45
       45
       -
           assert frg.url == "https://google.com"

     

       46
       46
       -
       

     

       47
       47
       -
       

     

       48
       48
       -
       def test_label_link(parser: MarkdownParser):

     

       49
       49
       -
           text, frgs = parser.parse("[hello](https://google.com)")

     

       50
       50
       -
           assert text == "hello"

     

       51
       51
       -
           assert len(frgs) == 1

     

       52
       52
       -
       

     

       53
       53
       -
           frg = frgs[0]

     

       54
       54
       -
           assert isinstance(frg, f.LinkFragment)

     

       55
       55
       -
           assert frg.start == 0 and frg.end == 5

     

       56
       56
       -
           assert frg.url == "https://google.com"

     

       57
       57
       -
       

     

       58
       58
       -
       

     

       59
       59
       -
       def test_label_link_emojis(parser: MarkdownParser):

     

       60
       60
       -
           input = f"[{EMOJI}]( https://google.com)"

     

       61
       61
       -
           text, frgs = parser.parse(input)

     

       62
       62
       -
           assert text == EMOJI

     

       63
       63
       -
           assert len(frgs) == 1

     

       64
       64
       -
       

     

       65
       65
       -
           frg = frgs[0]

     

       66
       66
       -
           assert isinstance(frg, f.LinkFragment)

     

       67
       67
       -
           assert frg.start == 0 and frg.end == 8

     

       68
       68
       -
           assert frg.url == "https://google.com"

     

       69
       69
       -
       

     

       70
       70
       -
       

     

       71
       71
       -
       def test_tag(parser: MarkdownParser):

     

       72
       72
       -
           input = "#testing"

     

       73
       73
       -
           text, frgs = parser.parse(input)

     

       74
       74
       -
           assert text == input

     

       75
       75
       -
           assert len(frgs) == 1

     

       76
       76
       -
       

     

       77
       77
       -
           frg = frgs[0]

     

       78
       78
       -
           assert isinstance(frg, f.TagFragment)

     

       79
       79
       -
           assert frg.start == 0 and frg.end == 8

     

       80
       80
       -
           assert frg.tag == "testing"

     

       81
       81
       -
       

     

       82
       82
       -
       def test_tag_emojis(parser: MarkdownParser):

     

       83
       83
       -
           input = f"{EMOJI} #testing"

     

       84
       84
       -
           text, frgs = parser.parse(input)

     

       85
       85
       -
           assert text == input

     

       86
       86
       -
           assert len(frgs) == 1

     

       87
       87
       -
       

     

       88
       88
       -
           frg = frgs[0]

     

       89
       89
       -
           assert isinstance(frg, f.TagFragment)

     

       90
       90
       -
           assert frg.start == 9 and frg.end == 17

     

       91
       91
       -
           assert frg.tag == "testing"

     

       92
       92
       -
       

     

       93
       93
       -
       def test_mention(parser: MarkdownParser):

     

       94
       94
       -
           input = "@zen@merping.synth.download"

     

       95
       95
       -
           text, frgs = parser.parse(input)

     

       96
       96
       -
           assert text == input

     

       97
       97
       -
           assert len(frgs) == 1

     

       98
       98
       -
       

     

       99
       99
       -
           frg = frgs[0]

     

       100
       100
       -
           assert isinstance(frg, f.MentionFragment)

     

       101
       101
       -
           assert frg.start == 0 and frg.end == 27

     

       102
       102
       -
           assert frg.uri == "zen@merping.synth.download"

     

       103
       103
       -
       

     

       104
       104
       -
       def test_mention_emojis(parser: MarkdownParser):

     

       105
       105
       -
           input = f"{EMOJI} @zen@merping.synth.download"

     

       106
       106
       -
           text, frgs = parser.parse(input)

     

       107
       107
       -
           assert text == input

     

       108
       108
       -
           assert len(frgs) == 1

     

       109
       109
       -
       

     

       110
       110
       -
           frg = frgs[0]

     

       111
       111
       -
           assert isinstance(frg, f.MentionFragment)

     

       112
       112
       -
           assert frg.start == 9 and frg.end == 36

     

       113
       113
       -
           assert frg.uri == "zen@merping.synth.download"

     

       114
       114
       -
       

     

       115
       115
       -
       def test_mixed(parser: MarkdownParser):

     

       116
       116
       -
           input = "#testing_tag @zen@merping.synth.download [hello](https://zenfyr.dev/) hii! https://example.com"

     

       117
       117
       -
           text, frgs = parser.parse(input)

     

       118
       118
       -
       

     

       119
       119
       -
           expected_text = "#testing_tag @zen@merping.synth.download hello hii! https://example.com"

     

       120
       120
       -
           assert text == expected_text

     

       121
       121
       -
           assert len(frgs) == 4

     

       122
       122
       -
       

     

       123
       123
       -
           assert isinstance(frgs[0], f.TagFragment)

     

       124
       124
       -
           assert frgs[0].start == 0 and frgs[0].end == 12

     

       125
       125
       -
           assert frgs[0].tag == "testing_tag"

     

       126
       126
       -
       

     

       127
       127
       -
           assert isinstance(frgs[1], f.MentionFragment)

     

       128
       128
       -
           assert frgs[1].start == 13 and frgs[1].end == 40

     

       129
       129
       -
           assert frgs[1].uri == "zen@merping.synth.download"

     

       130
       130
       -
       

     

       131
       131
       -
           assert isinstance(frgs[2], f.LinkFragment)

     

       132
       132
       -
           assert frgs[2].start == 41 and frgs[2].end == 46

     

       133
       133
       -
           assert frgs[2].url == "https://zenfyr.dev/"

     

       134
       134
       -
       

     

       135
       135
       -
           assert isinstance(frgs[3], f.LinkFragment)

     

       136
       136
       -
           assert frgs[3].start == 52 and frgs[3].end == 71

     

       137
       137
       -
           assert frgs[3].url == "https://example.com"

     

       138
       138
       -
       

     

       139
       139
       -
       def test_mixed_html(parser: MarkdownParser):

     

       140
       140
       -
           input = f"<p>#testing_tag @zen@merping.synth.download</p> {EMOJI} <a href=\"https://zenfyr.dev/\"><b>hello</b></a> hii! https://example.com"

     

       141
       141
       -
           text, frgs = parser.parse(input)

     

       142
       142
       -
       

     

       143
       143
       -
           expected_text = f"#testing_tag @zen@merping.synth.download\n\n {EMOJI} **hello** hii! https://example.com"

     

       144
       144
       -
           assert text == expected_text

     

       145
       145
       -
           assert len(frgs) == 4

     

       146
       146
       -
       

     

       147
       147
       -
           assert isinstance(frgs[0], f.TagFragment)

     

       148
       148
       -
           assert frgs[0].start == 0 and frgs[0].end == 12

     

       149
       149
       -
           assert frgs[0].tag == "testing_tag"

     

       150
       150
       -
       

     

       151
       151
       -
           assert isinstance(frgs[1], f.MentionFragment)

     

       152
       152
       -
           assert frgs[1].start == 13 and frgs[1].end == 40

     

       153
       153
       -
           assert frgs[1].uri == "zen@merping.synth.download"

     

       154
       154
       -
       

     

       155
       155
       -
           assert isinstance(frgs[2], f.LinkFragment)

     

       156
       156
       -
           assert frgs[2].start == 52 and frgs[2].end == 61

     

       157
       157
       -
           assert frgs[2].url == "https://zenfyr.dev/"

     

       158
       158
       -
       

     

       159
       159
       -
           assert isinstance(frgs[3], f.LinkFragment)

     

       160
       160
       -
           assert frgs[3].start == 67 and frgs[3].end == 86

     

       161
       161
       -
           assert frgs[3].url == "https://example.com"

+88 -46

util/html.py

···

       1
       1
        
       from html.parser import HTMLParser

     

       2
       2
        
       from typing import override

     

       3
       3
       -
       import cross.fragments as f

     

       3
       3
       +
       

     

       4
       4
       +
       from cross.tokens import LinkToken, TextToken, Token

     

       5
       5
       +
       from util.splitter import canonical_label

     

       6
       6
       +
       

     

       4
       7
        
       

     

       5
       5
       -
       class HTMLToFragmentsParser(HTMLParser):

     

       8
       8
       +
       class HTMLToTokensParser(HTMLParser):

     

       6
       9
        
           def __init__(self) -> None:

     

       7
       10
        
               super().__init__()

     

       8
       8
       -
               self.builder: bytearray = bytearray()

     

       9
       9
       -
               self.fragments: list[f.Fragment] = []

     

       11
       11
       +
               self.tokens: list[Token] = []

     

       10
       12
        
       

     

       11
       11
       -
               self._tag_stack: dict[str, tuple[int, dict[str, str | None]]] = {}

     

       13
       13
       +
               self._tag_stack: dict[str, tuple[str, dict[str, str | None]]] = {}

     

       12
       14
        
               self.in_pre: bool = False

     

       13
       15
        
               self.in_code: bool = False

     

       14
       16
        
               self.invisible: bool = False

     

       15
       17
        
       

     

       16
       18
        
           def handle_a_endtag(self):

     

       17
       17
       -
               current_end = len(self.builder)

     

       18
       18
       -
               start, _attr = self._tag_stack.pop("a")

     

       19
       19
       +
               label, _attr = self._tag_stack.pop("a")

     

       19
       20
        
       

     

       20
       20
       -
               href = _attr.get('href')

     

       21
       21
       -
               if href and current_end > start:

     

       22
       22
       -
                   self.fragments.append(

     

       23
       23
       -
                       f.LinkFragment(start=start, end=current_end, url=href)

     

       24
       24
       -
                   )

     

       21
       21
       +
               href = _attr.get("href")

     

       22
       22
       +
               if href:

     

       23
       23
       +
                   if canonical_label(label, href):

     

       24
       24
       +
                       self.tokens.append(LinkToken(href=href))

     

       25
       25
       +
                   else:

     

       26
       26
       +
                       self.tokens.append(LinkToken(href=href, label=label))

     

       27
       27
       +
       

     

       28
       28
       +
           def append_text(self, text: str):

     

       29
       29
       +
               self.tokens.append(TextToken(text=text))

     

       30
       30
       +
       

     

       31
       31
       +
           def append_newline(self):

     

       32
       32
       +
               if self.tokens:

     

       33
       33
       +
                   last_token = self.tokens[-1]

     

       34
       34
       +
                   if isinstance(last_token, TextToken) and not last_token.text.endswith("\n"):

     

       35
       35
       +
                       self.tokens.append(TextToken(text="\n"))

     

       25
       36
        
       

     

       26
       37
        
           @override

     

       27
       38
        
           def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]) -> None:

     

       28
       39
        
               _attr = dict(attrs)

     

       29
       29
       -
       

     

       30
       30
       -
               def append_newline():

     

       31
       31
       -
                   if self.builder and not self.builder.endswith(b"\n"):

     

       32
       32
       -
                       self.builder.extend(b"\n")

     

       33
       40
        
       

     

       34
       41
        
               if self.invisible:

     

       35
       42
        
                   return

     

       36
       43
        
       

     

       37
       44
        
               match tag:

     

       38
       45
        
                   case "p":

     

       39
       39
       -
                       cls = _attr.get('class', '')

     

       40
       40
       -
                       if cls and 'quote-inline' in cls:

     

       46
       46
       +
                       cls = _attr.get("class", "")

     

       47
       47
       +
                       if cls and "quote-inline" in cls:

     

       41
       48
        
                           self.invisible = True

     

       42
       49
        
                   case "a":

     

       43
       43
       -
                       self._tag_stack["a"] = (len(self.builder), _attr)

     

       50
       50
       +
                       self._tag_stack["a"] = ("", _attr)

     

       44
       51
        
                   case "code":

     

       45
       52
        
                       if not self.in_pre:

     

       46
       46
       -
                           self.builder.extend(b"`")

     

       53
       53
       +
                           self.append_text("`")

     

       47
       54
        
                           self.in_code = True

     

       48
       55
        
                   case "pre":

     

       49
       49
       -
                       append_newline()

     

       50
       50
       -
                       self.builder.extend(b"```\n")

     

       56
       56
       +
                       self.append_newline()

     

       57
       57
       +
                       self.append_text("```\n")

     

       51
       58
        
                       self.in_pre = True

     

       52
       59
        
                   case "blockquote":

     

       53
       53
       -
                       append_newline()

     

       54
       54
       -
                       self.builder.extend(b"> ")

     

       60
       60
       +
                       self.append_newline()

     

       61
       61
       +
                       self.append_text("> ")

     

       55
       62
        
                   case "strong" | "b":

     

       56
       56
       -
                       self.builder.extend(b"**")

     

       63
       63
       +
                       self.append_text("**")

     

       57
       64
        
                   case "em" | "i":

     

       58
       58
       -
                       self.builder.extend(b"*")

     

       65
       65
       +
                       self.append_text("*")

     

       59
       66
        
                   case "del" | "s":

     

       60
       60
       -
                       self.builder.extend(b"~~")

     

       67
       67
       +
                       self.append_text("~~")

     

       61
       68
        
                   case "br":

     

       62
       62
       -
                       self.builder.extend(b"\n")

     

       69
       69
       +
                       self.append_text("\n")

     

       70
       70
       +
                   case "h1" | "h2" | "h3" | "h4" | "h5" | "h6":

     

       71
       71
       +
                       level = int(tag[1])

     

       72
       72
       +
                       self.append_text("\n" + "#" * level + " ")

     

       63
       73
        
                   case _:

     

       64
       64
       -
                       if tag in {"h1", "h2", "h3", "h4", "h5", "h6"}:

     

       65
       65
       -
                           level = int(tag[1])

     

       66
       66
       -
                           self.builder.extend(("\n" + "#" * level + " ").encode('utf-8'))

     

       74
       74
       +
                       # self.builder.extend(f"<{tag}>".encode("utf-8"))

     

       75
       75
       +
                       pass

     

       67
       76
        
       

     

       68
       77
        
           @override

     

       69
       78
        
           def handle_endtag(self, tag: str) -> None:

     
···

       78
       87
        
                           self.handle_a_endtag()

     

       79
       88
        
                   case "code":

     

       80
       89
        
                       if not self.in_pre and self.in_code:

     

       81
       81
       -
                           self.builder.extend(b"`")

     

       90
       90
       +
                           self.append_text("`")

     

       82
       91
        
                           self.in_code = False

     

       83
       92
        
                   case "pre":

     

       84
       84
       -
                       self.builder.extend(b"\n```\n")

     

       93
       93
       +
                       self.append_newline()

     

       94
       94
       +
                       self.append_text("```\n")

     

       85
       95
        
                       self.in_pre = False

     

       86
       96
        
                   case "blockquote":

     

       87
       87
       -
                       self.builder.extend(b"\n")

     

       97
       97
       +
                       self.append_text("\n")

     

       88
       98
        
                   case "strong" | "b":

     

       89
       89
       -
                       self.builder.extend(b"**")

     

       99
       99
       +
                       self.append_text("**")

     

       90
       100
        
                   case "em" | "i":

     

       91
       91
       -
                       self.builder.extend(b"*")

     

       101
       101
       +
                       self.append_text("*")

     

       92
       102
        
                   case "del" | "s":

     

       93
       93
       -
                       self.builder.extend(b"~~")

     

       103
       103
       +
                       self.append_text("~~")

     

       94
       104
        
                   case "p":

     

       95
       95
       -
                       self.builder.extend(b"\n\n")

     

       105
       105
       +
                       self.append_text("\n\n")

     

       106
       106
       +
                   case "h1" | "h2" | "h3" | "h4" | "h5" | "h6":

     

       107
       107
       +
                       self.append_text("\n")

     

       96
       108
        
                   case _:

     

       97
       97
       -
                       if tag in ["h1", "h2", "h3", "h4", "h5", "h6"]:

     

       98
       98
       -
                           self.builder.extend(b'\n')

     

       109
       109
       +
                       # self.builder.extend(f"</{tag}>".encode("utf-8"))

     

       110
       110
       +
                       pass

     

       99
       111
        
       

     

       100
       112
        
           @override

     

       101
       113
        
           def handle_data(self, data: str) -> None:

     

       102
       102
       -
               if not self.invisible:

     

       103
       103
       -
                   self.builder.extend(data.encode('utf-8'))

     

       114
       114
       +
               if self.invisible:

     

       115
       115
       +
                   return

     

       116
       116
       +
       

     

       117
       117
       +
               if self._tag_stack.get('a'):

     

       118
       118
       +
                   label, _attr = self._tag_stack.pop("a")

     

       119
       119
       +
                   self._tag_stack["a"] = (label + data, _attr)

     

       120
       120
       +
                   return

     

       121
       121
       +
       

     

       122
       122
       +
           def get_result(self) -> list[Token]:

     

       123
       123
       +
               if not self.tokens:

     

       124
       124
       +
                   return []

     

       125
       125
       +
       

     

       126
       126
       +
               combined: list[Token] = []

     

       127
       127
       +
               buffer: list[str] = []

     

       128
       128
       +
       

     

       129
       129
       +
               def flush_buffer():

     

       130
       130
       +
                   if buffer:

     

       131
       131
       +
                       merged = "".join(buffer)

     

       132
       132
       +
                       combined.append(TextToken(text=merged))

     

       133
       133
       +
                       buffer.clear()

     

       134
       134
       +
       

     

       135
       135
       +
               for token in self.tokens:

     

       136
       136
       +
                   if isinstance(token, TextToken):

     

       137
       137
       +
                       buffer.append(token.text)

     

       138
       138
       +
                   else:

     

       139
       139
       +
                       flush_buffer()

     

       140
       140
       +
                       combined.append(token)

     

       104
       141
        
       

     

       105
       105
       -
           def get_result(self) -> tuple[str, list[f.Fragment]]:

     

       106
       106
       -
               if self.builder.endswith(b'\n\n'):

     

       107
       107
       -
                   return self.builder[:-2].decode('utf-8'), self.fragments

     

       108
       108
       -
               return self.builder.decode('utf-8'), self.fragments

     

       142
       142
       +
               flush_buffer()

     

       143
       143
       +
       

     

       144
       144
       +
               if combined and isinstance(combined[-1], TextToken):

     

       145
       145
       +
                   if combined[-1].text.endswith("\n\n"):

     

       146
       146
       +
                       combined[-1] = TextToken(text=combined[-1].text[:-2])

     

       147
       147
       +
       

     

       148
       148
       +
                   if combined[-1].text.endswith("\n"):

     

       149
       149
       +
                       combined[-1] = TextToken(text=combined[-1].text[:-1])

     

       150
       150
       +
               return combined

+92 -122

util/markdown.py

···

       1
       1
       -
       from dataclasses import replace

     

       2
       1
        
       import re

     

       3
       3
       -
       import cross.fragments as f

     

       4
       4
       -
       from util.html import HTMLToFragmentsParser

     

       5
       2
        
       

     

       6
       6
       -
       URL = re.compile(rb"(?:(?:[A-Za-z][A-Za-z0-9+.-]*://)|mailto:)[^\s]+", re.IGNORECASE)

     

       3
       3
       +
       from cross.tokens import LinkToken, MentionToken, TagToken, TextToken, Token

     

       4
       4
       +
       from util.html import HTMLToTokensParser

     

       5
       5
       +
       from util.splitter import canonical_label

     

       6
       6
       +
       

     

       7
       7
       +
       URL = re.compile(r"(?:(?:[A-Za-z][A-Za-z0-9+.-]*://)|mailto:)[^\s]+", re.IGNORECASE)

     

       7
       8
        
       MD_INLINE_LINK = re.compile(

     

       8
       8
       -
           rb"\[([^\]]+)\]\(\s*((?:(?:[A-Za-z][A-Za-z0-9+.\-]*://)|mailto:)[^\s\)]+)\s*\)",

     

       9
       9
       +
           r"\[([^\]]+)\]\(\s*((?:(?:[A-Za-z][A-Za-z0-9+.\-]*://)|mailto:)[^\s\)]+)\s*\)",

     

       9
       10
        
           re.IGNORECASE,

     

       10
       11
        
       )

     

       11
       12
        
       MD_AUTOLINK = re.compile(

     

       12
       12
       -
           rb"<((?:(?:[A-Za-z][A-Za-z0-9+.\-]*://)|mailto:)[^\s>]+)>", re.IGNORECASE

     

       13
       13
       +
           r"<((?:(?:[A-Za-z][A-Za-z0-9+.\-]*://)|mailto:)[^\s>]+)>", re.IGNORECASE

     

       13
       14
        
       )

     

       14
       14
       -
       HASHTAG = re.compile(rb"(?<!\w)\#([\w]+)")

     

       15
       15
       -
       FEDIVERSE_HANDLE = re.compile(rb"(?<![\w@])@([\w\.-]+)(?:@([\w\.-]+\.[\w\.-]+))?")

     

       15
       15
       +
       HASHTAG = re.compile(r"(?<!\w)\#([\w]+)")

     

       16
       16
       +
       FEDIVERSE_HANDLE = re.compile(r"(?<![\w@])@([\w\.-]+)(?:@([\w\.-]+\.[\w\.-]+))?")

     

       16
       17
        
       

     

       17
       18
        
       REGEXES = [URL, MD_INLINE_LINK, MD_AUTOLINK, HASHTAG, FEDIVERSE_HANDLE]

     

       18
       19
        
       

     

       19
       20
        
       

     

       20
       21
        
       # TODO autolinks are broken by the html parser

     

       21
       22
        
       class MarkdownParser:

     

       22
       22
       -
           def parse(self, text: str) -> tuple[str, list[f.Fragment]]:

     

       23
       23
       +
           def parse(

     

       24
       24
       +
               self, text: str, tags: list[str], handles: list[tuple[str, str]]

     

       25
       25
       +
           ) -> list[Token]:

     

       23
       26
        
               if not text:

     

       24
       24
       -
                   return "", []

     

       25
       25
       -
       

     

       26
       26
       -
               html_parser = HTMLToFragmentsParser()

     

       27
       27
       -
               html_parser.feed(text)

     

       28
       28
       -
               markdown, fragments = html_parser.get_result()

     

       29
       29
       -
       

     

       30
       30
       -
               markdown_bytes: bytes = markdown.encode("utf-8")

     

       27
       27
       +
                   return []

     

       31
       28
        
       

     

       32
       32
       -
               index: int = 0

     

       33
       33
       -
               total: int = len(markdown_bytes)

     

       29
       29
       +
               tokenizer = HTMLToTokensParser()

     

       30
       30
       +
               tokenizer.feed(text)

     

       31
       31
       +
               html_tokens = tokenizer.get_result()

     

       34
       32
        
       

     

       35
       35
       -
               events: list[tuple[int, int, re.Match[bytes] | f.Fragment, str]] = []

     

       36
       36
       -
               events.extend([(fg.start, fg.end, fg, "html") for fg in fragments])

     

       33
       33
       +
               tokens: list[Token] = []

     

       37
       34
        
       

     

       38
       38
       -
               while index < total:

     

       39
       39
       -
                   ch: int = markdown_bytes[index]

     

       40
       40
       -
                   rmatch: re.Match[bytes] | None = None

     

       41
       41
       -
                   kind = None

     

       42
       42
       -
       

     

       43
       43
       -
                   if ch == b"["[0]:

     

       44
       44
       -
                       rmatch = MD_INLINE_LINK.match(markdown_bytes, index)

     

       45
       45
       -
                       kind = "inline_link"

     

       46
       46
       -
                   # elif ch == b"<"[0]:

     

       47
       47
       -
                   #     rmatch = MD_AUTOLINK.match(markdown_bytes, index)

     

       48
       48
       -
                   #     kind = "autolink"

     

       49
       49
       -
                   elif ch == b"#"[0]:

     

       50
       50
       -
                       rmatch = HASHTAG.match(markdown_bytes, index)

     

       51
       51
       -
                       kind = "hashtag"

     

       52
       52
       -
                   elif ch == b"@"[0]:

     

       53
       53
       -
                       rmatch = FEDIVERSE_HANDLE.match(markdown_bytes, index)

     

       54
       54
       -
                       kind = "mention"

     

       55
       55
       -
                   else:

     

       56
       56
       -
                       rmatch = URL.match(markdown_bytes, index)

     

       57
       57
       -
                       kind = "url"

     

       58
       58
       -
       

     

       59
       59
       -
                   if rmatch:

     

       60
       60
       -
                       start, end = rmatch.start(), rmatch.end()

     

       61
       61
       -
                       if end == index:

     

       62
       62
       -
                           index += 1

     

       35
       35
       +
               for tk in html_tokens:

     

       36
       36
       +
                   if isinstance(tk, TextToken):

     

       37
       37
       +
                       tokens.extend(self.__tokenize_md(tk.text, tags, handles))

     

       38
       38
       +
                   elif isinstance(tk, LinkToken):

     

       39
       39
       +
                       if not tk.label or canonical_label(tk.label, tk.href):

     

       40
       40
       +
                           tokens.append(tk)

     

       63
       41
        
                           continue

     

       64
       64
       -
                       events.append((start, end, rmatch, kind))

     

       65
       65
       -
                       index = end

     

       66
       66
       -
                       continue

     

       67
       42
        
       

     

       68
       68
       -
                   index += 1

     

       69
       69
       -
       

     

       70
       70
       -
               events.sort(key=lambda x: x[0])

     

       71
       71
       -
       

     

       72
       72
       -
               last_end: int = 0

     

       73
       73
       -
               for start, end, _, _ in events:

     

       74
       74
       -
                   if start > end:

     

       75
       75
       -
                       raise Exception(f"Invalid fragment position start={start}, end={end}")

     

       76
       76
       -
                   if last_end > start:

     

       77
       77
       -
                       raise Exception(

     

       78
       78
       -
                           f"Overlapping text fragments at position end={last_end}, start={start}"

     

       43
       43
       +
                       tokens.extend(

     

       44
       44
       +
                           self.__tokenize_md(f"[{tk.label}]({tk.href})", tags, handles)

     

       79
       45
        
                       )

     

       80
       80
       -
                   last_end = end

     

       81
       81
       -
       

     

       82
       82
       -
               ntext: bytearray = bytearray()

     

       83
       83
       -
               nfragments: list[f.Fragment] = []

     

       84
       84
       -
       

     

       85
       85
       -
               offset: int = 0

     

       86
       86
       -
               last_index: int = 0

     

       87
       87
       -
       

     

       88
       88
       -
               for start, end, rmatch, event in events:

     

       89
       89
       -
                   ntext.extend(markdown_bytes[last_index:start])

     

       46
       46
       +
                   else:

     

       47
       47
       +
                       tokens.append(tk)

     

       90
       48
        
       

     

       91
       91
       -
                   if isinstance(rmatch, f.Fragment):

     

       92
       92
       -
                       ntext.extend(markdown_bytes[start:end])

     

       93
       93
       -
                       nfg = replace(rmatch, start=start + offset, end=end + offset)

     

       94
       94
       -
                       nfragments.append(nfg)

     

       95
       95
       -
                       last_index = end

     

       96
       96
       -
                       continue

     

       49
       49
       +
               return tokens

     

       97
       50
        
       

     

       98
       98
       -
                   nstart = start + offset

     

       99
       99
       -
                   match event:

     

       100
       100
       -
                       case "inline_link":

     

       101
       101
       -
                           label_bytes: bytes = rmatch.group(1)

     

       102
       102
       -
                           href_bytes: bytes = rmatch.group(2)

     

       51
       51
       +
           def __tokenize_md(

     

       52
       52
       +
               self, text: str, tags: list[str], handles: list[tuple[str, str]]

     

       53
       53
       +
           ) -> list[Token]:

     

       54
       54
       +
               index: int = 0

     

       55
       55
       +
               total: int = len(text)

     

       56
       56
       +
               buffer: list[str] = []

     

       103
       57
        
       

     

       104
       104
       -
                           ntext.extend(label_bytes)

     

       58
       58
       +
               tokens: list[Token] = []

     

       105
       59
        
       

     

       106
       106
       -
                           delta = len(label_bytes) - (end - start)

     

       107
       107
       -
                           offset += delta

     

       60
       60
       +
               def flush():

     

       61
       61
       +
                   nonlocal buffer

     

       62
       62
       +
                   if buffer:

     

       63
       63
       +
                       tokens.append(TextToken(text="".join(buffer)))

     

       64
       64
       +
                       buffer = []

     

       108
       65
        
       

     

       109
       109
       -
                           nend = nstart + len(label_bytes)

     

       110
       110
       -
                           nfragments.append(

     

       111
       111
       -
                               f.LinkFragment(

     

       112
       112
       -
                                   start=nstart, end=nend, url=href_bytes.decode("utf-8")

     

       113
       113
       -
                               )

     

       114
       114
       -
                           )

     

       66
       66
       +
               while index < total:

     

       67
       67
       +
                   if text[index] == "[":

     

       68
       68
       +
                       md_inline = MD_INLINE_LINK.match(text, index)

     

       69
       69
       +
                       if md_inline:

     

       70
       70
       +
                           flush()

     

       71
       71
       +
                           label = md_inline.group(1)

     

       72
       72
       +
                           href = md_inline.group(2)

     

       73
       73
       +
                           tokens.append(LinkToken(href=href, label=label))

     

       74
       74
       +
                           index = md_inline.end()

     

       75
       75
       +
                           continue

     

       115
       76
        
       

     

       116
       116
       -
                       case "hashtag":

     

       117
       117
       -
                           tag_bytes: bytes = rmatch.group(1)

     

       118
       118
       -
                           ntext.extend(markdown_bytes[start:end])

     

       119
       119
       -
                           nend = end + offset

     

       120
       120
       -
                           nfragments.append(

     

       121
       121
       -
                               f.TagFragment(

     

       122
       122
       -
                                   start=nstart, end=nend, tag=tag_bytes.decode("utf-8")

     

       123
       123
       -
                               )

     

       124
       124
       -
                           )

     

       77
       77
       +
                   if text[index] == "<":

     

       78
       78
       +
                       md_auto = MD_AUTOLINK.match(text, index)

     

       79
       79
       +
                       if md_auto:

     

       80
       80
       +
                           flush()

     

       81
       81
       +
                           href = md_auto.group(1)

     

       82
       82
       +
                           tokens.append(LinkToken(href=href, label=None))

     

       83
       83
       +
                           index = md_auto.end()

     

       84
       84
       +
                           continue

     

       125
       85
        
       

     

       126
       126
       -
                       case "mention":

     

       127
       127
       -
                           mention_bytes: bytes = rmatch.group(0)

     

       128
       128
       -
                           ntext.extend(markdown_bytes[start:end])

     

       86
       86
       +
                   if text[index] == "#":

     

       87
       87
       +
                       tag = HASHTAG.match(text, index)

     

       88
       88
       +
                       if tag:

     

       89
       89
       +
                           tag_text = tag.group(1)

     

       90
       90
       +
                           if tag_text.lower() in tags:

     

       91
       91
       +
                               flush()

     

       92
       92
       +
                               tokens.append(TagToken(tag=tag_text))

     

       93
       93
       +
                               index = tag.end()

     

       94
       94
       +
                               continue

     

       129
       95
        
       

     

       130
       130
       -
                           mention_str = mention_bytes.decode("utf-8")

     

       131
       131
       -
                           mention_str = (

     

       132
       132
       -
                               mention_str[1:] if mention_str.startswith("@") else mention_str

     

       133
       133
       -
                           )

     

       96
       96
       +
                   if text[index] == "@":

     

       97
       97
       +
                       handle = FEDIVERSE_HANDLE.match(text, index)

     

       98
       98
       +
                       if handle:

     

       99
       99
       +
                           handle_text = handle.group(0)

     

       100
       100
       +
                           stripped_handle = handle_text.strip()

     

       134
       101
        
       

     

       135
       135
       -
                           nend = end + offset

     

       136
       136
       -
                           nfragments.append(

     

       137
       137
       -
                               f.MentionFragment(start=nstart, end=nend, uri=mention_str)

     

       102
       102
       +
                           match = next(

     

       103
       103
       +
                               (pair for pair in handles if stripped_handle in pair), None

     

       138
       104
        
                           )

     

       139
       105
        
       

     

       140
       140
       -
                       case "url":

     

       141
       141
       -
                           url_bytes: bytes = rmatch.group(0)

     

       142
       142
       -
                           ntext.extend(markdown_bytes[start:end])

     

       143
       143
       -
                           nend = end + offset

     

       144
       144
       -
                           nfragments.append(

     

       145
       145
       -
                               f.LinkFragment(

     

       146
       146
       -
                                   start=nstart, end=nend, url=url_bytes.decode("utf-8")

     

       147
       147
       -
                               )

     

       148
       148
       -
                           )

     

       106
       106
       +
                           if match:

     

       107
       107
       +
                               flush()

     

       108
       108
       +
                               tokens.append(

     

       109
       109
       +
                                   MentionToken(username=match[1], uri=None)

     

       110
       110
       +
                               )  # TODO: misskey doesn’t provide a uri

     

       111
       111
       +
                               index = handle.end()

     

       112
       112
       +
                               continue

     

       149
       113
        
       

     

       150
       150
       -
                       case _:

     

       151
       151
       -
                           pass

     

       152
       152
       -
                   last_index = end

     

       114
       114
       +
                   url = URL.match(text, index)

     

       115
       115
       +
                   if url:

     

       116
       116
       +
                       flush()

     

       117
       117
       +
                       href = url.group(0)

     

       118
       118
       +
                       tokens.append(LinkToken(href=href, label=None))

     

       119
       119
       +
                       index = url.end()

     

       120
       120
       +
                       continue

     

       153
       121
        
       

     

       154
       154
       -
               ntext.extend(markdown_bytes[last_index:])

     

       122
       122
       +
                   buffer.append(text[index])

     

       123
       123
       +
                   index += 1

     

       155
       124
        
       

     

       156
       156
       -
               return ntext.decode("utf-8"), nfragments

     

       125
       125
       +
               flush()

     

       126
       126
       +
               return tokens

+89 -45

util/splitter.py

···

       1
       1
       +
       import re

     

       2
       2
       +
       from dataclasses import replace

     

       3
       3
       +
       

     

       1
       4
        
       import grapheme

     

       2
       2
       -
       from cross.fragments import Fragment, LinkFragment

     

       3
       3
       -
       from dataclasses import replace

     

       5
       5
       +
       

     

       6
       6
       +
       from cross.tokens import LinkToken, TagToken, TextToken, Token

     

       4
       7
        
       

     

       5
       8
        
       

     

       6
       9
        
       def canonical_label(label: str | None, href: str):

     
···

       15
       18
        
           return False

     

       16
       19
        
       

     

       17
       20
        
       

     

       18
       18
       -
       class FragmentSplitter:

     

       19
       19
       -
           def __init__(self, climit: int, urllen: int):

     

       20
       20
       -
               self.climit: int = climit

     

       21
       21
       -
               self.urllen: int = urllen

     

       21
       21
       +
       ALTERNATE = re.compile(r"\S+|\s+")

     

       22
       22
        
       

     

       23
       23
       -
           def normalize_link(self, label: str, url: str) -> str:

     

       24
       24
       -
               return label

     

       25
       23
        
       

     

       26
       26
       -
           def tally_lenght(self, post: tuple[str, list[Fragment]]):

     

       27
       27
       -
               return grapheme.length(post[0])

     

       24
       24
       +
       def split_tokens(

     

       25
       25
       +
           tokens: list[Token],

     

       26
       26
       +
           max_chars: int,

     

       27
       27
       +
           max_link_len: int = 35,

     

       28
       28
       +
       ) -> list[list[Token]]:

     

       29
       29
       +
           def new_block() -> None:

     

       30
       30
       +
               nonlocal blocks, block, length

     

       31
       31
       +
               if block:

     

       32
       32
       +
                   blocks.append(block)

     

       33
       33
       +
               block, length = [], 0

     

       28
       34
        
       

     

       29
       29
       -
           def url_normalize(

     

       30
       30
       -
                   self, text: str, fragments: list[Fragment]

     

       31
       31
       -
               ) -> tuple[str, list[Fragment]]:

     

       32
       32
       -
                   if self.urllen == -1:

     

       33
       33
       -
                       return text, fragments

     

       34
       34
       -
                   btext = text.encode('utf-8')

     

       35
       35
       +
           def append_text(text: str) -> None:

     

       36
       36
       +
               nonlocal block

     

       37
       37
       +
               if block and isinstance(block[-1], TextToken):

     

       38
       38
       +
                   block[-1] = replace(block[-1], text=block[-1].text + text)

     

       39
       39
       +
               else:

     

       40
       40
       +
                   block.append(TextToken(text=text))

     

       35
       41
        
       

     

       36
       36
       -
                   nbytes = bytearray()

     

       37
       37
       -
                   nfragments: list[Fragment] = []

     

       42
       42
       +
           blocks: list[list[Token]] = []

     

       43
       43
       +
           block: list[Token] = []

     

       44
       44
       +
           length: int = 0

     

       38
       45
        
       

     

       39
       39
       -
                   fragments = [fg for fg in fragments]

     

       40
       40
       -
                   fragments.sort(key=lambda x: x.start)

     

       46
       46
       +
           for tk in tokens:

     

       47
       47
       +
               if isinstance(tk, TagToken):

     

       48
       48
       +
                   tag_len = 1 + grapheme.length(tk.tag)

     

       49
       49
       +
                   if length + tag_len > max_chars:

     

       50
       50
       +
                       new_block()

     

       51
       51
       +
                   block.append(tk)

     

       52
       52
       +
                   length += tag_len

     

       53
       53
       +
                   continue

     

       54
       54
       +
               if isinstance(tk, LinkToken):

     

       55
       55
       +
                   label_text = tk.label or ""

     

       56
       56
       +
                   link_len = grapheme.length(label_text)

     

       41
       57
        
       

     

       42
       42
       -
                   last_index = 0

     

       58
       58
       +
                   if canonical_label(tk.label, tk.href):

     

       59
       59
       +
                       link_len = min(link_len, max_link_len)

     

       43
       60
        
       

     

       44
       44
       -
                   for fg in fragments:

     

       45
       45
       -
                       if last_index < fg.start:

     

       46
       46
       -
                           nbytes.extend(btext[last_index:fg.start])

     

       61
       61
       +
                   if length + link_len <= max_chars:

     

       62
       62
       +
                       block.append(tk)

     

       63
       63
       +
                       length += link_len

     

       64
       64
       +
                       continue

     

       47
       65
        
       

     

       48
       48
       -
                       label_bytes = btext[fg.start:fg.end]

     

       49
       49
       -
                       label = label_bytes.decode('utf-8')

     

       66
       66
       +
                   if length:

     

       67
       67
       +
                       new_block()

     

       50
       68
        
       

     

       51
       51
       -
                       nlabel = label

     

       52
       52
       -
                       if isinstance(fg, LinkFragment):

     

       53
       53
       -
                           nlabel = self.normalize_link(nlabel, fg.url)

     

       69
       69
       +
                   remaining = label_text

     

       70
       70
       +
                   while remaining:

     

       71
       71
       +
                       room = (

     

       72
       72
       +
                           max_chars

     

       73
       73
       +
                           - length

     

       74
       74
       +
                           - (0 if grapheme.length(remaining) <= max_chars else 1)

     

       75
       75
       +
                       )

     

       76
       76
       +
                       chunk = grapheme.slice(remaining, 0, room)

     

       77
       77
       +
                       if grapheme.length(remaining) > room:

     

       78
       78
       +
                           chunk += "-"

     

       54
       79
        
       

     

       55
       55
       -
                       nlabel_bytes = nlabel.encode('utf-8')

     

       80
       80
       +
                       block.append(replace(tk, label=chunk))

     

       81
       81
       +
                       length += grapheme.length(chunk)

     

       56
       82
        
       

     

       57
       57
       -
                       nstart = len(nbytes)

     

       58
       58
       -
                       nbytes.extend(nlabel_bytes)

     

       59
       59
       -
                       nend = len(nbytes)

     

       83
       83
       +
                       remaining = grapheme.slice(remaining, room, grapheme.length(remaining))

     

       84
       84
       +
                       if remaining:

     

       85
       85
       +
                           new_block()

     

       86
       86
       +
                   continue

     

       87
       87
       +
               if isinstance(tk, TextToken):

     

       88
       88
       +
                   for seg in ALTERNATE.findall(tk.text):

     

       89
       89
       +
                       seg_len = grapheme.length(seg)

     

       60
       90
        
       

     

       61
       61
       -
                       nfg = replace(fg, start=nstart, end=nend)

     

       62
       62
       -
                       nfragments.append(nfg)

     

       91
       91
       +
                       if length + seg_len <= max_chars - (0 if seg.isspace() else 1):

     

       92
       92
       +
                           append_text(seg)

     

       93
       93
       +
                           length += seg_len

     

       94
       94
       +
                           continue

     

       63
       95
        
       

     

       64
       64
       -
                       last_index = fg.end

     

       96
       96
       +
                       if length:

     

       97
       97
       +
                           new_block()

     

       65
       98
        
       

     

       66
       66
       -
                   if last_index < len(btext):

     

       67
       67
       -
                       nbytes.extend(btext[last_index:])

     

       99
       99
       +
                       if not seg.isspace():

     

       100
       100
       +
                           while grapheme.length(seg) > max_chars - 1:

     

       101
       101
       +
                               chunk = grapheme.slice(seg, 0, max_chars - 1) + "-"

     

       102
       102
       +
                               append_text(chunk)

     

       103
       103
       +
                               new_block()

     

       104
       104
       +
                               seg = grapheme.slice(seg, max_chars - 1, grapheme.length(seg))

     

       105
       105
       +
                       else:

     

       106
       106
       +
                           while grapheme.length(seg) > max_chars:

     

       107
       107
       +
                               chunk = grapheme.slice(seg, 0, max_chars)

     

       108
       108
       +
                               append_text(chunk)

     

       109
       109
       +
                               new_block()

     

       110
       110
       +
                               seg = grapheme.slice(seg, max_chars, grapheme.length(seg))

     

       68
       111
        
       

     

       69
       69
       -
                   return nbytes.decode('utf-8'), nfragments

     

       112
       112
       +
                       if seg:

     

       113
       113
       +
                           append_text(seg)

     

       114
       114
       +
                           length = grapheme.length(seg)

     

       115
       115
       +
                   continue

     

       116
       116
       +
               block.append(tk)

     

       117
       117
       +
           if block:

     

       118
       118
       +
               blocks.append(block)

     

       70
       119
        
       

     

       71
       71
       -
           def split(

     

       72
       72
       -
               self, text: str, fragments: list[Fragment]

     

       73
       73
       -
           ) -> list[tuple[str, list[Fragment]]]:

     

       74
       74
       -
               text, fragments = self.url_normalize(text, fragments)

     

       75
       75
       -
               if self.tally_lenght((text, fragments)) <= self.climit:

     

       76
       76
       -
                   return [(text, fragments)]

     

       120
       120
       +
           return blocks

Compare changes