commit 92636ae60ffcc3eb13ef5f986f3a2b47865159eb · zenfyr.dev/xpost

+23 -21
bluesky/common.py
···

       34
       34
        
               feature = features[0]

     

       35
       35
        
               feature_type = feature['$type']

     

       36
       36
        
               index = facet['index']

     

       37
       37
       -
               if feature_type == 'app.bsky.richtext.facet#tag':

     

       38
       38
       -
                   slices.append((index['byteStart'], index['byteEnd'], 'tag', feature['tag']))

     

       39
       39
       -
               elif feature_type == 'app.bsky.richtext.facet#link':

     

       40
       40
       -
                   slices.append((index['byteStart'], index['byteEnd'], 'link', feature['uri']))

     

       41
       41
       -
               elif feature_type == 'app.bsky.richtext.facet#mention':

     

       42
       42
       -
                   slices.append((index['byteStart'], index['byteEnd'], 'mention', feature['did']))

     

       37
       37
       +
               match feature_type:

     

       38
       38
       +
                   case 'app.bsky.richtext.facet#tag':

     

       39
       39
       +
                       slices.append((index['byteStart'], index['byteEnd'], 'tag', feature['tag']))

     

       40
       40
       +
                   case 'app.bsky.richtext.facet#link':

     

       41
       41
       +
                       slices.append((index['byteStart'], index['byteEnd'], 'link', feature['uri']))

     

       42
       42
       +
                   case 'app.bsky.richtext.facet#mention':

     

       43
       43
       +
                       slices.append((index['byteStart'], index['byteEnd'], 'mention', feature['did']))

     

       43
       44
        
           

     

       44
       45
        
           if not slices:

     

       45
       46
        
               return [cross.TextToken(text)]

     
···

       63
       64
        
                   # text between facets

     

       64
       65
        
                   tokens.append(cross.TextToken(text[prev:start]))

     

       65
       66
        
               # facet token

     

       66
       66
       -
               if ttype == 'link':

     

       67
       67
       -
                   label = text[start:end]

     

       67
       67
       +
               match ttype:

     

       68
       68
       +
                   case 'link':

     

       69
       69
       +
                       label = text[start:end]

     

       68
       70
        
                   

     

       69
       69
       -
                   # try to unflatten links

     

       70
       70
       -
                   split = val.split('://')

     

       71
       71
       -
                   if len(split) > 1:

     

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

     

       73
       73
       -
                           tokens.append(cross.LinkToken(val, ''))

     

       74
       74
       -
                       elif label.endswith('...') and split[1].startswith(label[:-3]):

     

       75
       75
       -
                           tokens.append(cross.LinkToken(val, ''))

     

       76
       76
       -
                   else:

     

       77
       77
       -
                       tokens.append(cross.LinkToken(val, label))

     

       78
       78
       -
               elif ttype == 'tag':

     

       79
       79
       -
                   tokens.append(cross.TagToken(text[start:end]))

     

       80
       80
       -
               elif ttype == 'mention':

     

       81
       81
       -
                   tokens.append(cross.MentionToken(text[start:end], val))

     

       71
       71
       +
                       # try to unflatten links

     

       72
       72
       +
                       split = val.split('://')

     

       73
       73
       +
                       if len(split) > 1:

     

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

     

       75
       75
       +
                               tokens.append(cross.LinkToken(val, ''))

     

       76
       76
       +
                           elif label.endswith('...') and split[1].startswith(label[:-3]):

     

       77
       77
       +
                               tokens.append(cross.LinkToken(val, ''))

     

       78
       78
       +
                       else:

     

       79
       79
       +
                           tokens.append(cross.LinkToken(val, label))

     

       80
       80
       +
                   case 'tag':

     

       81
       81
       +
                       tokens.append(cross.TagToken(text[start:end]))

     

       82
       82
       +
                   case 'mention':

     

       83
       83
       +
                       tokens.append(cross.MentionToken(text[start:end], val))

     

       82
       84
        
               prev = end

     

       83
       85
        
       

     

       84
       86
        
           if prev < len(text):