keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13588 from annando/issue-13511

Browse source 
Issue 13511: Ensure static community user settings
This commit is contained in:
Tobias Diekershoff 2023-10-29 21:37:16 +01:00 committed by GitHub
commit 104ce7c64f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------
-- Friendica 2023.09-rc (Giant Rhubarb)
-- DB_UPDATE_VERSION 1538
-- DB_UPDATE_VERSION 1539
-- ------------------------------------------

29
src/Model/User.php
View file

@ -343,6 +343,35 @@ class User
return DBA::selectFirst('user', $fields, ['nickname' => $nickname]);
}
/**
* Set static settings for community user accounts
*
* @param integer $uid
* @return void
*/
public static function setCommunityUserSettings(int $uid)
{
$user = self::getById($uid, ['account-type', 'page-flags']);
if ($user['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
return;
}
DI::pConfig()->set($uid, 'system', 'unlisted', true);
$fields = [
'allow_cid' => '',
'allow_gid' => $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP ? '<' . Circle::FOLLOWERS . '>' : '',
'deny_cid' => '',
'deny_gid' => '',
'blockwall' => true,
'hidewall' => true,
];
User::update($fields, $uid);
Profile::update(['hide-friends' => true], $uid);
}
/**
* Returns the user id of a given profile URL
*

30
src/Module/Settings/Account.php
View file

@ -199,6 +199,7 @@ class Account extends BaseSettings
DI::sysmsg()->addNotice(DI::l10n()->t('Settings were not updated.'));
}
User::setCommunityUserSettings(DI::userSession()->getLocalUserId());
DI::baseUrl()->redirect($redirectUrl);
}
@ -321,37 +322,16 @@ class Account extends BaseSettings
$page_flags = User::PAGE_FLAGS_COMMUNITY;
}
$fields = [];
$profile_fields = [];
if ($account_type == User::ACCOUNT_TYPE_COMMUNITY) {
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'unlisted', true);
$fields = [
'allow_cid' => '',
'allow_gid' => $page_flags == User::PAGE_FLAGS_PRVGROUP ?
'<' . Circle::FOLLOWERS . '>'
: '',
'deny_cid' => '',
'deny_gid' => '',
'blockwall' => true,
'blocktags' => true,
];
$profile_fields = [
'hide-friends' => true,
];
}
$fields = array_merge($fields, [
$fields = [
'page-flags' => $page_flags,
'account-type' => $account_type,
]);
];
if (!User::update($fields, DI::userSession()->getLocalUserId()) || !empty($profile_fields) && !Profile::update($profile_fields, DI::userSession()->getLocalUserId())) {
if (!User::update($fields, DI::userSession()->getLocalUserId())) {
DI::sysmsg()->addNotice(DI::l10n()->t('Settings were not updated.'));
}
User::setCommunityUserSettings(DI::userSession()->getLocalUserId());
DI::baseUrl()->redirect($redirectUrl);
}

2
static/dbstructure.config.php
View file

@ -56,7 +56,7 @@ use Friendica\Database\DBA;
// This file is required several times during the test in DbaDefinition which justifies this condition
if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1538);
define('DB_UPDATE_VERSION', 1539);
}
return [

11
update.php
View file

@ -1398,5 +1398,16 @@ function update_1535()
}
DI::config()->delete('system', 'compute_group_counts');
return Update::SUCCESS;
}
function update_1539()
{
$users = DBA::select('user', ['uid'], ['account-type' => User::ACCOUNT_TYPE_COMMUNITY]);
while ($user = DBA::fetch($users)) {
User::setCommunityUserSettings($user['uid']);
}
DBA::close($users);
return Update::SUCCESS;
}