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

Merge pull request #4375 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-05-13 07:02:16 -06:00 committed by GitHub
commit 5a8e0ab5df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ComposeController.php
View file

@ -673,7 +673,7 @@ class ComposeController extends Controller
$status->caption = strip_tags($request->caption);
$status->profile_id = $profile->id;
$entities = Extractor::create()->extract($status->caption);
$entities = [];
$visibility = $profile->unlisted == true && $visibility == 'public' ? 'unlisted' : $visibility;
$cw = $profile->cw == true ? true : $cw;
$status->is_nsfw = $cw;

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

@ -89,7 +89,6 @@ class StatusEntityLexer implements ShouldQueue
DB::transaction(function () {
$status = $this->status;
$status->rendered = nl2br($this->autolink);
$status->entities = json_encode($this->entities);
$status->save();
});
}

31
database/migrations/2023_05_13_045228_remove_unused_columns_from_notifications_table.php Normal file
View file

@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('notifications', function (Blueprint $table) {
if(Schema::hasColumn('notifications', 'message')) {
$table->dropColumn('message');
}
if(Schema::hasColumn('notifications', 'rendered')) {
$table->dropColumn('rendered');
}
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
}
};