Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source
This commit is contained in:
mattyatea 2024-01-27 23:51:55 +09:00
commit fea64e8d94
12 changed files with 129 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/frontend/src/components/MkMediaAudio.vue
View file

@ -273,7 +273,7 @@ onDeactivated(() => {
.hidden {
width: 100%;
background: none;
background: #000;
border: none;
outline: none;
font: inherit;
@ -283,7 +283,6 @@ onDeactivated(() => {
display: flex;
align-items: center;
justify-content: center;
background: #000;
}
.hiddenTextWrapper {

4
packages/frontend/src/components/MkMediaVideo.vue
View file

@ -396,7 +396,7 @@ onDeactivated(() => {
.hidden {
width: 100%;
background: none;
background: #000;
border: none;
outline: none;
font: inherit;
@ -406,7 +406,6 @@ onDeactivated(() => {
display: flex;
align-items: center;
justify-content: center;
background: #000;
}
.hiddenTextWrapper {
@ -466,7 +465,6 @@ onDeactivated(() => {
grid-template-columns: auto auto 1fr auto auto;
align-items: center;
gap: 4px 8px;
pointer-events: none;
padding: 35px 10px 10px 10px;
background: linear-gradient(rgba(0, 0, 0, 0),rgba(0, 0, 0, .75));

9
packages/frontend/src/scripts/get-user-menu.ts
View file

@ -170,7 +170,14 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
action: () => {
copyToClipboard(`${user.host ?? host}/@${user.username}.atom`);
},
}, {
}, ...(user.host != null && user.url != null ? [{
icon: 'ti ti-external-link',
text: i18n.ts.showOnRemote,
action: () => {
if (user.url == null) return;
window.open(user.url, '_blank', 'noopener');
},
}] : []), {
icon: 'ti ti-share',
text: i18n.ts.copyProfileUrl,
action: () => {

3
packages/misskey-bubble-game/package.json
View file

@ -2,6 +2,7 @@
"type": "module",
"name": "misskey-bubble-game",
"version": "0.0.1",
"types": "./built/dts/index.d.ts",
"exports": {
".": {
"import": "./built/esm/index.js",
@ -15,7 +16,7 @@
"scripts": {
"build": "node ./build.js",
"build:tsc": "npm run tsc",
"tsc": "npm run ts-esm && npm run ts-dts",
"tsc": "npm run tsc-esm && npm run tsc-dts",
"tsc-esm": "tsc --outDir built/esm",
"tsc-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build:tsc\"",

4
packages/misskey-js/package.json
View file

@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
"version": "2024.2.0-beta.3",
"version": "2024.2.0-beta.7",
"description": "Misskey SDK for JavaScript",
"types": "./built/dts/index.d.ts",
"exports": {
@ -19,7 +19,7 @@
"ts": "npm run ts-esm && npm run ts-dts",
"ts-esm": "tsc --outDir built/esm",
"ts-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run ts\"",
"tsd": "tsd",
"api": "pnpm api-extractor run --local --verbose",
"api-prod": "pnpm api-extractor run --verbose",

1
packages/misskey-reversi/package.json
View file

@ -2,6 +2,7 @@
"type": "module",
"name": "misskey-reversi",
"version": "0.0.1",
"types": "./built/dts/index.d.ts",
"exports": {
".": {
"import": "./built/esm/index.js",