mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Compare commits
4 commits
90d787dda4
...
1649e2ad42
Author | SHA1 | Date | |
---|---|---|---|
|
1649e2ad42 | ||
|
a50c8e951f | ||
|
2c1e75727d | ||
|
9e52bfede0 |
8 changed files with 32 additions and 41 deletions
4
.github/renovate.json5
vendored
4
.github/renovate.json5
vendored
|
@ -95,8 +95,8 @@
|
|||
{
|
||||
// Group all eslint-related packages with `eslint` in the same PR
|
||||
matchManagers: ['npm'],
|
||||
matchPackageNames: ['eslint'],
|
||||
matchPackagePrefixes: ['eslint-', '@typescript-eslint/'],
|
||||
matchPackageNames: ['eslint', 'typescript-eslint'],
|
||||
matchPackagePrefixes: ['eslint-'],
|
||||
matchUpdateTypes: ['patch', 'minor'],
|
||||
groupName: 'eslint (non-major)',
|
||||
},
|
||||
|
|
|
@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {
|
|||
|
||||
interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
|
||||
type: NotificationWithStatusType;
|
||||
status: ApiStatusJSON;
|
||||
status_id: string;
|
||||
}
|
||||
|
||||
interface NotificationWithStatusJSON extends BaseNotificationJSON {
|
||||
|
|
|
@ -49,22 +49,15 @@ export const FilteredNotificationsBanner: React.FC = () => {
|
|||
<span>
|
||||
<FormattedMessage
|
||||
id='filtered_notifications_banner.pending_requests'
|
||||
defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
|
||||
defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
|
||||
values={{ count: policy.summary.pending_requests_count }}
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className='filtered-notifications-banner__badge'>
|
||||
<div className='filtered-notifications-banner__badge__badge'>
|
||||
{toCappedNumber(policy.summary.pending_notifications_count)}
|
||||
</div>
|
||||
<FormattedMessage
|
||||
id='filtered_notifications_banner.mentions'
|
||||
defaultMessage='{count, plural, one {mention} other {mentions}}'
|
||||
values={{ count: policy.summary.pending_notifications_count }}
|
||||
/>
|
||||
</div>
|
||||
</Link>
|
||||
);
|
||||
};
|
||||
|
|
|
@ -300,8 +300,7 @@
|
|||
"filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
|
||||
"filter_modal.select_filter.title": "Filter this post",
|
||||
"filter_modal.title.status": "Filter a post",
|
||||
"filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
|
||||
"filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
|
||||
"filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
|
||||
"filtered_notifications_banner.title": "Filtered notifications",
|
||||
"firehose.all": "All",
|
||||
"firehose.local": "This server",
|
||||
|
|
|
@ -124,9 +124,9 @@ export function createNotificationGroupFromJSON(
|
|||
case 'mention':
|
||||
case 'poll':
|
||||
case 'update': {
|
||||
const { status, ...groupWithoutStatus } = group;
|
||||
const { status_id: statusId, ...groupWithoutStatus } = group;
|
||||
return {
|
||||
statusId: status.id,
|
||||
statusId,
|
||||
sampleAccountIds,
|
||||
...groupWithoutStatus,
|
||||
};
|
||||
|
|
|
@ -10170,20 +10170,6 @@ noscript {
|
|||
}
|
||||
}
|
||||
|
||||
&__badge {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
border-radius: 999px;
|
||||
background: var(--background-border-color);
|
||||
color: $darker-text-color;
|
||||
padding: 4px;
|
||||
padding-inline-end: 8px;
|
||||
gap: 6px;
|
||||
font-weight: 500;
|
||||
font-size: 11px;
|
||||
line-height: 16px;
|
||||
word-break: keep-all;
|
||||
|
||||
&__badge {
|
||||
background: $ui-button-background-color;
|
||||
color: $white;
|
||||
|
@ -10191,7 +10177,6 @@ noscript {
|
|||
padding: 2px 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.notification-request {
|
||||
display: flex;
|
||||
|
|
|
@ -170,8 +170,6 @@
|
|||
"@types/requestidlecallback": "^0.3.5",
|
||||
"@types/webpack": "^4.41.33",
|
||||
"@types/webpack-env": "^1.18.4",
|
||||
"@typescript-eslint/eslint-plugin": "^7.0.0",
|
||||
"@typescript-eslint/parser": "^7.0.0",
|
||||
"babel-jest": "^29.5.0",
|
||||
"eslint": "^8.41.0",
|
||||
"eslint-define-config": "^2.0.0",
|
||||
|
@ -192,6 +190,7 @@
|
|||
"stylelint": "^16.0.2",
|
||||
"stylelint-config-standard-scss": "^13.0.0",
|
||||
"typescript": "^5.0.4",
|
||||
"typescript-eslint": "^7.17.0",
|
||||
"webpack-dev-server": "^3.11.3"
|
||||
},
|
||||
"resolutions": {
|
||||
|
|
23
yarn.lock
23
yarn.lock
|
@ -2810,8 +2810,6 @@ __metadata:
|
|||
"@types/requestidlecallback": "npm:^0.3.5"
|
||||
"@types/webpack": "npm:^4.41.33"
|
||||
"@types/webpack-env": "npm:^1.18.4"
|
||||
"@typescript-eslint/eslint-plugin": "npm:^7.0.0"
|
||||
"@typescript-eslint/parser": "npm:^7.0.0"
|
||||
arrow-key-navigation: "npm:^1.2.0"
|
||||
async-mutex: "npm:^0.5.0"
|
||||
autoprefixer: "npm:^10.4.14"
|
||||
|
@ -2907,6 +2905,7 @@ __metadata:
|
|||
tiny-queue: "npm:^0.2.1"
|
||||
twitter-text: "npm:3.1.0"
|
||||
typescript: "npm:^5.0.4"
|
||||
typescript-eslint: "npm:^7.17.0"
|
||||
use-debounce: "npm:^10.0.0"
|
||||
webpack: "npm:^4.47.0"
|
||||
webpack-assets-manifest: "npm:^4.0.6"
|
||||
|
@ -4121,7 +4120,7 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@typescript-eslint/eslint-plugin@npm:^7.0.0":
|
||||
"@typescript-eslint/eslint-plugin@npm:7.17.0":
|
||||
version: 7.17.0
|
||||
resolution: "@typescript-eslint/eslint-plugin@npm:7.17.0"
|
||||
dependencies:
|
||||
|
@ -4144,7 +4143,7 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@typescript-eslint/parser@npm:^7.0.0":
|
||||
"@typescript-eslint/parser@npm:7.17.0":
|
||||
version: 7.17.0
|
||||
resolution: "@typescript-eslint/parser@npm:7.17.0"
|
||||
dependencies:
|
||||
|
@ -17264,6 +17263,22 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript-eslint@npm:^7.17.0":
|
||||
version: 7.17.0
|
||||
resolution: "typescript-eslint@npm:7.17.0"
|
||||
dependencies:
|
||||
"@typescript-eslint/eslint-plugin": "npm:7.17.0"
|
||||
"@typescript-eslint/parser": "npm:7.17.0"
|
||||
"@typescript-eslint/utils": "npm:7.17.0"
|
||||
peerDependencies:
|
||||
eslint: ^8.56.0
|
||||
peerDependenciesMeta:
|
||||
typescript:
|
||||
optional: true
|
||||
checksum: 10c0/5d9a5430b139129474cd65655ef05efeddfbd890a3ff28c1dd3b747cf48c938cf18e95b3cbbb4a7f8bf991c6c2de5e82f685768c2e7d691629a404a178672a13
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@npm:5, typescript@npm:^5.0.4":
|
||||
version: 5.5.4
|
||||
resolution: "typescript@npm:5.5.4"
|
||||
|
|
Loading…
Reference in a new issue