commit c8f69581bf5f7359778548521f340ac1bfd55d0f · zenfyr.dev/xpost

+152

atproto2.py

···

       1
       +
       from typing import Any

     

       2
       +
       from atproto import client_utils, Client, AtUri

     

       3
       +
       from atproto_client import models

     

       4
       +
       

     

       5
       +
       class Client2(Client):

     

       6
       +
           def __init__(self, base_url: str | None = None, *args: Any, **kwargs: Any) -> None:

     

       7
       +
               super().__init__(base_url, *args, **kwargs)

     

       8
       +
           

     

       9
       +
           def send_video(

     

       10
       +
               self, 

     

       11
       +
               text: str | client_utils.TextBuilder, 

     

       12
       +
               video: bytes,

     

       13
       +
               video_alt: str | None = None,

     

       14
       +
               video_aspect_ratio: models.AppBskyEmbedDefs.AspectRatio | None = None,

     

       15
       +
               reply_to: models.AppBskyFeedPost.ReplyRef | None = None,

     

       16
       +
               langs: list[str] | None = None,

     

       17
       +
               facets: list[models.AppBskyRichtextFacet.Main] | None = None,

     

       18
       +
               labels: models.ComAtprotoLabelDefs.SelfLabels | None = None

     

       19
       +
               ) -> models.AppBskyFeedPost.CreateRecordResponse:

     

       20
       +
               """same as send_video, but with labels"""

     

       21
       +
               

     

       22
       +
               if video_alt is None:

     

       23
       +
                   video_alt = ''

     

       24
       +
       

     

       25
       +
               upload = self.upload_blob(video)

     

       26
       +
               

     

       27
       +
               return self.send_post(

     

       28
       +
                   text,

     

       29
       +
                   reply_to=reply_to,

     

       30
       +
                   embed=models.AppBskyEmbedVideo.Main(video=upload.blob, alt=video_alt, aspect_ratio=video_aspect_ratio),

     

       31
       +
                   langs=langs,

     

       32
       +
                   facets=facets,

     

       33
       +
                   labels=labels

     

       34
       +
               )

     

       35
       +
           

     

       36
       +
           def send_images(

     

       37
       +
               self, 

     

       38
       +
               text: str | client_utils.TextBuilder, 

     

       39
       +
               images: list[bytes],

     

       40
       +
               image_alts: list[str] | None = None,

     

       41
       +
               image_aspect_ratios: list[models.AppBskyEmbedDefs.AspectRatio] | None = None,

     

       42
       +
               reply_to: models.AppBskyFeedPost.ReplyRef | None = None,

     

       43
       +
               langs: list[str] | None = None,

     

       44
       +
               facets: list[models.AppBskyRichtextFacet.Main] | None = None,

     

       45
       +
               labels: models.ComAtprotoLabelDefs.SelfLabels | None = None

     

       46
       +
               ) -> models.AppBskyFeedPost.CreateRecordResponse:

     

       47
       +
               """same as send_images, but with labels"""

     

       48
       +
               

     

       49
       +
               if image_alts is None:

     

       50
       +
                   image_alts = [''] * len(images)

     

       51
       +
               else:

     

       52
       +
                   diff = len(images) - len(image_alts)

     

       53
       +
                   image_alts = image_alts + [''] * diff

     

       54
       +
               

     

       55
       +
               if image_aspect_ratios is None:

     

       56
       +
                   aligned_image_aspect_ratios = [None] * len(images)

     

       57
       +
               else:

     

       58
       +
                   diff = len(images) - len(image_aspect_ratios)

     

       59
       +
                   aligned_image_aspect_ratios = image_aspect_ratios + [None] * diff

     

       60
       +
               

     

       61
       +
               uploads = [self.upload_blob(image) for image in images]

     

       62
       +
               

     

       63
       +
               embed_images = [

     

       64
       +
                   models.AppBskyEmbedImages.Image(alt=alt, image=upload.blob, aspect_ratio=aspect_ratio)

     

       65
       +
                   for alt, upload, aspect_ratio in zip(image_alts, uploads, aligned_image_aspect_ratios)

     

       66
       +
               ]

     

       67
       +
               

     

       68
       +
               return self.send_post(

     

       69
       +
                   text,

     

       70
       +
                   reply_to=reply_to,

     

       71
       +
                   embed=models.AppBskyEmbedImages.Main(images=embed_images),

     

       72
       +
                   langs=langs,

     

       73
       +
                   facets=facets,

     

       74
       +
                   labels=labels

     

       75
       +
               )

     

       76
       +
           

     

       77
       +
           def send_post(

     

       78
       +
               self, 

     

       79
       +
               text: str | client_utils.TextBuilder, 

     

       80
       +
               reply_to: models.AppBskyFeedPost.ReplyRef | None = None,

     

       81
       +
               embed: 

     

       82
       +
                   None |

     

       83
       +
                   models.AppBskyEmbedImages.Main |

     

       84
       +
                   models.AppBskyEmbedExternal.Main |

     

       85
       +
                   models.AppBskyEmbedRecord.Main |

     

       86
       +
                   models.AppBskyEmbedRecordWithMedia.Main |

     

       87
       +
                   models.AppBskyEmbedVideo.Main = None,

     

       88
       +
               langs: list[str] | None = None,

     

       89
       +
               facets: list[models.AppBskyRichtextFacet.Main] | None = None,

     

       90
       +
               labels: models.ComAtprotoLabelDefs.SelfLabels | None = None

     

       91
       +
               ) -> models.AppBskyFeedPost.CreateRecordResponse:

     

       92
       +
               """same as send_post, but with labels"""

     

       93
       +
               

     

       94
       +
               if isinstance(text, client_utils.TextBuilder):

     

       95
       +
                   facets = text.build_facets()

     

       96
       +
                   text = text.build_text()

     

       97
       +
               

     

       98
       +
               repo = self.me and self.me.did

     

       99
       +
               if not repo:

     

       100
       +
                   raise Exception("Client not logged in!")

     

       101
       +
               

     

       102
       +
               if not langs:

     

       103
       +
                   langs = ['en']

     

       104
       +
                   

     

       105
       +
               record = models.AppBskyFeedPost.Record(

     

       106
       +
                   created_at=self.get_current_time_iso(),

     

       107
       +
                   text=text,

     

       108
       +
                   reply=reply_to,

     

       109
       +
                   embed=embed,

     

       110
       +
                   langs=langs,

     

       111
       +
                   facets=facets,

     

       112
       +
                   labels=labels

     

       113
       +
               )

     

       114
       +
               return self.app.bsky.feed.post.create(repo, record)

     

       115
       +
           

     

       116
       +
           def create_gates(self, options: dict, post_uri: str):

     

       117
       +
               account = self.me

     

       118
       +
               if not account:

     

       119
       +
                   raise Exception("Client not logged in!")

     

       120
       +
               

     

       121
       +
               rkey = AtUri.from_str(post_uri).rkey

     

       122
       +
               time = self.get_current_time_iso()

     

       123
       +
               

     

       124
       +
               thread_gate_opts = options.get('thread_gate', [])

     

       125
       +
               if 'everybody' not in thread_gate_opts:

     

       126
       +
                   allow = []

     

       127
       +
                   if thread_gate_opts:

     

       128
       +
                       if 'following' in thread_gate_opts:

     

       129
       +
                           allow.append(models.AppBskyFeedThreadgate.FollowingRule())

     

       130
       +
                       if 'followers' in thread_gate_opts:

     

       131
       +
                           allow.append(models.AppBskyFeedThreadgate.FollowerRule())

     

       132
       +
                       if 'mentioned' in thread_gate_opts:

     

       133
       +
                           allow.append(models.AppBskyFeedThreadgate.MentionRule())

     

       134
       +
                   

     

       135
       +
                   thread_gate = models.AppBskyFeedThreadgate.Record(

     

       136
       +
                       post=post_uri,

     

       137
       +
                       created_at=time,

     

       138
       +
                       allow=allow

     

       139
       +
                   )

     

       140
       +
                   

     

       141
       +
                   self.app.bsky.feed.threadgate.create(account.did, thread_gate, rkey)

     

       142
       +
                   

     

       143
       +
               if options.get('quote_gate', False):

     

       144
       +
                   post_gate = models.AppBskyFeedPostgate.Record(

     

       145
       +
                       post=post_uri,

     

       146
       +
                       created_at=time,

     

       147
       +
                       embedding_rules=[

     

       148
       +
                           models.AppBskyFeedPostgate.DisableRule()

     

       149
       +
                       ]

     

       150
       +
                   )

     

       151
       +
                   

     

       152
       +
                   self.app.bsky.feed.postgate.create(account.did, post_gate, rkey)

+22 -166

bluesky.py

···

       1
       -
       from atproto import client_utils, Client, AtUri, IdResolver

     

       2
        
       from atproto_client import models

     

       0
        
       
     

       3
        
       import json

     

       4
        
       import cross

     

       5
        
       import database

     
···

       7
        
       import util

     

       8
        
       import media_util

     

       9
        
       from util import LOGGER

     

       0
        
       
     

       10
        
       

     

       11
        
       # only for lexicon reference

     

       12
        
       SERVICE = 'https://bsky.app'

     

       13
        
       

     

       14
       -
       ADULT_LABEL = ["sexual content", "nsfw"]

     

       15
       -
       PORN_LABEL = ["porn", "yiff"]

     

       0
        
       
     

       16
        
       

     

       17
        
       class BlueskyOutput(cross.Output):

     

       18
        
           def __init__(self, input: cross.Input, settings: dict, db: DataBaseWorker) -> None:

     

       19
        
               super().__init__(input, settings, db)

     

       20
       -
               self.options = util.safe_get(settings, 'options', {})

     

       21
        
               

     

       22
       -
               if not util.get_or_envvar(settings, 'app-password'):

     

       23
        
                   raise Exception("Account app password not provided!")

     

       24
        
               

     

       25
        
               resolver = IdResolver()

     

       26
       -
               did: str | None = util.get_or_envvar(settings, 'did')

     

       27
        
               if not did:

     

       28
       -
                   if not util.get_or_envvar(settings, 'handle'):

     

       0
        
       
     

       29
        
                       raise Exception("ATP handle not specified!")

     

       30
       -
                   LOGGER.info("Resolving ATP identity for %s...", util.get_or_envvar(settings, 'handle'))

     

       31
       -
                   did = resolver.handle.resolve(util.get_or_envvar(settings, 'handle'))

     

       32
        
               if not did:

     

       33
        
                   raise Exception("Failed to resolve DID!")

     

       34
        
               

     

       35
       -
               pds: str | None = util.get_or_envvar(settings, 'pds')

     

       36
        
               if not pds:

     

       37
        
                   LOGGER.info("Resolving PDS from DID document...")

     

       38
        
                   did_doc = resolver.did.resolve(did)

     
···

       42
        
               if not pds:

     

       43
        
                   raise Exception("Failed to resolve PDS!")

     

       44
        
               

     

       45
       -
               self.client = Client(pds)

     

       46
       -
               self.client.login(did, util.get_or_envvar(settings, 'app-password'))

     

       47
       -
               self.bsky = Bluesky(self.client)

     

       48
        
           

     

       49
        
           def _find_parent(self, parent_id: str):

     

       50
       -
               login = self.client.me

     

       51
        
               if not login:

     

       52
        
                   raise Exception("Client not logged in!")

     

       53
        
               

     
···

       140
        
               return result

     

       141
        
           

     

       142
        
           def accept_post(self, post: cross.Post):

     

       143
       -
               login = self.client.me

     

       144
        
               if not login:

     

       145
        
                   raise Exception("Client not logged in!")

     

       146
        
               

     
···

       166
        
                   tokens.insert(0, cross.TextToken("CW: " + cw + "\n\n"))

     

       167
        
                   unique_labels.add('graphic-media')

     

       168
        
               

     

       169
       -
               if any(tag in cw for tag in ADULT_LABEL):

     

       170
        
                   unique_labels.add('sexual')

     

       171
        
               

     

       172
       -
               if any(tag in cw for tag in PORN_LABEL):

     

       173
        
                   unique_labels.add('porn')

     

       174
        
               

     

       175
        
               if post.is_sensitive():

     
···

       344
        
                   database.insert_mapping(self.db, db_post['id'], new_parent_id)

     

       345
        
                   

     

       346
        
           def delete_post(self, identifier: str):

     

       347
       -
               login = self.client.me

     

       348
        
               if not login:

     

       349
        
                   raise Exception("Client not logged in!")

     

       350
        
               

     
···

       354
        
               

     

       355
        
               mappings = database.find_mappings(self.db, post['id'], SERVICE, login.did)

     

       356
        
               for mapping in mappings[::-1]:

     

       357
       -
                   self.client.delete_post(json.loads(mapping[0])['uri'])

     

       358
        
                   database.delete_post(self.db, mapping[0], SERVICE, login.did)

     

       359
       -
                   

     

       360
       -
       

     

       361
       -
       class Bluesky():

     

       362
       -
           def __init__(self, client: Client) -> None:

     

       363
       -
               self.client = client

     

       364
       -
               

     

       365
       -
           def send_video(

     

       366
       -
               self, 

     

       367
       -
               text: str | client_utils.TextBuilder, 

     

       368
       -
               video: bytes,

     

       369
       -
               video_alt: str | None = None,

     

       370
       -
               video_aspect_ratio: models.AppBskyEmbedDefs.AspectRatio | None = None,

     

       371
       -
               reply_to: models.AppBskyFeedPost.ReplyRef | None = None,

     

       372
       -
               langs: list[str] | None = None,

     

       373
       -
               facets: list[models.AppBskyRichtextFacet.Main] | None = None,

     

       374
       -
               labels: models.ComAtprotoLabelDefs.SelfLabels | None = None

     

       375
       -
               ) -> models.AppBskyFeedPost.CreateRecordResponse:

     

       376
       -
               

     

       377
       -
               if video_alt is None:

     

       378
       -
                   video_alt = ''

     

       379
       -
       

     

       380
       -
               upload = self.client.upload_blob(video)

     

       381
       -
               

     

       382
       -
               return self.send_post(

     

       383
       -
                   text,

     

       384
       -
                   reply_to=reply_to,

     

       385
       -
                   embed=models.AppBskyEmbedVideo.Main(video=upload.blob, alt=video_alt, aspect_ratio=video_aspect_ratio),

     

       386
       -
                   langs=langs,

     

       387
       -
                   facets=facets,

     

       388
       -
                   labels=labels

     

       389
       -
               )

     

       390
       -
           

     

       391
       -
           def send_images(

     

       392
       -
               self, 

     

       393
       -
               text: str | client_utils.TextBuilder, 

     

       394
       -
               images: list[bytes],

     

       395
       -
               image_alts: list[str] | None = None,

     

       396
       -
               image_aspect_ratios: list[models.AppBskyEmbedDefs.AspectRatio] | None = None,

     

       397
       -
               reply_to: models.AppBskyFeedPost.ReplyRef | None = None,

     

       398
       -
               langs: list[str] | None = None,

     

       399
       -
               facets: list[models.AppBskyRichtextFacet.Main] | None = None,

     

       400
       -
               labels: models.ComAtprotoLabelDefs.SelfLabels | None = None

     

       401
       -
               ) -> models.AppBskyFeedPost.CreateRecordResponse:

     

       402
       -
               

     

       403
       -
               if image_alts is None:

     

       404
       -
                   image_alts = [''] * len(images)

     

       405
       -
               else:

     

       406
       -
                   diff = len(images) - len(image_alts)

     

       407
       -
                   image_alts = image_alts + [''] * diff

     

       408
       -
               

     

       409
       -
               if image_aspect_ratios is None:

     

       410
       -
                   aligned_image_aspect_ratios = [None] * len(images)

     

       411
       -
               else:

     

       412
       -
                   diff = len(images) - len(image_aspect_ratios)

     

       413
       -
                   aligned_image_aspect_ratios = image_aspect_ratios + [None] * diff

     

       414
       -
               

     

       415
       -
               uploads = [self.client.upload_blob(image) for image in images]

     

       416
       -
               

     

       417
       -
               embed_images = [

     

       418
       -
                   models.AppBskyEmbedImages.Image(alt=alt, image=upload.blob, aspect_ratio=aspect_ratio)

     

       419
       -
                   for alt, upload, aspect_ratio in zip(image_alts, uploads, aligned_image_aspect_ratios)

     

       420
       -
               ]

     

       421
       -
               

     

       422
       -
               return self.send_post(

     

       423
       -
                   text,

     

       424
       -
                   reply_to=reply_to,

     

       425
       -
                   embed=models.AppBskyEmbedImages.Main(images=embed_images),

     

       426
       -
                   langs=langs,

     

       427
       -
                   facets=facets,

     

       428
       -
                   labels=labels

     

       429
       -
               )

     

       430
       -
           

     

       431
       -
           def send_post(

     

       432
       -
               self, 

     

       433
       -
               text: str | client_utils.TextBuilder, 

     

       434
       -
               reply_to: models.AppBskyFeedPost.ReplyRef | None = None,

     

       435
       -
               embed: 

     

       436
       -
                   None |

     

       437
       -
                   models.AppBskyEmbedImages.Main |

     

       438
       -
                   models.AppBskyEmbedExternal.Main |

     

       439
       -
                   models.AppBskyEmbedRecord.Main |

     

       440
       -
                   models.AppBskyEmbedRecordWithMedia.Main |

     

       441
       -
                   models.AppBskyEmbedVideo.Main = None,

     

       442
       -
               langs: list[str] | None = None,

     

       443
       -
               facets: list[models.AppBskyRichtextFacet.Main] | None = None,

     

       444
       -
               labels: models.ComAtprotoLabelDefs.SelfLabels | None = None

     

       445
       -
               ) -> models.AppBskyFeedPost.CreateRecordResponse:

     

       446
       -
               

     

       447
       -
               if isinstance(text, client_utils.TextBuilder):

     

       448
       -
                   facets = text.build_facets()

     

       449
       -
                   text = text.build_text()

     

       450
       -
               

     

       451
       -
               repo = self.client.me and self.client.me.did

     

       452
       -
               if not repo:

     

       453
       -
                   raise Exception("Client not logged in!")

     

       454
       -
               

     

       455
       -
               if not langs:

     

       456
       -
                   langs = ['en']

     

       457
       -
                   

     

       458
       -
               record = models.AppBskyFeedPost.Record(

     

       459
       -
                   created_at=self.client.get_current_time_iso(),

     

       460
       -
                   text=text,

     

       461
       -
                   reply=reply_to,

     

       462
       -
                   embed=embed,

     

       463
       -
                   langs=langs,

     

       464
       -
                   facets=facets,

     

       465
       -
                   labels=labels

     

       466
       -
               )

     

       467
       -
               return self.client.app.bsky.feed.post.create(repo, record)

     

       468
       -
           

     

       469
       -
           def create_gates(self, options: dict, post_uri: str):

     

       470
       -
               account = self.client.me

     

       471
       -
               if not account:

     

       472
       -
                   raise Exception("Client not logged in!")

     

       473
       -
               

     

       474
       -
               rkey = AtUri.from_str(post_uri).rkey

     

       475
       -
               time = self.client.get_current_time_iso()

     

       476
       -
               

     

       477
       -
               thread_gate_opts = options.get('thread_gate', [])

     

       478
       -
               if 'everybody' not in thread_gate_opts:

     

       479
       -
                   allow = []

     

       480
       -
                   if thread_gate_opts:

     

       481
       -
                       if 'following' in thread_gate_opts:

     

       482
       -
                           allow.append(models.AppBskyFeedThreadgate.FollowingRule())

     

       483
       -
                       if 'followers' in thread_gate_opts:

     

       484
       -
                           allow.append(models.AppBskyFeedThreadgate.FollowerRule())

     

       485
       -
                       if 'mentioned' in thread_gate_opts:

     

       486
       -
                           allow.append(models.AppBskyFeedThreadgate.MentionRule())

     

       487
       -
                   

     

       488
       -
                   thread_gate = models.AppBskyFeedThreadgate.Record(

     

       489
       -
                       post=post_uri,

     

       490
       -
                       created_at=time,

     

       491
       -
                       allow=allow

     

       492
       -
                   )

     

       493
       -
                   

     

       494
       -
                   self.client.app.bsky.feed.threadgate.create(account.did, thread_gate, rkey)

     

       495
       -
                   

     

       496
       -
               if options.get('quote_gate', False):

     

       497
       -
                   post_gate = models.AppBskyFeedPostgate.Record(

     

       498
       -
                       post=post_uri,

     

       499
       -
                       created_at=time,

     

       500
       -
                       embedding_rules=[

     

       501
       -
                           models.AppBskyFeedPostgate.DisableRule()

     

       502
       -
                       ]

     

       503
       -
                   )

     

       504
       -
                   

     

       505
       -
                   self.client.app.bsky.feed.postgate.create(account.did, post_gate, rkey)

     

       506
        
           

     

       507
        
       

     

       508
        
       def tokens_to_richtext(tokens: list[cross.Token]) -> client_utils.TextBuilder | None:

···

       1
       +
       from atproto import client_utils, IdResolver

     

       2
        
       from atproto_client import models

     

       3
       +
       from atproto2 import Client2

     

       4
        
       import json

     

       5
        
       import cross

     

       6
        
       import database

     
···

       8
        
       import util

     

       9
        
       import media_util

     

       10
        
       from util import LOGGER

     

       11
       +
       import re

     

       12
        
       

     

       13
        
       # only for lexicon reference

     

       14
        
       SERVICE = 'https://bsky.app'

     

       15
        
       

     

       16
       +
       # TODO this is terrible and stupid

     

       17
       +
       ADULT_PATTERN = re.compile(r"\b(sexual content|nsfw|erotic|adult only|18\+)\b", re.IGNORECASE)

     

       18
       +
       PORN_PATTERN  = re.compile(r"\b(porn|yiff|hentai|pornographic|fetish)\b", re.IGNORECASE)

     

       19
        
       

     

       20
        
       class BlueskyOutput(cross.Output):

     

       21
        
           def __init__(self, input: cross.Input, settings: dict, db: DataBaseWorker) -> None:

     

       22
        
               super().__init__(input, settings, db)

     

       23
       +
               self.options = settings.get('options') or {}

     

       24
        
               

     

       25
       +
               if not util.as_envvar(settings.get('app-password')):

     

       26
        
                   raise Exception("Account app password not provided!")

     

       27
        
               

     

       28
        
               resolver = IdResolver()

     

       29
       +
               did: str | None = util.as_envvar(settings.get('did'))

     

       30
        
               if not did:

     

       31
       +
                   handle = util.as_envvar(settings.get('handle'))

     

       32
       +
                   if not handle:

     

       33
        
                       raise Exception("ATP handle not specified!")

     

       34
       +
                   LOGGER.info("Resolving ATP identity for %s...", handle)

     

       35
       +
                   did = resolver.handle.resolve(handle)

     

       36
        
               if not did:

     

       37
        
                   raise Exception("Failed to resolve DID!")

     

       38
        
               

     

       39
       +
               pds: str | None = util.as_envvar(settings.get('pds'))

     

       40
        
               if not pds:

     

       41
        
                   LOGGER.info("Resolving PDS from DID document...")

     

       42
        
                   did_doc = resolver.did.resolve(did)

     
···

       46
        
               if not pds:

     

       47
        
                   raise Exception("Failed to resolve PDS!")

     

       48
        
               

     

       49
       +
               self.bsky = Client2(pds)

     

       50
       +
               self.bsky.login(did, util.as_envvar(settings.get('app-password')))

     

       0
        
       
     

       51
        
           

     

       52
        
           def _find_parent(self, parent_id: str):

     

       53
       +
               login = self.bsky.me

     

       54
        
               if not login:

     

       55
        
                   raise Exception("Client not logged in!")

     

       56
        
               

     
···

       143
        
               return result

     

       144
        
           

     

       145
        
           def accept_post(self, post: cross.Post):

     

       146
       +
               login = self.bsky.me

     

       147
        
               if not login:

     

       148
        
                   raise Exception("Client not logged in!")

     

       149
        
               

     
···

       169
        
                   tokens.insert(0, cross.TextToken("CW: " + cw + "\n\n"))

     

       170
        
                   unique_labels.add('graphic-media')

     

       171
        
               

     

       172
       +
               if ADULT_PATTERN.search(cw):

     

       173
        
                   unique_labels.add('sexual')

     

       174
        
               

     

       175
       +
               if PORN_PATTERN.search(cw):

     

       176
        
                   unique_labels.add('porn')

     

       177
        
               

     

       178
        
               if post.is_sensitive():

     
···

       347
        
                   database.insert_mapping(self.db, db_post['id'], new_parent_id)

     

       348
        
                   

     

       349
        
           def delete_post(self, identifier: str):

     

       350
       +
               login = self.bsky.me

     

       351
        
               if not login:

     

       352
        
                   raise Exception("Client not logged in!")

     

       353
        
               

     
···

       357
        
               

     

       358
        
               mappings = database.find_mappings(self.db, post['id'], SERVICE, login.did)

     

       359
        
               for mapping in mappings[::-1]:

     

       360
       +
                   self.bsky.delete_post(json.loads(mapping[0])['uri'])

     

       361
        
                   database.delete_post(self.db, mapping[0], SERVICE, login.did)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       362
        
           

     

       363
        
       

     

       364
        
       def tokens_to_richtext(tokens: list[cross.Token]) -> client_utils.TextBuilder | None:

+6 -6

mastodon.py

···

       96
        
               return self.status.get('in_reply_to_id')

     

       97
        
           

     

       98
        
           def get_cw(self) -> str:

     

       99
       -
               return util.safe_get(self.status, 'spoiler_text', '')

     

       100
        
           

     

       101
        
           def get_id(self) -> str:

     

       102
        
               return self.status['id']

     
···

       145
        
           

     

       146
        
           # get media description

     

       147
        
           def get_alt(self) -> str:

     

       148
       -
               return util.safe_get(self.attachment, 'description', '')

     

       149
        
       

     

       150
        
       class MastodonInput(cross.Input):

     

       151
        
           def __init__(self, settings: dict, db: DataBaseWorker) -> None:

     

       152
        
               self.options = settings.get('options', {})

     

       153
       -
               self.token = util.get_or_envvar(settings, 'token')

     

       154
       -
               instance: str = util.get_or_envvar(settings, 'instance')

     

       155
        
               

     

       156
        
               service = instance[:-1] if instance.endswith('/') else instance

     

       157
        
               

     
···

       174
        
               response = requests.get(f"{self.service}/api/v1/instance")

     

       175
        
               response.raise_for_status()

     

       176
        
               data: dict = response.json()

     

       177
       -
               return util.safe_get(data, "urls", {}).get("streaming_api")

     

       178
        
           

     

       179
        
           def _on_create_post(self, outputs: list[cross.Output], status: dict):

     

       180
        
               # skip events from other users

     

       181
       -
               if util.safe_get(status, 'account', {})['id'] != self.user_id:

     

       182
        
                   return

     

       183
        
               

     

       184
        
               if status.get('reblog') or status.get('poll'):

···

       96
        
               return self.status.get('in_reply_to_id')

     

       97
        
           

     

       98
        
           def get_cw(self) -> str:

     

       99
       +
               return self.status.get('spoiler_text') or ''

     

       100
        
           

     

       101
        
           def get_id(self) -> str:

     

       102
        
               return self.status['id']

     
···

       145
        
           

     

       146
        
           # get media description

     

       147
        
           def get_alt(self) -> str:

     

       148
       +
               return self.attachment.get('description') or ''

     

       149
        
       

     

       150
        
       class MastodonInput(cross.Input):

     

       151
        
           def __init__(self, settings: dict, db: DataBaseWorker) -> None:

     

       152
        
               self.options = settings.get('options', {})

     

       153
       +
               self.token = util.as_envvar(settings.get('token')) or (_ for _ in ()).throw(ValueError("'token' is required"))

     

       154
       +
               instance: str = util.as_envvar(settings.get('instance')) or (_ for _ in ()).throw(ValueError("'instance' is required"))

     

       155
        
               

     

       156
        
               service = instance[:-1] if instance.endswith('/') else instance

     

       157
        
               

     
···

       174
        
               response = requests.get(f"{self.service}/api/v1/instance")

     

       175
        
               response.raise_for_status()

     

       176
        
               data: dict = response.json()

     

       177
       +
               return (data.get('urls') or {}).get('streaming_api')

     

       178
        
           

     

       179
        
           def _on_create_post(self, outputs: list[cross.Output], status: dict):

     

       180
        
               # skip events from other users

     

       181
       +
               if (status.get('account') or {})['id'] != self.user_id:

     

       182
        
                   return

     

       183
        
               

     

       184
        
               if status.get('reblog') or status.get('poll'):

+7 -8

misskey.py

···

       29
        
           if not text:

     

       30
        
               return []

     

       31
        
           

     

       32
       -
           mention_handles: dict = util.safe_get(note, 'mentionHandles', {})

     

       0
        
       
     

       0
        
       
     

       33
        
           handles: list[str] = []

     

       34
       -
           

     

       35
        
           for key, value in mention_handles.items():

     

       36
        
               handles.append(value)

     

       37
       -
           

     

       38
       -
           tags: list[str] = util.safe_get(note, 'tags', [])

     

       39
        
           

     

       40
        
           index: int = 0

     

       41
        
           total: int = len(text)

     
···

       133
        
               return self.note['id']

     

       134
        
           

     

       135
        
           def get_cw(self) -> str:

     

       136
       -
               return util.safe_get(self.note, 'cw', '')

     

       137
        
           

     

       138
        
           def get_languages(self) -> list[str]:

     

       139
        
               return []

     
···

       160
        
               return get_image_common(self.attachment['type'])

     

       161
        
           

     

       162
        
           def get_alt(self) -> str:

     

       163
       -
               return util.safe_get(self.attachment, 'comment', '')

     

       164
        
       

     

       165
        
       class MisskeyInput(cross.Input):

     

       166
        
           def __init__(self, settings: dict, db: cross.DataBaseWorker) -> None:

     

       167
        
               self.options = settings.get('options', {})

     

       168
       -
               self.token = util.get_or_envvar(settings, 'token')

     

       169
       -
               instance: str = util.get_or_envvar(settings, 'instance')

     

       170
        
               

     

       171
        
               service = instance[:-1] if instance.endswith('/') else instance

     

       172

···

       29
        
           if not text:

     

       30
        
               return []

     

       31
        
           

     

       32
       +
           mention_handles: dict = note.get('mentionHandles') or {}

     

       33
       +
           tags: list[str] = note.get('tags') or []

     

       34
       +
           

     

       35
        
           handles: list[str] = []

     

       0
        
       
     

       36
        
           for key, value in mention_handles.items():

     

       37
        
               handles.append(value)

     

       0
        
       
     

       0
        
       
     

       38
        
           

     

       39
        
           index: int = 0

     

       40
        
           total: int = len(text)

     
···

       132
        
               return self.note['id']

     

       133
        
           

     

       134
        
           def get_cw(self) -> str:

     

       135
       +
               return self.note.get('cw') or ''

     

       136
        
           

     

       137
        
           def get_languages(self) -> list[str]:

     

       138
        
               return []

     
···

       159
        
               return get_image_common(self.attachment['type'])

     

       160
        
           

     

       161
        
           def get_alt(self) -> str:

     

       162
       +
               return self.attachment.get('comment') or ''

     

       163
        
       

     

       164
        
       class MisskeyInput(cross.Input):

     

       165
        
           def __init__(self, settings: dict, db: cross.DataBaseWorker) -> None:

     

       166
        
               self.options = settings.get('options', {})

     

       167
       +
               self.token = util.as_envvar(settings.get('token')) or (_ for _ in ()).throw(ValueError("'token' is required"))

     

       168
       +
               instance: str = util.as_envvar(settings.get('instance')) or (_ for _ in ()).throw(ValueError("'instance' is required"))

     

       169
        
               

     

       170
        
               service = instance[:-1] if instance.endswith('/') else instance

     

       171

+6 -5

util.py

···

       140
        
           val = obj.get(key, default)

     

       141
        
           return val if val else default

     

       142
        
       

     

       143
       -
       def value_or_envvar(text: str) -> str:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       144
        
           if text.startswith('env:'):

     

       145
        
               return os.environ.get(text[4:], '')

     

       146
       -
           return text

     

       147
       -
       

     

       148
       -
       def get_or_envvar(obj: dict, key: str):

     

       149
       -
           return value_or_envvar(obj.get(key, ''))

···

       140
        
           val = obj.get(key, default)

     

       141
        
           return val if val else default

     

       142
        
       

     

       143
       +
       def as_envvar(text: str | None) -> str | None:

     

       144
       +
           if not text:

     

       145
       +
               return None

     

       146
       +
           

     

       147
        
           if text.startswith('env:'):

     

       148
        
               return os.environ.get(text[4:], '')

     

       149
       +
           

     

       150
       +
           return text
     

       0
        
       
     

       0