commit 59906c0d39dd4a4ba9fee2bc4a80235ac1c03dd3 · veryroundbird.house/smallbird-social

+26

css/main.scss

···

       252
       252
        
           justify-content: space-between;

     

       253
       253
        
           margin-top: 10px;

     

       254
       254
        
         }

     

       255
       255
       +
       }

     

       256
       256
       +
       

     

       257
       257
       +
       [popover] {

     

       258
       258
       +
         max-height: calc(100% - 40px);

     

       259
       259
       +
         max-width: calc(100% - 40px);

     

       260
       260
       +
         display: none;

     

       261
       261
       +
         grid-template-rows: 1fr auto;

     

       262
       262
       +
         border: 1px var(--border-color) solid;

     

       263
       263
       +
         background-color: var(--background-color);

     

       264
       264
       +
         

     

       265
       265
       +
         &:popover-open {

     

       266
       266
       +
           display: grid;

     

       267
       267
       +
         }

     

       268
       268
       +
         

     

       269
       269
       +
         img {

     

       270
       270
       +
           object-fit: contain;

     

       271
       271
       +
         }

     

       272
       272
       +
         

     

       273
       273
       +
         .alt {

     

       274
       274
       +
           padding: 10px;

     

       275
       275
       +
         }

     

       276
       276
       +
       }

     

       277
       277
       +
       

     

       278
       278
       +
       ::backdrop {

     

       279
       279
       +
         backdrop-filter: blur(5px);

     

       280
       280
       +
         background-color: color-mix(in srgb-linear, var(--background-color), rgba(0,0,0,.35) 20%);

     

       255
       281
        
       }

+23 -11

lib/bskyOperations.php

···

       1
       1
        
       <?php

     

       2
       2
        
       namespace Smallnest\BskyOps;

     

       3
       3
        
       

     

       4
       4
       +
       require_once('config.php');

     

       4
       5
        
       require_once('vendor/autoload.php');

     

       5
       6
        
       require_once('lib/bskyProvider.php');

     

       6
       7
        
       

     
···

       62
       63
        
           $embeds = $this->renderEmbeds($post->embedType, $post->embeds, $post);

     

       63
       64
        
           $imageEmbedClass = $post->embedType === "images" ? " img-".count($post->embeds) : "";

     

       64
       65
        
           echo <<<EOD

     

       65
       65
       -
       <div class="post">

     

       66
       66
       +
       <div class="post" data-cursor="$post->cursor">

     

       66
       67
        
         <div class="postHeader">

     

       67
       68
        
           <div class="avatar">

     

       68
       69
        
             <a href="$profileLink"><img src="$post->avatar" /></a>

     
···

       92
       93
        
       

     

       93
       94
        
         function renderEmbeds($type, $embeds, $context) {

     

       94
       95
        
           $ret = "";

     

       95
       95
       -
           print_r($embeds);

     

       96
       96
        
           if ($type === 'images') {

     

       97
       97
        
             $imageCount = count($embeds);

     

       98
       98
        
             foreach ($embeds as $embed) {

     
···

       110
       110
        
           } else if ($type === 'video') {

     

       111
       111
        
             $thumb = $embeds[0]->thumb;

     

       112
       112
        
             $vid = $embeds[0]->video;

     

       113
       113
       +
             $author = $context->did;

     

       114
       114
       +
             $pds = DEFAULT_PDS;

     

       113
       115
        
             $ret .= <<<EOD

     

       114
       116
        
       <div class="video">

     

       115
       115
       -
         <video poster="$thumb" src="$vid" controls type="application/x-mpegURL" />

     

       117
       117
       +
         <video

     

       118
       118
       +
           src="$pds/xrpc/com.atproto.sync.getBlob?did=$author&cid=$vid"

     

       119
       119
       +
           controls

     

       120
       120
       +
         ></video>

     

       116
       121
        
       </div>

     

       117
       122
        
       EOD;

     

       118
       123
        
           } else if ($type === 'external') {

     

       124
       124
       +
             $title = $embeds[0]->title;

     

       125
       125
       +
             $uri = $embeds[0]->uri;

     

       126
       126
       +
             $thumb = $embeds[0]->thumb;

     

       127
       127
       +
             $desc = $embeds[0]->description;

     

       119
       128
        
             $ret .= <<<EOD

     

       120
       129
        
       <div class="externalLink">

     

       121
       121
       -
         <a href="$embeds[0]->uri" rel="external" target="_blank">

     

       130
       130
       +
         <a href="$uri" rel="external" target="_blank">

     

       122
       131
        
           <div class="externalLinkImage">

     

       123
       123
       -
             <img src="$embeds[0]->thumb" alt="$embeds[0]->title" />

     

       132
       132
       +
             <img src="$thumb" alt="$title" />

     

       124
       133
        
           </div>

     

       125
       134
        
           <div class="externalLinkInfo">

     

       126
       126
       -
             <div class="externalLinkTitle">$embeds[0]->title</div>

     

       127
       127
       -
             <div class="externalLinkDesc">$embeds[0]->description</div>

     

       128
       128
       -
             <div class="externalLinkUri">$embeds[0]->uri</div>

     

       135
       135
       +
             <div class="externalLinkTitle">$title</div>

     

       136
       136
       +
             <div class="externalLinkDesc">$desc</div>

     

       137
       137
       +
             <div class="externalLinkUri">$uri</div>

     

       129
       138
        
           </div>

     

       130
       139
        
         </a>

     

       131
       140
        
       </div>

     
···

       141
       150
        
           }

     

       142
       151
        
           

     

       143
       152
        
           $feedData = json_decode(file_get_contents($this->bskyApiBase.$this->apiEndpoints['getFeed']."?feed=".$atUri));

     

       144
       144
       -
           $feed = array_map(function($f) {

     

       153
       153
       +
           $cursor = $feedData->cursor;

     

       154
       154
       +
           $feed = array_map(function($f) use ($cursor) {

     

       145
       155
        
             $post = $f->post;

     

       146
       156
        
             preg_match('/\/([a-z0-9]+)$/', $post->uri, $postIdRegex);

     

       147
       157
        
             $pid = $postIdRegex[1];

     
···

       175
       185
        
                 $embedType = 'images';

     

       176
       186
        
               } elseif ($post->embed->{'$type'} === 'app.bsky.embed.video#view') {

     

       177
       187
        
                 $embeds = [(object) [

     

       178
       178
       -
                   "video" => $post->embed->playlist,

     

       188
       188
       +
                   "video" => $post->embed->cid,

     

       179
       189
        
                   "thumb" => $post->embed->thumbnail

     

       180
       190
        
                 ]];

     

       181
       191
        
                 $embedType = 'video';

     
···

       188
       198
        
             return (object) [

     

       189
       199
        
               'displayName' => $post->author->displayName,

     

       190
       200
        
               'handle' => $post->author->handle,

     

       201
       201
       +
               'did' => $post->author->did,

     

       191
       202
        
               'postId' => $pid,

     

       192
       203
        
               'avatar' => $post->author->avatar,

     

       193
       204
        
               'content' => $post->record->text,

     
···

       198
       209
        
               'quoteCount' => $post->quoteCount,

     

       199
       210
        
               'createdAt' => $post->record->createdAt,

     

       200
       211
        
               'embedType' => $embedType,

     

       201
       201
       -
               'embeds' => $embeds

     

       212
       212
       +
               'embeds' => $embeds,

     

       213
       213
       +
               'cursor' => $cursor

     

       202
       214
        
             ];

     

       203
       215
        
           }, $feedData->feed);

     

       204
       216
        
           return $feed;