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

Merge pull request #3164 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-01-17 17:13:45 -07:00 committed by GitHub
commit b95e416c1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -2,6 +2,9 @@
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.2...dev) ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.2...dev)
### Updated
- Updated MediaStorageService, fix remote avatar bug. ([1c20d696](https://github.com/pixelfed/pixelfed/commit/1c20d696))
## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2) ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)
### Breaking ### Breaking

14
app/Jobs/StatusPipeline/StatusDelete.php
View file

@ -61,16 +61,12 @@ class StatusDelete implements ShouldQueue
$status = $this->status; $status = $this->status;
$profile = $this->status->profile; $profile = $this->status->profile;
StatusService::del($status->id); StatusService::del($status->id, true);
$count = $profile->statuses()
->getQuery()
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
->whereNull('in_reply_to_id')
->whereNull('reblog_of_id')
->count();
$profile->status_count = ($count - 1); if(in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
$profile->save(); $profile->status_count = $profile->status_count - 1;
$profile->save();
}
if(config_cache('federation.activitypub.enabled') == true) { if(config_cache('federation.activitypub.enabled') == true) {
$this->fanoutDelete($status); $this->fanoutDelete($status);

14
app/Jobs/StatusPipeline/StatusEntityLexer.php
View file

@ -52,16 +52,12 @@ class StatusEntityLexer implements ShouldQueue
public function handle() public function handle()
{ {
$profile = $this->status->profile; $profile = $this->status->profile;
$status = $this->status;
$count = $profile->statuses() if(in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
->getQuery() $profile->status_count = $profile->status_count + 1;
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) $profile->save();
->whereNull('in_reply_to_id') }
->whereNull('reblog_of_id')
->count();
$profile->status_count = $count;
$profile->save();
if($profile->no_autolink == false) { if($profile->no_autolink == false) {
$this->parseEntities(); $this->parseEntities();

25
app/Services/MediaStorageService.php
View file

@ -43,16 +43,25 @@ class MediaStorageService {
$h = $r->getHeaders(); $h = $r->getHeaders();
if (isset($h['Content-Length'], $h['Content-Type']) == false) { if (isset($h['content-length']) && isset($h['content-type'])) {
return false; if(empty($h['content-length']) || empty($h['content-type'])) {
return false;
}
$len = is_array($h['content-length']) ? $h['content-length'][0] : $h['content-length'];
$mime = is_array($h['content-type']) ? $h['content-type'][0] : $h['content-type'];
} else {
if (isset($h['Content-Length'], $h['Content-Type']) == false) {
return false;
}
if(empty($h['Content-Length']) || empty($h['Content-Type']) ) {
return false;
}
$len = is_array($h['Content-Length']) ? $h['Content-Length'][0] : $h['Content-Length'];
$mime = is_array($h['Content-Type']) ? $h['Content-Type'][0] : $h['Content-Type'];
} }
if(empty($h['Content-Length']) || empty($h['Content-Type']) ) {
return false;
}
$len = is_array($h['Content-Length']) ? $h['Content-Length'][0] : $h['Content-Length'];
$mime = is_array($h['Content-Type']) ? $h['Content-Type'][0] : $h['Content-Type'];
if($len < 10 || $len > ((config_cache('pixelfed.max_photo_size') * 1000))) { if($len < 10 || $len > ((config_cache('pixelfed.max_photo_size') * 1000))) {
return false; return false;