YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Merge pull request #3195 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-01-28 23:23:43 -07:00 • committed by GitHub
commit c909e9757a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/InternalApiController.php
View file

@ -323,6 +323,9 @@ class InternalApiController extends Controller
->simplePaginate(10)
->map(function($bookmark) use($pid) {
$status = StatusService::get($bookmark->status_id, false);
if(!$status) {
return false;
}
$status['bookmarked_at'] = $bookmark->created_at->format('c');
if($status) {

2
public/js/spa.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -24,7 +24,7 @@
"/js/rempos.js": "/js/rempos.js?id=5f24e4ed251a202023f7",
"/js/rempro.js": "/js/rempro.js?id=2cc0d82e0cef827608c5",
"/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
"/js/spa.js": "/js/spa.js?id=bdd7e4a94786474132f8",
"/js/spa.js": "/js/spa.js?id=d8b884f1a52819e6e082",
"/js/status.js": "/js/status.js?id=40d0d3dd9884242ce66b",
"/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
"/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",