commit f7c69e5d28978f9b4f5ed9ee330e340703340d16 · zenfyr.dev/xpost

+3 -1

bluesky/input.py

···

       167
       167
        
               reposted = self._get_post(self.url, self.did, reposted_uri)

     

       168
       168
        
               if not reposted:

     

       169
       169
        
                   self.log.info(

     

       170
       170
       -
                       "Skipping repost '%s' as reposted post '%s' was not found in the db."

     

       170
       170
       +
                       "Skipping repost '%s' as reposted post '%s' was not found in the db.",

     

       171
       171
       +
                       post_uri,

     

       172
       172
       +
                       reposted_uri,

     

       171
       173
        
                   )

     

       172
       174
        
                   return

     

       173
       175

+132 -4

mastodon/input.py

···

       6
       6
        
       

     

       7
       7
        
       import websockets

     

       8
       8
        
       

     

       9
       9
       +
       from cross.attachments import (

     

       10
       10
       +
           LabelsAttachment,

     

       11
       11
       +
           LanguagesAttachment,

     

       12
       12
       +
           MediaAttachment,

     

       13
       13
       +
           RemoteUrlAttachment,

     

       14
       14
       +
           SensitiveAttachment,

     

       15
       15
       +
       )

     

       16
       16
       +
       from cross.media import Blob, download_blob

     

       17
       17
       +
       from cross.post import Post

     

       9
       18
        
       from cross.service import InputService

     

       10
       19
        
       from database.connection import DatabasePool

     

       11
       20
        
       from mastodon.info import MastodonService, validate_and_transform

     

       21
       21
       +
       from mastodon.parser import StatusParser

     

       12
       22
        
       

     

       13
       23
        
       ALLOWED_VISIBILITY: list[str] = ["public", "unlisted"]

     

       14
       24
        
       

     
···

       55
       65
        
               return self.options.token

     

       56
       66
        
       

     

       57
       67
        
           def _on_create_post(self, status: dict[str, Any]):

     

       58
       58
       -
               self.log.info(status) # TODO

     

       68
       68
       +
               if status["account"]["id"] != self.user_id:

     

       69
       69
       +
                   return

     

       70
       70
       +
       

     

       71
       71
       +
               if status["visibility"] not in self.options.allowed_visibility:

     

       72
       72
       +
                   return

     

       73
       73
       +
       

     

       74
       74
       +
               reblog: dict[str, Any] | None = status.get("reblog")

     

       75
       75
       +
               if reblog:

     

       76
       76
       +
                   if reblog["account"]["id"] != self.user_id:

     

       77
       77
       +
                       return

     

       78
       78
       +
                   self._on_reblog(status, reblog)

     

       79
       79
       +
                   return

     

       80
       80
       +
       

     

       81
       81
       +
               if status.get("poll"):

     

       82
       82
       +
                   self.log.info("Skipping '%s'! Contains a poll..", status["id"])

     

       83
       83
       +
                   return

     

       84
       84
       +
       

     

       85
       85
       +
               if status.get("quote"):

     

       86
       86
       +
                   self.log.info("Skipping '%s'! Quote..", status["id"])

     

       87
       87
       +
                   return

     

       88
       88
       +
       

     

       89
       89
       +
               in_reply: str | None = status.get("in_reply_to_id")

     

       90
       90
       +
               in_reply_to: str | None = status.get("in_reply_to_account_id")

     

       91
       91
       +
               if in_reply_to and in_reply_to != self.user_id:

     

       92
       92
       +
                   return

     

       93
       93
       +
       

     

       94
       94
       +
               parent = None

     

       95
       95
       +
               if in_reply:

     

       96
       96
       +
                   parent = self._get_post(self.url, self.user_id, in_reply)

     

       97
       97
       +
                   if not parent:

     

       98
       98
       +
                       self.log.info(

     

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

     

       100
       100
       +
                       )

     

       101
       101
       +
                       return

     

       102
       102
       +
               parser = StatusParser()

     

       103
       103
       +
               parser.feed(status["content"])

     

       104
       104
       +
               text, fragments = parser.get_result()

     

       105
       105
       +
       

     

       106
       106
       +
               post = Post(id=status["id"], parent_id=in_reply, text=text)

     

       107
       107
       +
               post.fragments.extend(fragments)

     

       108
       108
       +
       

     

       109
       109
       +
               if status.get("url"):

     

       110
       110
       +
                   post.attachments.put(RemoteUrlAttachment(url=status["url"]))

     

       111
       111
       +
               if status.get("sensitive"):

     

       112
       112
       +
                   post.attachments.put(SensitiveAttachment(sensitive=True))

     

       113
       113
       +
               if status.get("language"):

     

       114
       114
       +
                   post.attachments.put(LanguagesAttachment(langs=[status["language"]]))

     

       115
       115
       +
               if status.get("spoiler"):

     

       116
       116
       +
                   post.attachments.put(LabelsAttachment(labels=[status["spoiler"]]))

     

       117
       117
       +
       

     

       118
       118
       +
               blobs: list[Blob] = []

     

       119
       119
       +
               for media in status.get("media_attachments", []):

     

       120
       120
       +
                   self.log.info("Downloading %s...", media["url"])

     

       121
       121
       +
                   blob: Blob | None = download_blob(media["url"], media.get("alt"))

     

       122
       122
       +
                   if not blob:

     

       123
       123
       +
                       self.log.error(

     

       124
       124
       +
                           "Skipping %s! Failed to download media %s.",

     

       125
       125
       +
                           status["id"],

     

       126
       126
       +
                           media["url"],

     

       127
       127
       +
                       )

     

       128
       128
       +
                       return

     

       129
       129
       +
                   blobs.append(blob)

     

       130
       130
       +
       

     

       131
       131
       +
               if blobs:

     

       132
       132
       +
                   post.attachments.put(MediaAttachment(blobs=blobs))

     

       133
       133
       +
       

     

       134
       134
       +
               if parent:

     

       135
       135
       +
                   self._insert_post(

     

       136
       136
       +
                       {

     

       137
       137
       +
                           "user": self.user_id,

     

       138
       138
       +
                           "service": self.url,

     

       139
       139
       +
                           "identifier": status["id"],

     

       140
       140
       +
                           "parent": parent["id"],

     

       141
       141
       +
                           "root": parent["id"] if not parent["root"] else parent["root"],

     

       142
       142
       +
                       }

     

       143
       143
       +
                   )

     

       144
       144
       +
               else:

     

       145
       145
       +
                   self._insert_post(

     

       146
       146
       +
                       {

     

       147
       147
       +
                           "user": self.user_id,

     

       148
       148
       +
                           "service": self.url,

     

       149
       149
       +
                           "identifier": status["id"],

     

       150
       150
       +
                       }

     

       151
       151
       +
                   )

     

       152
       152
       +
       

     

       153
       153
       +
               for out in self.outputs:

     

       154
       154
       +
                   self.submitter(lambda: out.accept_post(post))

     

       155
       155
       +
       

     

       156
       156
       +
           def _on_reblog(self, status: dict[str, Any], reblog: dict[str, Any]):

     

       157
       157
       +
               reposted = self._get_post(self.url, self.user_id, reblog["id"])

     

       158
       158
       +
               if not reposted:

     

       159
       159
       +
                   self.log.info(

     

       160
       160
       +
                       "Skipping repost '%s' as reposted post '%s' was not found in the db.",

     

       161
       161
       +
                       status["id"],

     

       162
       162
       +
                       reblog["id"],

     

       163
       163
       +
                   )

     

       164
       164
       +
                   return

     

       165
       165
       +
       

     

       166
       166
       +
               self._insert_post(

     

       167
       167
       +
                   {

     

       168
       168
       +
                       "user": self.user_id,

     

       169
       169
       +
                       "service": self.url,

     

       170
       170
       +
                       "identifier": status["id"],

     

       171
       171
       +
                       "reposted": reposted["id"],

     

       172
       172
       +
                   }

     

       173
       173
       +
               )

     

       174
       174
       +
       

     

       175
       175
       +
               for out in self.outputs:

     

       176
       176
       +
                   self.submitter(lambda: out.accept_repost(status["id"], reposted["id"]))

     

       59
       177
        
       

     

       60
       178
        
           def _on_delete_post(self, status_id: str):

     

       61
       61
       -
               self.log.info(status_id) # TODO

     

       179
       179
       +
               post = self._get_post(self.url, self.user_id, status_id)

     

       180
       180
       +
               if not post:

     

       181
       181
       +
                   return

     

       182
       182
       +
       

     

       183
       183
       +
               if post["reposted_id"]:

     

       184
       184
       +
                   for output in self.outputs:

     

       185
       185
       +
                       self.submitter(lambda: output.delete_repost(status_id))

     

       186
       186
       +
               else:

     

       187
       187
       +
                   for output in self.outputs:

     

       188
       188
       +
                       self.submitter(lambda: output.delete_post(status_id))

     

       189
       189
       +
               self._delete_post_by_id(post["id"])

     

       62
       190
        
       

     

       63
       191
        
           def _accept_msg(self, msg: websockets.Data) -> None:

     

       64
       192
        
               data: dict[str, Any] = cast(dict[str, Any], json.loads(msg))

     

       65
       65
       -
               event: str = cast(str, data['event'])

     

       66
       66
       -
               payload: str = cast(str, data['payload'])

     

       193
       193
       +
               event: str = cast(str, data["event"])

     

       194
       194
       +
               payload: str = cast(str, data["payload"])

     

       67
       195
        
       

     

       68
       196
        
               if event == "update":

     

       69
       197
        
                   self._on_create_post(json.loads(payload))

+123

mastodon/parser.py

···

       1
       1
       +
       from html.parser import HTMLParser

     

       2
       2
       +
       from typing import override

     

       3
       3
       +
       import cross.fragments as f

     

       4
       4
       +
       

     

       5
       5
       +
       

     

       6
       6
       +
       class StatusParser(HTMLParser):

     

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

     

       8
       8
       +
               super().__init__()

     

       9
       9
       +
               self.text: str = ""

     

       10
       10
       +
               self.fragments: list[f.Fragment] = []

     

       11
       11
       +
       

     

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

     

       13
       13
       +
               self.in_pre: bool = False

     

       14
       14
       +
               self.in_code: bool = False

     

       15
       15
       +
       

     

       16
       16
       +
               self.invisible: bool = False

     

       17
       17
       +
       

     

       18
       18
       +
           @override

     

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

     

       20
       20
       +
               _attr = dict(attrs)

     

       21
       21
       +
       

     

       22
       22
       +
               def append_newline():

     

       23
       23
       +
                   if self.text and not self.text.endswith("\n"):

     

       24
       24
       +
                       self.text += "\n"

     

       25
       25
       +
       

     

       26
       26
       +
               if self.invisible:

     

       27
       27
       +
                   return

     

       28
       28
       +
       

     

       29
       29
       +
               match tag:

     

       30
       30
       +
                   case "p":

     

       31
       31
       +
                       cls = _attr.get('class', '')

     

       32
       32
       +
                       if cls and 'quote-inline' in cls:

     

       33
       33
       +
                           self.invisible = True

     

       34
       34
       +
                   case "a":

     

       35
       35
       +
                       self._tag_stack["a"] = (len(self.text), _attr)

     

       36
       36
       +
                   case "code":

     

       37
       37
       +
                       if not self.in_pre:

     

       38
       38
       +
                           self.text += "`"

     

       39
       39
       +
                           self.in_code = True

     

       40
       40
       +
                   case "pre":

     

       41
       41
       +
                       append_newline()

     

       42
       42
       +
                       self.text += "```\n"

     

       43
       43
       +
                       self.in_pre = True

     

       44
       44
       +
                   case "blockquote":

     

       45
       45
       +
                       append_newline()

     

       46
       46
       +
                       self.text += "> "

     

       47
       47
       +
                   case "strong" | "b":

     

       48
       48
       +
                       self.text += "**"

     

       49
       49
       +
                   case "em" | "i":

     

       50
       50
       +
                       self.text += "*"

     

       51
       51
       +
                   case "del" | "s":

     

       52
       52
       +
                       self.text += "~~"

     

       53
       53
       +
                   case "br":

     

       54
       54
       +
                       self.text += "\n"

     

       55
       55
       +
                   case _:

     

       56
       56
       +
                       if tag in {"h1", "h2", "h3", "h4", "h5", "h6"}:

     

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

     

       58
       58
       +
                           self.text += "\n" + "#" * level + " "

     

       59
       59
       +
       

     

       60
       60
       +
           @override

     

       61
       61
       +
           def handle_endtag(self, tag: str) -> None:

     

       62
       62
       +
               if self.invisible:

     

       63
       63
       +
                   if tag == "p":

     

       64
       64
       +
                       self.invisible = False

     

       65
       65
       +
                   return

     

       66
       66
       +
       

     

       67
       67
       +
               current_end = len(self.text)

     

       68
       68
       +
               match tag:

     

       69
       69
       +
                   case "a":

     

       70
       70
       +
                       if "a" in self._tag_stack:

     

       71
       71
       +
                           start, _attr = self._tag_stack.pop("a")

     

       72
       72
       +
       

     

       73
       73
       +
                           href = _attr.get('href')

     

       74
       74
       +
                           if href and current_end > start:

     

       75
       75
       +
                               cls = _attr.get('class', '')

     

       76
       76
       +
                               if cls:

     

       77
       77
       +
                                   if 'hashtag' in cls:

     

       78
       78
       +
                                       tag = self.text[start:current_end]

     

       79
       79
       +
                                       tag = tag[1:] if tag.startswith('#') else tag

     

       80
       80
       +
       

     

       81
       81
       +
                                       self.fragments.append(

     

       82
       82
       +
                                           f.TagFragment(start=start, end=current_end, tag=tag)

     

       83
       83
       +
                                       )

     

       84
       84
       +
                                       return

     

       85
       85
       +
                                   if 'mention' in cls: # TODO put the full acct in the fragment

     

       86
       86
       +
                                       mention = self.text[start:current_end]

     

       87
       87
       +
                                       self.fragments.append(

     

       88
       88
       +
                                           f.MentionFragment(start=start, end=current_end, uri=mention)

     

       89
       89
       +
                                       )

     

       90
       90
       +
                                       return

     

       91
       91
       +
                               self.fragments.append(

     

       92
       92
       +
                                   f.LinkFragment(start=start, end=current_end, url=href)

     

       93
       93
       +
                               )

     

       94
       94
       +
                   case "code":

     

       95
       95
       +
                       if not self.in_pre and self.in_code:

     

       96
       96
       +
                           self.text += "`"

     

       97
       97
       +
                           self.in_code = False

     

       98
       98
       +
                   case "pre":

     

       99
       99
       +
                       self.text += "\n```\n"

     

       100
       100
       +
                       self.in_pre = False

     

       101
       101
       +
                   case "blockquote":

     

       102
       102
       +
                       self.text += "\n"

     

       103
       103
       +
                   case "strong" | "b":

     

       104
       104
       +
                       self.text += "**"

     

       105
       105
       +
                   case "em" | "i":

     

       106
       106
       +
                       self.text += "*"

     

       107
       107
       +
                   case "del" | "s":

     

       108
       108
       +
                       self.text += "~~"

     

       109
       109
       +
                   case "p":

     

       110
       110
       +
                       self.text += "\n\n"

     

       111
       111
       +
                   case _:

     

       112
       112
       +
                       if tag in ["h1", "h2", "h3", "h4", "h5", "h6"]:

     

       113
       113
       +
                           self.text += '\n'

     

       114
       114
       +
       

     

       115
       115
       +
           @override

     

       116
       116
       +
           def handle_data(self, data: str) -> None:

     

       117
       117
       +
               if not self.invisible:

     

       118
       118
       +
                   self.text += data

     

       119
       119
       +
       

     

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

     

       121
       121
       +
               if self.text.endswith('\n\n'):

     

       122
       122
       +
                   return self.text[:-2], self.fragments

     

       123
       123
       +
               return self.text, self.fragments