diff --git a/.config/example.yml b/.config/example.yml index df423c2c83..49f45efb7e 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -118,7 +118,7 @@ redis: # ┌───────────────────────────┐ #───┘ MeiliSearch configuration └───────────────────────────── -# You can set scope to local (default value) or global +# You can set scope to local (default value) or global # (include notes from remote). #meilisearch: @@ -180,7 +180,9 @@ id: 'aidx' #outgoingAddressFamily: ipv4 # Proxy for HTTP/HTTPS -#proxy: http://127.0.0.1:3128 +# + + proxyBypassHosts: - api.deepl.com @@ -214,7 +216,7 @@ proxyRemoteFiles: true signToActivityPubGet: true # For security reasons, uploading attachments from the intranet is prohibited, -# but exceptions can be made from the following settings. Default value is "undefined". +# but exceptions can be made from the following settings. Default value is "undefined". # Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)). #allowedPrivateNetworks: [ # '127.0.0.1/32' diff --git a/locales/en-US.yml b/locales/en-US.yml index dc988ccee6..34b17f9abc 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -9,6 +9,8 @@ notifications: "Notifications" username: "Username" password: "Password" forgotPassword: "Forgot password" +setDefaultProfileConfirm: "Do you want to make this profile the default?" +emojiPickerProfile: "Emoji picker profile" fetchingAsApObject: "Fetching from the Fediverse..." ok: "OK" gotIt: "Got it!" diff --git a/locales/index.d.ts b/locales/index.d.ts index 42c658403f..b807edcd9e 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -14,6 +14,8 @@ export interface Locale { "forgotPassword": string; "fetchingAsApObject": string; "ok": string; + "setDefaultProfileConfirm": string; + "emojiPickerProfile": string; "notificationIndicator": string; "hanntenn": string; "hanntennInfo": string; @@ -1767,6 +1769,7 @@ export interface Locale { }; "_options": { "gtlAvailable": string; + "emojiPickerProfileLimit": string; "ltlAvailable": string; "canPublicNote": string; "canEditNote": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 508d4e655a..78d90976cc 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -11,6 +11,8 @@ password: "パスワード" forgotPassword: "パスワードを忘れた" fetchingAsApObject: "連合に照会中" ok: "OK" +setDefaultProfileConfirm: "このプロファイルをデフォルトにしますか?" +emojiPickerProfile: "絵文字ピッカーのプロファイル" notificationIndicator: "通知のインジケーターの数字を表示する" hanntenn: "アイコンとバナーを反転させる" hanntennInfo: "ダークだったらライトのアイコンに、ライトだったらダークのアイコンに。" @@ -1673,6 +1675,7 @@ _role: high: "高" _options: gtlAvailable: "グローバルタイムラインの閲覧" + emojiPickerProfileLimit: "絵文字ピッカーのプロファイルの上限数(最大5)" ltlAvailable: "ローカルタイムラインの閲覧" canPublicNote: "パブリック投稿の許可" canEditNote: "ノートの編集" diff --git a/package.json b/package.json index a05afa02d7..4d669abd12 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2023.12.2-PrisMisskey.4", + "version": "2023.12.2-PrisMisskey.5", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index 64cb12d4f5..de214debeb 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -59,6 +59,7 @@ export type RolePolicies = { userEachUserListsLimit: number; rateLimitFactor: number; avatarDecorationLimit: number; + emojiPickerProfileLimit: number; }; export const DEFAULT_POLICIES: RolePolicies = { @@ -74,7 +75,6 @@ export const DEFAULT_POLICIES: RolePolicies = { canManageCustomEmojis: false, canRequestCustomEmojis: false, canManageAvatarDecorations: false, - canRequestCustomEmojis: false, canSearchNotes: false, canUseTranslator: true, canHideAds: false, @@ -90,6 +90,7 @@ export const DEFAULT_POLICIES: RolePolicies = { userEachUserListsLimit: 50, rateLimitFactor: 1, avatarDecorationLimit: 1, + emojiPickerProfileLimit: 2, }; @Injectable() @@ -355,6 +356,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { userEachUserListsLimit: calc('userEachUserListsLimit', vs => Math.max(...vs)), rateLimitFactor: calc('rateLimitFactor', vs => Math.max(...vs)), avatarDecorationLimit: calc('avatarDecorationLimit', vs => Math.max(...vs)), + emojiPickerProfileLimit: calc('emojiPickerProfileLimit', vs => Math.max(...vs)), }; } diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue index 43ce3ed7b9..a58c51e0b0 100644 --- a/packages/frontend/src/components/MkEmojiPicker.vue +++ b/packages/frontend/src/components/MkEmojiPicker.vue @@ -4,98 +4,103 @@ SPDX-License-Identifier: AGPL-3.0-only --> @@ -685,4 +699,24 @@ left: 0;*/ } } } +.sllfktkhgl{ + display: inline-block; + padding: 0 4px; + font-size: 12px; + line-height: 32px; + text-align: center; + color: var(--fg); + cursor: pointer; + width: 100%; + transition: transform 0.3s ease; + box-shadow: 0 1.5px 0 var(--divider); + height: 32px; + overflow: hidden; + &:hover { + transform: translateY(1.5px); + } + &.active { + transform: translateY(5px); + } +} diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue index 90f2194a97..76350e5716 100644 --- a/packages/frontend/src/components/MkUserSelectDialog.vue +++ b/packages/frontend/src/components/MkUserSelectDialog.vue @@ -68,8 +68,6 @@ import { defaultStore } from '@/store.js'; import { i18n } from '@/i18n.js'; import { $i } from '@/account.js'; import { hostname } from '@/config.js'; -import { multipleSelectUser } from '@/os.js'; - const emit = defineEmits<{ (ev: 'ok', selected: Misskey.entities.UserDetailed): void; (ev: 'cancel'): void; diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts index b2b6c663d5..ddb7bfa030 100644 --- a/packages/frontend/src/const.ts +++ b/packages/frontend/src/const.ts @@ -99,6 +99,7 @@ export const ROLE_POLICIES = [ 'userEachUserListsLimit', 'rateLimitFactor', 'avatarDecorationLimit', + 'emojiPickerProfileLimit' ] as const; // なんか動かない diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue index 25958213bd..dc0d43f7b7 100644 --- a/packages/frontend/src/pages/admin/roles.vue +++ b/packages/frontend/src/pages/admin/roles.vue @@ -72,6 +72,13 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + + + + diff --git a/packages/frontend/src/pages/settings/emoji-picker.vue b/packages/frontend/src/pages/settings/emoji-picker.vue index 61f3332122..07c6e2c61d 100644 --- a/packages/frontend/src/pages/settings/emoji-picker.vue +++ b/packages/frontend/src/pages/settings/emoji-picker.vue @@ -5,6 +5,13 @@ SPDX-License-Identifier: AGPL-3.0-only