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

Merge pull request #2051 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2020-02-22 21:11:22 -07:00 committed by GitHub
commit 49daa39bb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -23,7 +23,7 @@
- Updated AdminUserController, add moderation method ([a4cf21ea](https://github.com/pixelfed/pixelfed/commit/a4cf21ea)) - 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 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)) - 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) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8)
### Added ### Added

2
app/Console/Commands/Installer.php
View file

@ -197,7 +197,7 @@ class Installer extends Command
$this->updateEnvFile('CACHE_DRIVER', $cache ?? 'redis'); $this->updateEnvFile('CACHE_DRIVER', $cache ?? 'redis');
$session = $this->choice('Select session driver', ["redis", "file", "cookie", "database", "apc", "memcached", "array"], 0); $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'); $redis_host = $this->ask('Set redis host', 'localhost');
$this->updateEnvFile('REDIS_HOST', $redis_host); $this->updateEnvFile('REDIS_HOST', $redis_host);

1
app/Http/Controllers/Api/InstanceApiController.php
View file

@ -19,7 +19,6 @@ class InstanceApiController extends Controller {
'acct' => $admin->username, 'acct' => $admin->username,
'display_name' => e($admin->name), 'display_name' => e($admin->name),
'locked' => (bool) $admin->is_private, 'locked' => (bool) $admin->is_private,
'bot' => false,
'created_at' => $admin->created_at->format('c'), 'created_at' => $admin->created_at->format('c'),
'note' => e($admin->bio), 'note' => e($admin->bio),
'url' => $admin->url(), 'url' => $admin->url(),

1
app/Http/Controllers/ContactController.php
View file

@ -42,6 +42,7 @@ class ContactController extends Controller
$contact->user_id = $user->id; $contact->user_id = $user->id;
$contact->response_requested = $request_response; $contact->response_requested = $request_response;
$contact->message = $message; $contact->message = $message;
$contact->response = '';
$contact->save(); $contact->save();
ContactPipeline::dispatchNow($contact); ContactPipeline::dispatchNow($contact);

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

@ -27,7 +27,7 @@ use App\Util\ActivityPub\{
HttpSignature, HttpSignature,
Outbox Outbox
}; };
use \Zttp\Zttp; use Zttp\Zttp;
class FederationController extends Controller class FederationController extends Controller
{ {

2
app/Jobs/InboxPipeline/InboxValidator.php
View file

@ -13,7 +13,7 @@ use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use \Zttp\Zttp; use Zttp\Zttp;
class InboxValidator implements ShouldQueue class InboxValidator implements ShouldQueue
{ {

4
app/Services/FollowerService.php
View file

@ -12,8 +12,8 @@ use App\{
class FollowerService { class FollowerService {
protected $profile; protected $profile;
static $follower_prefix = 'px:profile:followers-v1.3:'; public static $follower_prefix = 'px:profile:followers-v1.3:';
static $following_prefix = 'px:profile:following-v1.3:'; public static $following_prefix = 'px:profile:following-v1.3:';
public static function build() public static function build()
{ {