Skip to content

Commit

Permalink
Merge pull request #3185 from HDInnovations/7.x.x
Browse files Browse the repository at this point in the history 
(Release) 7.0.1
  • Loading branch information
@HDVinnie
HDVinnie authored Oct 15, 2023
2 parents 076c544 + 7a5fc9d commit 6419a9f
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 37 deletions.
43 changes: 26 additions & 17 deletions database/migrations/2022_12_30_090331_update_user_notifications_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,47 @@ public function up(): void
->toArray();

//
// Input format looks like:
// Input format looks like ("1" means accepts notifications, "0" means blocks notifications):
// {
// "default_groups": {
// "1": 0,
// "2": 1,
// "3": 0,
// "4": 1,
// "4": 1
// }
// }
//
// Output format looks like:
// Output format looks like (Presence means blocks notifications)
// [
// 1,
// 3,
// 3
// ]
//

$migrate = fn ($groups) => array_keys(array_filter(
$groups,
fn ($groupId, $acceptsNotifications) => ! $acceptsNotifications && \in_array($groupId, $allowedGroups),
ARRAY_FILTER_USE_BOTH
));
$migrate = function ($jsonGroups) use ($allowedGroups) {
$new = [];
$old = json_decode($jsonGroups);

if (\is_object($old) && \is_object($old->default_groups)) {
foreach ($old->default_groups as $groupId => $acceptsNotifications) {
if (! $acceptsNotifications && \in_array($groupId, $allowedGroups)) {
$new[] = (int) $groupId;
}
}
}

return json_encode(array_values(array_unique($new)));
} ;

foreach (DB::table('user_notifications')->get() as $user_notification) {
$user_notification->json_account_groups = $migrate($user_notification->json_account_groups['default_groups']);
$user_notification->json_bon_groups = $migrate($user_notification->json_bon_groups['default_groups']);
$user_notification->json_mention_groups = $migrate($user_notification->json_mention_groups['default_groups']);
$user_notification->json_request_groups = $migrate($user_notification->json_request_groups['default_groups']);
$user_notification->json_torrent_groups = $migrate($user_notification->json_torrent_groups['default_groups']);
$user_notification->json_forum_groups = $migrate($user_notification->json_forum_groups['default_groups']);
$user_notification->json_following_groups = $migrate($user_notification->json_following_groups['default_groups']);
$user_notification->json_subscription_groups = $migrate($user_notification->json_subscription_groups['default_groups']);
$user_notification->json_account_groups = $migrate($user_notification->json_account_groups);
$user_notification->json_bon_groups = $migrate($user_notification->json_bon_groups);
$user_notification->json_mention_groups = $migrate($user_notification->json_mention_groups);
$user_notification->json_request_groups = $migrate($user_notification->json_request_groups);
$user_notification->json_torrent_groups = $migrate($user_notification->json_torrent_groups);
$user_notification->json_forum_groups = $migrate($user_notification->json_forum_groups);
$user_notification->json_following_groups = $migrate($user_notification->json_following_groups);
$user_notification->json_subscription_groups = $migrate($user_notification->json_subscription_groups);
$user_notification->save();
}
}
Expand Down
49 changes: 29 additions & 20 deletions database/migrations/2022_12_30_090351_update_user_privacy_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,50 @@ public function up(): void
->toArray();

//
// Input format looks like:
// Input format looks like ("1" means accepts notifications, "0" means blocks notifications):
// {
// "default_groups": {
// "1": 0,
// "2": 1,
// "3": 0,
// "4": 1,
// "4": 1
// }
// }
//
// Output format looks like:
// Output format looks like (Presence means blocks notifications)
// [
// 1,
// 3,
// 3
// ]
//

$migrate = fn ($groups) => array_keys(array_filter(
$groups,
fn ($groupId, $isAllowed) => ! $isAllowed && \in_array($groupId, $allowedGroups),
ARRAY_FILTER_USE_BOTH
));
$migrate = function ($jsonGroups) use ($allowedGroups) {
$new = [];
$old = json_decode($jsonGroups);

if (\is_object($old) && \is_object($old->default_groups)) {
foreach ($old->default_groups as $groupId => $isAllowed) {
if (! $isAllowed && \in_array($groupId, $allowedGroups)) {
$new[] = (int) $groupId;
}
}
}

return json_encode(array_values(array_unique($new)));
} ;

foreach (DB::table('user_privacy')->get() as $user_privacy) {
$user_privacy->json_profile_groups = $migrate($user_privacy->json_profile_groups['default_groups']);
$user_privacy->json_torrent_groups = $migrate($user_privacy->json_torrent_groups['default_groups']);
$user_privacy->json_forum_groups = $migrate($user_privacy->json_forum_groups['default_groups']);
$user_privacy->json_bon_groups = $migrate($user_privacy->json_bon_groups['default_groups']);
$user_privacy->json_comment_groups = $migrate($user_privacy->json_comment_groups['default_groups']);
$user_privacy->json_wishlist_groups = $migrate($user_privacy->json_wishlist_groups['default_groups']);
$user_privacy->json_follower_groups = $migrate($user_privacy->json_follower_groups['default_groups']);
$user_privacy->json_achievement_groups = $migrate($user_privacy->json_achievement_groups['default_groups']);
$user_privacy->json_rank_groups = $migrate($user_privacy->json_rank_groups['default_groups']);
$user_privacy->json_request_groups = $migrate($user_privacy->json_request_groups['default_groups']);
$user_privacy->json_other_groups = $migrate($user_privacy->json_other_groups['default_groups']);
$user_privacy->json_profile_groups = $migrate($user_privacy->json_profile_groups);
$user_privacy->json_torrent_groups = $migrate($user_privacy->json_torrent_groups);
$user_privacy->json_forum_groups = $migrate($user_privacy->json_forum_groups);
$user_privacy->json_bon_groups = $migrate($user_privacy->json_bon_groups);
$user_privacy->json_comment_groups = $migrate($user_privacy->json_comment_groups);
$user_privacy->json_wishlist_groups = $migrate($user_privacy->json_wishlist_groups);
$user_privacy->json_follower_groups = $migrate($user_privacy->json_follower_groups);
$user_privacy->json_achievement_groups = $migrate($user_privacy->json_achievement_groups);
$user_privacy->json_rank_groups = $migrate($user_privacy->json_rank_groups);
$user_privacy->json_request_groups = $migrate($user_privacy->json_request_groups);
$user_privacy->json_other_groups = $migrate($user_privacy->json_other_groups);
$user_privacy->save();
}
}
Expand Down

0 comments on commit 6419a9f

Please sign in to comment.