kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-04-02

Browse Source
This commit is contained in:
github-actions
2024-04-02 07:47:24 +02:00
parent 9e5faf919f
commit 746f1fd300
86 changed files with 84794 additions and 84469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/Support/Preferences.php
View File

@@ -44,14 +44,15 @@ class Preferences
}
return Preference::where('user_id', $user->id)
->where(function (Builder $q) use ($user) {
$q->whereNull('user_group_id');
$q->orWhere('user_group_id', $user->user_group_id);
})
->get();
->where(function (Builder $q) use ($user): void {
$q->whereNull('user_group_id');
$q->orWhere('user_group_id', $user->user_group_id);
})
->get()
;
}
public function get(string $name, null | array | bool | int | string $default = null): ?Preference
public function get(string $name, null|array|bool|int|string $default = null): ?Preference
{
/** @var null|User $user */
$user = auth()->user();
@@ -65,11 +66,11 @@ class Preferences
return $this->getForUser($user, $name, $default);
}
public function getForUser(User $user, string $name, null | array | bool | int | string $default = null): ?Preference
public function getForUser(User $user, string $name, null|array|bool|int|string $default = null): ?Preference
{
// don't care about user group ID, except for some specific preferences.
$userGroupId = $this->getUserGroupId($user, $name);
$preference = Preference::where('user_group_id', $userGroupId)->where('user_id', $user->id)->where('name', $name)->first(['id', 'user_id', 'name', 'data', 'updated_at', 'created_at']);
$preference = Preference::where('user_group_id', $userGroupId)->where('user_id', $user->id)->where('name', $name)->first(['id', 'user_id', 'name', 'data', 'updated_at', 'created_at']);
if (null !== $preference && null === $preference->data) {
$preference->delete();
@@ -106,14 +107,14 @@ class Preferences
Cache::put($key, '', 5);
}
public function setForUser(User $user, string $name, null | array | bool | int | string $value): Preference
public function setForUser(User $user, string $name, null|array|bool|int|string $value): Preference
{
$fullName = sprintf('preference%s%s', $user->id, $name);
$groupId = $this->getUserGroupId($user, $name);
$fullName = sprintf('preference%s%s', $user->id, $name);
$groupId = $this->getUserGroupId($user, $name);
Cache::forget($fullName);
/** @var null|Preference $pref */
$pref = Preference::where('user_group_id', $groupId)->where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data', 'updated_at', 'created_at']);
$pref = Preference::where('user_group_id', $groupId)->where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data', 'updated_at', 'created_at']);
if (null !== $pref && null === $value) {
$pref->delete();
@@ -138,7 +139,7 @@ class Preferences
public function beginsWith(User $user, string $search): Collection
{
return Preference::where('user_id', $user->id)->where('name', 'LIKE', $search . '%')->get();
return Preference::where('user_id', $user->id)->where('name', 'LIKE', $search.'%')->get();
}
/**
@@ -152,14 +153,14 @@ class Preferences
public function getArrayForUser(User $user, array $list): array
{
$result = [];
$preferences = Preference
::where('user_id', $user->id)
->where(function (Builder $q) use ($user) {
$preferences = Preference::where('user_id', $user->id)
->where(function (Builder $q) use ($user): void {
$q->whereNull('user_group_id');
$q->orWhere('user_group_id', $user->user_group_id);
})
->whereIn('name', $list)
->get(['id', 'name', 'data']);
->get(['id', 'name', 'data'])
;
/** @var Preference $preference */
foreach ($preferences as $preference) {
@@ -174,7 +175,7 @@ class Preferences
return $result;
}
public function getFresh(string $name, null | array | bool | int | string $default = null): ?Preference
public function getFresh(string $name, null|array|bool|int|string $default = null): ?Preference
{
/** @var null|User $user */
$user = auth()->user();
@@ -212,7 +213,7 @@ class Preferences
Session::forget('first');
}
public function set(string $name, null | array | bool | int | string $value): Preference
public function set(string $name, null|array|bool|int|string $value): Preference
{
/** @var User $user */
$user = auth()->user();
@@ -235,6 +236,7 @@ class Preferences
if (in_array($preferenceName, $items, true)) {
$groupId = (int)$user->user_group_id;
}
return $groupId;
}
}