Skip to content

Commit aa4ce25

Browse files
committed
spec(skeb/role): Skeb募集中のクリエイターに自動でロールが付与されるように・バッジから募集状態の確認ができるように
1 parent 92bdc2e commit aa4ce25

File tree

29 files changed

+323
-44
lines changed

29 files changed

+323
-44
lines changed

locales/en-US.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,6 +1677,8 @@ _role:
16771677
iconUrl: "Icon URL"
16781678
asBadge: "Show as badge"
16791679
descriptionOfAsBadge: "This role's icon will be displayed next to the username of users with this role if turned on."
1680+
badgeBehavior: "Badge behavior"
1681+
descriptionOfBadgeBehavior: "Set the behavior of the badge icon."
16801682
isExplorable: "Make role explorable"
16811683
descriptionOfIsExplorable: "This role's timeline and the list of users with this will be made public if enabled."
16821684
displayOrder: "Position"

locales/index.d.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6558,6 +6558,14 @@ export interface Locale extends ILocale {
65586558
* オンにすると、ユーザー名の横にロールのアイコンが表示されます。
65596559
*/
65606560
"descriptionOfAsBadge": string;
6561+
/**
6562+
* バッジの挙動
6563+
*/
6564+
"badgeBehavior": string;
6565+
/**
6566+
* バッジの挙動を設定します。
6567+
*/
6568+
"descriptionOfBadgeBehavior": string;
65616569
/**
65626570
* ユーザーを見つけやすくする
65636571
*/

locales/ja-JP.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,6 +1695,8 @@ _role:
16951695
iconUrl: "アイコン画像のURL"
16961696
asBadge: "バッジとして表示"
16971697
descriptionOfAsBadge: "オンにすると、ユーザー名の横にロールのアイコンが表示されます。"
1698+
badgeBehavior: "バッジの挙動"
1699+
descriptionOfBadgeBehavior: "バッジの挙動を設定します。"
16981700
isExplorable: "ユーザーを見つけやすくする"
16991701
descriptionOfIsExplorable: "オンにすると、「みつける」でメンバー一覧が公開されるほか、ロールのタイムラインが利用可能になります。"
17001702
displayOrder: "表示順"

locales/ko-KR.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,6 +1661,8 @@ _role:
16611661
iconUrl: "아이콘 URL"
16621662
asBadge: "뱃지로 표시"
16631663
descriptionOfAsBadge: "활성화하면 유저명 옆에 역할의 아이콘이 표시됩니다."
1664+
badgeBehavior: "뱃지 동작"
1665+
descriptionOfBadgeBehavior: "뱃지의 동작 방식을 설정합니다."
16641666
isExplorable: "역할 타임라인 공개"
16651667
descriptionOfIsExplorable: "활성화하면 역할 타임라인을 공개합니다. 비활성화 시 타임라인이 공개되지 않습니다."
16661668
displayOrder: "표시 순서"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export class RoleBadgeBehavior1711946753142 {
2+
name = 'RoleBadgeBehavior1711946753142'
3+
4+
async up(queryRunner) {
5+
await queryRunner.query(`ALTER TABLE "role" ADD "badgeBehavior" character varying(256)`);
6+
}
7+
8+
async down(queryRunner) {
9+
await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "badgeBehavior"`);
10+
}
11+
}

packages/backend/src/config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ type Source = {
7272
headers: { [x: string]: string };
7373
parameters: { [x: string]: string };
7474
userIdParameterName: string;
75+
roleId: string;
7576
}
7677

7778
proxy?: string;
@@ -154,6 +155,7 @@ export type Config = {
154155
headers: { [x: string]: string };
155156
parameters: { [x: string]: string };
156157
userIdParameterName: string;
158+
roleId: string;
157159
} | undefined;
158160
proxy: string | undefined;
159161
proxySmtp: string | undefined;

packages/backend/src/core/RoleService.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
577577
isModerator: values.isModerator,
578578
isExplorable: values.isExplorable,
579579
asBadge: values.asBadge,
580+
badgeBehavior: values.badgeBehavior,
580581
canEditMembersByModerator: values.canEditMembersByModerator,
581582
displayOrder: values.displayOrder,
582583
policies: values.policies,

packages/backend/src/core/entities/RoleEntityService.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export class RoleEntityService {
6868
isModerator: role.isModerator,
6969
isExplorable: role.isExplorable,
7070
asBadge: role.asBadge,
71+
badgeBehavior: role.badgeBehavior,
7172
canEditMembersByModerator: role.canEditMembersByModerator,
7273
displayOrder: role.displayOrder,
7374
policies: policies,

packages/backend/src/core/entities/UserEntityService.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ export class UserEntityService implements OnModuleInit {
484484
name: r.name,
485485
iconUrl: r.iconUrl,
486486
displayOrder: r.displayOrder,
487+
behavior: r.badgeBehavior ?? undefined,
487488
}))) : undefined,
488489

489490
...(isDetailed ? {

packages/backend/src/models/Role.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@ export class MiRole {
155155
})
156156
public asBadge: boolean;
157157

158+
@Column('varchar', {
159+
length: 256, nullable: true,
160+
})
161+
public badgeBehavior: string | null;
162+
158163
@Column('boolean', {
159164
default: false,
160165
})

0 commit comments

Comments
 (0)