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

Merge pull request #2798 from pixelfed/staging

Browse source 
Auto Following support for admins
This commit is contained in:
daniel 2021-06-10 21:11:33 -06:00 committed by GitHub
commit 8dc6d17bfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 119 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.0...dev) ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.0...dev)
### Added ### Added
- WebP Support ([069a0e4a](https://github.com/pixelfed/pixelfed/commit/069a0e4a)) - WebP Support ([069a0e4a](https://github.com/pixelfed/pixelfed/commit/069a0e4a))
- Auto Following support for admins ([68aa2540](https://github.com/pixelfed/pixelfed/commit/68aa2540))
### Updated ### Updated
- Updated PrettyNumber, fix deprecated warning. ([20ec870b](https://github.com/pixelfed/pixelfed/commit/20ec870b)) - Updated PrettyNumber, fix deprecated warning. ([20ec870b](https://github.com/pixelfed/pixelfed/commit/20ec870b))

18
app/Http/Controllers/Admin/AdminSettingsController.php
View file

@ -135,7 +135,8 @@ trait AdminSettingsController
'enforce_account_limit' => 'pixelfed.enforce_account_limit', 'enforce_account_limit' => 'pixelfed.enforce_account_limit',
'show_custom_css' => 'uikit.show_custom.css', 'show_custom_css' => 'uikit.show_custom.css',
'show_custom_js' => 'uikit.show_custom.js', 'show_custom_js' => 'uikit.show_custom.js',
'cloud_storage' => 'pixelfed.cloud_storage' 'cloud_storage' => 'pixelfed.cloud_storage',
'account_autofollow' => 'account.autofollow'
]; ];
foreach ($bools as $key => $value) { foreach ($bools as $key => $value) {
@ -171,6 +172,21 @@ trait AdminSettingsController
} }
} }
if($request->filled('account_autofollow_usernames')) {
$usernames = explode(',', $request->input('account_autofollow_usernames'));
$names = [];
foreach($usernames as $n) {
$p = Profile::whereUsername($n)->first();
if(!$p) {
continue;
}
array_push($names, $p->username);
}
ConfigCacheService::put('account.autofollow_usernames', implode(',', $names));
}
Cache::forget(Config::CACHE_KEY); Cache::forget(Config::CACHE_KEY);
return redirect('/i/admin/settings')->with('status', 'Successfully updated settings!'); return redirect('/i/admin/settings')->with('status', 'Successfully updated settings!');

119
app/Observers/UserObserver.php
View file

@ -3,63 +3,88 @@
namespace App\Observers; namespace App\Observers;
use App\Jobs\AvatarPipeline\CreateAvatar; use App\Jobs\AvatarPipeline\CreateAvatar;
use App\Follower;
use App\Profile; use App\Profile;
use App\User; use App\User;
use App\UserSetting; use App\UserSetting;
use App\Jobs\FollowPipeline\FollowPipeline;
use DB; use DB;
class UserObserver class UserObserver
{ {
/** /**
* Listen to the User created event. * Listen to the User created event.
* *
* @param \App\User $user * @param \App\User $user
* *
* @return void * @return void
*/ */
public function saved(User $user) public function saved(User $user)
{ {
if($user->status == 'deleted') { if($user->status == 'deleted') {
return; return;
} }
if (empty($user->profile)) { if (empty($user->profile)) {
$profile = DB::transaction(function() use($user) { $profile = DB::transaction(function() use($user) {
$profile = new Profile(); $profile = new Profile();
$profile->user_id = $user->id; $profile->user_id = $user->id;
$profile->username = $user->username; $profile->username = $user->username;
$profile->name = $user->name; $profile->name = $user->name;
$pkiConfig = [ $pkiConfig = [
'digest_alg' => 'sha512', 'digest_alg' => 'sha512',
'private_key_bits' => 2048, 'private_key_bits' => 2048,
'private_key_type' => OPENSSL_KEYTYPE_RSA, 'private_key_type' => OPENSSL_KEYTYPE_RSA,
]; ];
$pki = openssl_pkey_new($pkiConfig); $pki = openssl_pkey_new($pkiConfig);
openssl_pkey_export($pki, $pki_private); openssl_pkey_export($pki, $pki_private);
$pki_public = openssl_pkey_get_details($pki); $pki_public = openssl_pkey_get_details($pki);
$pki_public = $pki_public['key']; $pki_public = $pki_public['key'];
$profile->private_key = $pki_private; $profile->private_key = $pki_private;
$profile->public_key = $pki_public; $profile->public_key = $pki_public;
$profile->save(); $profile->save();
return $profile; return $profile;
}); });
DB::transaction(function() use($user, $profile) {
$user = User::findOrFail($user->id);
$user->profile_id = $profile->id;
$user->save();
CreateAvatar::dispatch($profile); DB::transaction(function() use($user, $profile) {
}); $user = User::findOrFail($user->id);
$user->profile_id = $profile->id;
$user->save();
} CreateAvatar::dispatch($profile);
});
if (empty($user->settings)) { if(config_cache('account.autofollow') == true) {
DB::transaction(function() use($user) { $names = config_cache('account.autofollow_usernames');
UserSetting::firstOrCreate([ $names = explode(',', $names);
'user_id' => $user->id
]); if(!$names || !last($names)) {
}); return;
} }
}
$profiles = Profile::whereIn('username', $names)->get();
if($profiles) {
foreach($profiles as $p) {
$follower = new Follower;
$follower->profile_id = $profile->id;
$follower->following_id = $p->id;
$follower->save();
FollowPipeline::dispatch($follower);
}
}
}
}
if (empty($user->settings)) {
DB::transaction(function() use($user) {
UserSetting::firstOrCreate([
'user_id' => $user->id
]);
});
}
}
} }

5
app/Services/ConfigCacheService.php
View file

@ -45,7 +45,10 @@ class ConfigCacheService
'uikit.show_custom.js', 'uikit.show_custom.js',
'about.title', 'about.title',
'pixelfed.cloud_storage' 'pixelfed.cloud_storage',
'account.autofollow',
'account.autofollow_usernames'
]; ];
if(!config('instance.enable_cc')) { if(!config('instance.enable_cc')) {

34
resources/views/admin/settings/home.blade.php
View file

@ -184,19 +184,33 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="ml-n4 mr-n2 p-3 border-top border-bottom"> <div class="ml-n4 mr-n2 p-3 border-top">
<div class="custom-control custom-checkbox my-2"> <div class="custom-control custom-checkbox my-2">
<input type="checkbox" name="enforce_account_limit" class="custom-control-input" id="userEnforceLimit" {{config_cache('pixelfed.enforce_account_limit') ? 'checked' : ''}}> <input type="checkbox" name="enforce_account_limit" class="custom-control-input" id="userEnforceLimit" {{config_cache('pixelfed.enforce_account_limit') ? 'checked' : ''}}>
<label class="custom-control-label font-weight-bold" for="userEnforceLimit">Enable account storage limit</label> <label class="custom-control-label font-weight-bold" for="userEnforceLimit">Enable account storage limit</label>
<p class="help-text small text-muted">Set a storage limit per user account.</p> <p class="help-text small text-muted">Set a storage limit per user account.</p>
</div>
<label class="font-weight-bold text-muted">Account Limit</label>
<input class="form-control" name="account_limit" placeholder="Pixelfed" value="{{config_cache('pixelfed.max_account_size')}}">
<p class="help-text small text-muted mt-3 mb-0">Account limit size in KB.</p>
<p class="help-text small text-muted mb-0">{{config_cache('pixelfed.max_account_size')}} KB = {{floor(config_cache('pixelfed.max_account_size') / 1024)}} MB</p>
</div> </div>
<label class="font-weight-bold text-muted">Account Limit</label>
<input class="form-control" name="account_limit" placeholder="Pixelfed" value="{{config_cache('pixelfed.max_account_size')}}">
<p class="help-text small text-muted mt-3 mb-0">Account limit size in KB.</p>
<p class="help-text small text-muted mb-0">{{config_cache('pixelfed.max_account_size')}} KB = {{floor(config_cache('pixelfed.max_account_size') / 1024)}} MB</p>
</div> </div>
</div>
<div class="form-group">
<div class="ml-n4 mr-n2 p-3 border-top">
<div class="custom-control custom-checkbox my-2">
<input type="checkbox" name="account_autofollow" class="custom-control-input" id="userAccountAutofollow" {{config_cache('account.autofollow') ? 'checked' : ''}}>
<label class="custom-control-label font-weight-bold" for="userAccountAutofollow">Auto Follow Accounts</label>
<p class="help-text small text-muted">Enable auto follow accounts, new accounts will follow accounts you set.</p>
</div>
<label class="font-weight-bold text-muted">Accounts</label>
<textarea class="form-control" name="account_autofollow_usernames" placeholder="Add account usernames to follow separated by commas">{{config_cache('account.autofollow_usernames')}}</textarea>
<p class="help-text small text-muted mt-3 mb-0">Add account usernames to follow separated by commas.</p>
</div>
</div>
</div> </div>
<div class="tab-pane" id="media" role="tabpanel" aria-labelledby="media-tab"> <div class="tab-pane" id="media" role="tabpanel" aria-labelledby="media-tab">