UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 17:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update AP Inbox

Browse source
This commit is contained in:
Daniel Supernault 2020-11-18 19:08:21 -07:00
parent 11a616b67d
commit 86765001e6
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/Util/ActivityPub/Inbox.php
View file

@ -213,6 +213,11 @@ class Inbox
$msg = $activity['content']; $msg = $activity['content'];
$msgText = strip_tags($activity['content']); $msgText = strip_tags($activity['content']);
if(Str::startsWith($msgText, '@' . $profile->username)) {
$len = strlen('@' . $profile->username);
$msgText = substr($msgText, $len + 1);
}
if($profile->user->settings->public_dm == false || $profile->is_private) { if($profile->user->settings->public_dm == false || $profile->is_private) {
if($profile->follows($actor) == true) { if($profile->follows($actor) == true) {
$hidden = false; $hidden = false;
@ -242,7 +247,10 @@ class Inbox
$dm->save(); $dm->save();
if(count($activity['attachment'])) { if(count($activity['attachment'])) {
$photos = 0;
$videos = 0;
$allowed = explode(',', config('pixelfed.media_types')); $allowed = explode(',', config('pixelfed.media_types'));
$activity['attachment'] = array_slice($activity['attachment'], 0, config('pixelfed.max_album_length'));
foreach($activity['attachment'] as $a) { foreach($activity['attachment'] as $a) {
$type = $a['mediaType']; $type = $a['mediaType'];
$url = $a['url']; $url = $a['url'];
@ -260,6 +268,21 @@ class Inbox
$media->remote_url = $url; $media->remote_url = $url;
$media->mime = $type; $media->mime = $type;
$media->save(); $media->save();
if(explode('/', $type)[0] == 'image') {
$photos = $photos + 1;
}
if(explode('/', $type)[0] == 'video') {
$videos = $videos + 1;
}
}
if($photos && $videos == 0) {
$dm->type = $photos == 1 ? 'photo' : 'photos';
$dm->save();
}
if($videos && $photos == 0) {
$dm->type = $videos == 1 ? 'video' : 'videos';
$dm->save();
} }
} }