mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Use integers and not numbers in notification policy API counters (#29810)

Browse Source
This commit is contained in:
Renaud Chaput 2024-04-02 12:06:26 +02:00 committed by GitHub
parent d05f62391d
commit b4d991adaa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
View File

@ -27,7 +27,7 @@ export const FilteredNotificationsBanner = () => {
};
}, [dispatch]);
if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) * 1 === 0) {
if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) {
return null;
}

8
app/javascript/mastodon/utils/numbers.ts
View File

@ -70,10 +70,10 @@ export function roundTo10(num: number): number {
return Math.round(num * 0.1) / 0.1;
}
export function toCappedNumber(num: string): string {
if (parseInt(num) > 99) {
return '99+';
export function toCappedNumber(num: number, max = 99): string {
if (num > max) {
return `${max}+`;
} else {
return num;
return num.toString();
}
}

4
app/serializers/rest/notification_policy_serializer.rb
View File

@ -9,8 +9,8 @@ class REST::NotificationPolicySerializer < ActiveModel::Serializer
def summary
{
pending_requests_count: object.pending_requests_count.to_s,
pending_notifications_count: object.pending_notifications_count.to_s,
pending_requests_count: object.pending_requests_count.to_i,
pending_notifications_count: object.pending_notifications_count.to_i,
}
end
end

8
spec/requests/api/v1/notifications/policies_spec.rb
View File

@ -32,8 +32,8 @@ RSpec.describe 'Policies' do
filter_new_accounts: false,
filter_private_mentions: true,
summary: a_hash_including(
pending_requests_count: '1',
pending_notifications_count: '0'
pending_requests_count: 1,
pending_notifications_count: 0
)
)
end
@ -60,8 +60,8 @@ RSpec.describe 'Policies' do
filter_new_accounts: false,
filter_private_mentions: true,
summary: a_hash_including(
pending_requests_count: '0',
pending_notifications_count: '0'
pending_requests_count: 0,
pending_notifications_count: 0
)
)
end