diff --git a/CHANGELOG.md b/CHANGELOG.md index eea057620..dbd114018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ - Updated AdminUserController, add moderation method ([a4cf21ea](https://github.com/pixelfed/pixelfed/commit/a4cf21ea)) - Updated BaseApiController, invalidate session after account deletion ([826978ce](https://github.com/pixelfed/pixelfed/commit/826978ce)) - Updated AdminUserController, add account deletion handler ([9be19ad8](https://github.com/pixelfed/pixelfed/commit/9be19ad8)) -- ([](https://github.com/pixelfed/pixelfed/commit/)) +- Updated ContactController, fixes #2042 ([c9057e87](https://github.com/pixelfed/pixelfed/commit/c9057e87)) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8) ### Added diff --git a/app/Console/Commands/Installer.php b/app/Console/Commands/Installer.php index 35d4a6573..c0efc633c 100644 --- a/app/Console/Commands/Installer.php +++ b/app/Console/Commands/Installer.php @@ -197,7 +197,7 @@ class Installer extends Command $this->updateEnvFile('CACHE_DRIVER', $cache ?? 'redis'); $session = $this->choice('Select session driver', ["redis", "file", "cookie", "database", "apc", "memcached", "array"], 0); - $this->updateEnvFile('SESSION_DRIVER', $cache ?? 'redis'); + $this->updateEnvFile('SESSION_DRIVER', $session ?? 'redis'); $redis_host = $this->ask('Set redis host', 'localhost'); $this->updateEnvFile('REDIS_HOST', $redis_host); diff --git a/app/Http/Controllers/Api/InstanceApiController.php b/app/Http/Controllers/Api/InstanceApiController.php index 9d078d64d..b7847b4f1 100644 --- a/app/Http/Controllers/Api/InstanceApiController.php +++ b/app/Http/Controllers/Api/InstanceApiController.php @@ -19,7 +19,6 @@ class InstanceApiController extends Controller { 'acct' => $admin->username, 'display_name' => e($admin->name), 'locked' => (bool) $admin->is_private, - 'bot' => false, 'created_at' => $admin->created_at->format('c'), 'note' => e($admin->bio), 'url' => $admin->url(), @@ -63,4 +62,4 @@ class InstanceApiController extends Controller { return response($res)->header('Content-Type', 'application/json'); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index e95553021..71b7f2004 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -42,6 +42,7 @@ class ContactController extends Controller $contact->user_id = $user->id; $contact->response_requested = $request_response; $contact->message = $message; + $contact->response = ''; $contact->save(); ContactPipeline::dispatchNow($contact); diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php index aebd69166..a21f556d6 100644 --- a/app/Http/Controllers/FederationController.php +++ b/app/Http/Controllers/FederationController.php @@ -27,7 +27,7 @@ use App\Util\ActivityPub\{ HttpSignature, Outbox }; -use \Zttp\Zttp; +use Zttp\Zttp; class FederationController extends Controller { diff --git a/app/Jobs/InboxPipeline/InboxValidator.php b/app/Jobs/InboxPipeline/InboxValidator.php index 9a595c99a..b16af5e10 100644 --- a/app/Jobs/InboxPipeline/InboxValidator.php +++ b/app/Jobs/InboxPipeline/InboxValidator.php @@ -13,7 +13,7 @@ use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use \Zttp\Zttp; +use Zttp\Zttp; class InboxValidator implements ShouldQueue { diff --git a/app/Services/FollowerService.php b/app/Services/FollowerService.php index e5dba73fc..4f938c747 100644 --- a/app/Services/FollowerService.php +++ b/app/Services/FollowerService.php @@ -12,8 +12,8 @@ use App\{ class FollowerService { protected $profile; - static $follower_prefix = 'px:profile:followers-v1.3:'; - static $following_prefix = 'px:profile:following-v1.3:'; + public static $follower_prefix = 'px:profile:followers-v1.3:'; + public static $following_prefix = 'px:profile:following-v1.3:'; public static function build() { @@ -68,4 +68,4 @@ class FollowerService { } } -} \ No newline at end of file +}