Remove EXP_EMC flag, Mastodon API compatibility is always enforced

Remove the 'emc' entry from config/exp.php and all conditional checks.
The Mastodon API compatibility stripping in StatusService and
AccountService is now unconditional.

- config/exp.php: remove emc entry
- StatusService: remove early-return when emc is false
- AccountService: remove early-return when emc is false
- Installer: stop writing EXP_EMC to .env
- .env.example, .env.docker.example: remove EXP_EMC
- Diagnostics: remove EXP_EMC row
pull/6580/head
Your Name 3 months ago
parent 0a41c9e387
commit 16359073da

@ -61,9 +61,6 @@ AP_INBOX="true"
AP_OUTBOX="true"
AP_SHAREDINBOX="true"
# Experimental Configuration
EXP_EMC="true"
# Mail Configuration
# Configure after initial setup
MAIL_DRIVER="smtp"

@ -55,9 +55,6 @@ AP_INBOX="false"
AP_OUTBOX="false"
AP_SHAREDINBOX="false"
# Experimental Configuration
EXP_EMC="true"
## Mail Configuration (Post-Installer)
MAIL_DRIVER=log
MAIL_HOST=smtp.mailtrap.io

@ -393,7 +393,6 @@ class Installer extends Command
$this->updateEnvFile('OPEN_REGISTRATION', $open_registration);
$this->updateEnvFile('ENFORCE_EMAIL_VERIFICATION', $enforce_email_verification);
$this->updateEnvFile('OAUTH_ENABLED', $enable_mobile_apis);
$this->updateEnvFile('EXP_EMC', $enable_mobile_apis);
}
protected function mediaSettings()

@ -49,10 +49,6 @@ class AccountService
return null;
}
if (config('exp.emc') == false) {
return $account;
}
unset(
$account['header_bg'],
$account['is_admin'],

@ -64,10 +64,6 @@ class StatusService
$status['replies_count'] = $status['reply_count'];
if (config('exp.emc') == false) {
return $status;
}
unset(
$status['_v'],
$status['comments_disabled'],

@ -33,9 +33,6 @@ return [
// Single page application (beta)
'spa' => true,
// Enforce Mastoapi Compatibility (alpha)
'emc' => env('EXP_EMC', true),
// HLS Live Streaming
'hls' => env('HLS_LIVE', false),

@ -321,12 +321,6 @@
<td><strong>EXP_GPS</strong></td>
<td><span>{{config_cache('exp.gps') ? '✅ true' : '❌ false' }}</span></td>
</tr>
<tr>
<td><span class="badge badge-primary">EXP</span></td>
<td><strong>EXP_EMC</strong></td>
<td><span>{{config_cache('exp.emc') ? '✅ true' : '❌ false' }}</span></td>
</tr>
<tr>
<td><span class="badge badge-primary">FEDERATION</span></td>
<td><strong>ACTIVITY_PUB</strong></td>

Loading…
Cancel
Save