Skip to content

Commit 528a155

Browse files
neetneet
committed
fix: Correct several type names to follow the naming convention
1 parent 6139683 commit 528a155

7 files changed

Lines changed: 33 additions & 18 deletions

File tree

‎eslint.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ export default tseslint.config(
7979
{
8080
files: ["src/mastodon/{rest,oauth,streaming}/**/*.ts"],
8181
rules: {
82-
// "masto/naming-convention": ["warn"],
83-
"masto/allow-null-in-optional-parameter": ["warn"],
82+
"masto/naming-convention": ["error"],
83+
"masto/allow-null-in-optional-parameter": ["error"],
8484
},
8585
},
8686
{

‎src/mastodon/rest/v1/accounts.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ export interface AccountsSearchResource {
327327
>;
328328
}
329329

330-
export interface AccountFamiliarFollowersResource {
330+
export interface AccountsFamiliarFollowersResource {
331331
/**
332332
* Obtain a list of all accounts that follow a given account, filtered for accounts you follow.
333333
* @returns Array of FamiliarFollowers
@@ -340,7 +340,7 @@ export interface AccountsResource {
340340

341341
relationships: AccountsRelationshipsResource;
342342
search: AccountsSearchResource;
343-
familiarFollowers: AccountFamiliarFollowersResource;
343+
familiarFollowers: AccountsFamiliarFollowersResource;
344344

345345
fetch: Method<Account[], FetchAccountsParams>;
346346

@@ -383,3 +383,7 @@ export interface AccountsResource {
383383

384384
/** @deprecated Use `AccountsResource` instead. */
385385
export type AccountRepository = AccountsResource;
386+
387+
/** @deprecated Use `AccountsFamiliarFollowersResource` instead. */
388+
export type AccountFamiliarFollowersResource =
389+
AccountsFamiliarFollowersResource;

‎src/mastodon/rest/v1/admin/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable masto/naming-convention */
12
import { type AccountsResource } from "./accounts.js";
23
import { type CanonicalEmailBlocksResource } from "./canonical-email-blocks.js";
34
import { type DimensionsResource } from "./dimensions.js";

‎src/mastodon/rest/v1/emails.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export interface CreateConfirmationParams {
66
readonly email?: string | null;
77
}
88

9-
export interface EmailsConfirmationResource {
9+
export interface EmailsConfirmationsResource {
1010
/**
1111
* Resend confirmation email
1212
* @param params Form data parameters
@@ -21,8 +21,10 @@ export interface EmailsConfirmationResource {
2121
}
2222

2323
export interface EmailsResource {
24-
confirmations: EmailsConfirmationResource;
24+
confirmations: EmailsConfirmationsResource;
2525
}
2626

2727
/** @deprecated Use `EmailsResource` instead. */
2828
export type EmailRepository = EmailsResource;
29+
/** @deprecated Use `EmailsConfirmationsResource` instead. */
30+
export type EmailsConfirmationResource = EmailsConfirmationsResource;

‎src/mastodon/rest/v1/filters.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface CreateFilterParams {
2121

2222
export type UpdateFilterParams = CreateFilterParams;
2323

24-
export interface Filter$SelectResource {
24+
export interface Filters$SelectResource {
2525
/**
2626
* View a single filter
2727
* @return Returns Filter
@@ -46,7 +46,7 @@ export interface Filter$SelectResource {
4646
}
4747

4848
export interface FiltersResource {
49-
$select(id: string): Filter$SelectResource;
49+
$select(id: string): Filters$SelectResource;
5050

5151
/**
5252
* View all filters
@@ -66,3 +66,5 @@ export interface FiltersResource {
6666

6767
/** @deprecated Use `FiltersResource` instead. */
6868
export type FilterRepository = FiltersResource;
69+
/** @deprecated Use `Filters$SelectResource` instead. */
70+
export type Filter$SelectResource = Filters$SelectResource;

‎src/mastodon/rest/v1/push/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { type WebPushSubscriptionResource } from "./subscription.js";
1+
import { type PushSubscriptionResource } from "./subscription.js";
22

33
export interface PushResource {
4-
readonly subscription: WebPushSubscriptionResource;
4+
readonly subscription: PushSubscriptionResource;
55
}
66

77
/** @deprecated Use `PushResource` instead. */

‎src/mastodon/rest/v1/push/subscription.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from "../../../entities/v1/index.js";
77
import { type Method } from "../../../method.js";
88

9-
export interface CreateWebPushSubscriptionParams {
9+
export interface CreatePushSubscriptionParams {
1010
readonly subscription: {
1111
/** Endpoint URL that is called when a notification event occurs. */
1212
readonly endpoint: string;
@@ -24,12 +24,12 @@ export interface CreateWebPushSubscriptionParams {
2424
readonly policy: WebPushSubscriptionPolicy;
2525
}
2626

27-
export type UpdateWebPushSubscriptionParams = Pick<
28-
CreateWebPushSubscriptionParams,
27+
export type UpdatePushSubscriptionParams = Pick<
28+
CreatePushSubscriptionParams,
2929
"data"
3030
>;
3131

32-
export interface WebPushSubscriptionResource {
32+
export interface PushSubscriptionResource {
3333
/**
3434
* Add a Web Push API subscription to receive notifications.
3535
* Each access token can have one push subscription.
@@ -40,7 +40,7 @@ export interface WebPushSubscriptionResource {
4040
*/
4141
create: Method<
4242
WebPushSubscription,
43-
CreateWebPushSubscriptionParams,
43+
CreatePushSubscriptionParams,
4444
HttpMetaParams<"json">
4545
>;
4646

@@ -59,7 +59,7 @@ export interface WebPushSubscriptionResource {
5959
*/
6060
update: Method<
6161
WebPushSubscription,
62-
UpdateWebPushSubscriptionParams,
62+
UpdatePushSubscriptionParams,
6363
HttpMetaParams<"json">
6464
>;
6565

@@ -71,5 +71,11 @@ export interface WebPushSubscriptionResource {
7171
remove: Method<void>;
7272
}
7373

74-
/** @deprecated Use `WebPushSubscriptionResource` instead. */
75-
export type WebPushSubscriptionRepository = WebPushSubscriptionResource;
74+
/** @deprecated Use `PushSubscriptionResource` instead. */
75+
export type WebPushSubscriptionRepository = PushSubscriptionResource;
76+
/** @deprecated Use `PushSubscriptionResource` instead. */
77+
export type WebPushSubscriptionResource = PushSubscriptionResource;
78+
/** @deprecated Use `CreatePushSubscriptionParams` instead. */
79+
export type CreateWebPushSubscriptionParams = CreatePushSubscriptionParams;
80+
/** @deprecated Use `UpdatePushSubscriptionParams` instead. */
81+
export type UpdateWebPushSubscriptionParams = UpdatePushSubscriptionParams;

0 commit comments

Comments
 (0)