Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
a458f20a11
Bump electron from 13.1.2 to 13.1.6 in /app
Bumps [electron](https://github.com/electron/electron) from 13.1.2 to 13.1.6.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v13.1.2...v13.1.6)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-06 20:04:47 +00:00
193 changed files with 11179 additions and 9541 deletions

View File

@ -1,37 +0,0 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
name: macOS debug build
on: push
jobs:
build:
runs-on: macos-latest
environment:
name: build
env:
APPLEID: ${{ secrets.APPLEID }}
APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.CSC_LINK}}
strategy:
matrix:
node-version: [14.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- run: cd app && yarn
- run: cd app && yarn build --skipX64 --withArm64
- name: Deploy to S3
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run:
aws s3 sync --delete --region ap-northeast-1 ./build/ s3://cutls-s3-backup/debug

2
.gitignore vendored
View File

@ -34,9 +34,7 @@ app/view/zh-CN
app/view/ru-RU
app/view/zh-TW
app/view/pt-BR
app/view/si-LK
app/build.js
app/view/make/make.js
app/view/make/makeCli.ts
app/.env
app/view/make/index.generated.html

View File

@ -1,46 +0,0 @@
# Maintainer: Zergling_man, from fedora.email
pkgname=thedesk
_pkgname=TheDesk
pkgver=24.2.1
_electronversion=22
pkgrel=2
pkgdesc="Mastodon Client for PC, Zergling_man's pleroma-focused fork."
arch=("x86_64")
url="https://thedesk.top/"
license=('GPL3')
conflicts=("${pkgname%-bin}")
depends=("npm")
makedepends=("npm")
optdeps=('hicolor-icon-theme')
source=("git+http://precious.harpy.faith/Zergling_man/TheDesk.git")
sha256sums=('SKIP')
build()
{
cd ${srcdir}/${_pkgname}/app
npm run build
npm run construct
}
package()
{
cd ${pkgdir}
install -d opt/${_pkgname}/ usr/share/icons/hicolor usr/share/applications/ usr/share/licenses/thedesk/ usr/bin/
cd ${srcdir}/${_pkgname}
mv thedesk ${pkgdir}/usr/bin/
chmod 555 ${pkgdir}/usr/bin/thedesk
mv thedesk.desktop ${pkgdir}/usr/share/applications/
mv LICENSE ${pkgdir}/usr/share/licenses/thedesk/
cd app/img/icons/
sizes=($(ls | grep -Eo '[0-9x]+'))
for size in ${sizes[@]}; do
install -d ${pkgdir}/usr/share/icons/hicolor/$size/apps/
mv icon-$size.png ${pkgdir}/usr/share/icons/hicolor/$size/apps/desk.png
done
cd ..
rm -d icons
cd ${srcdir}
cp -r ${_pkgname} ${pkgdir}/opt/
}

View File

@ -35,10 +35,9 @@ Crowdinから翻訳に参加してみませんか: https://translate.thedesk.
Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。
Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。
## よみもの
## 詳しく
* [TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
* [TheDeskを作って思う今クライアントを作る意味 | Cutls Code Archives ](https://code.cutls.com/thedesk-log/)
[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
## ライセンス
@ -48,7 +47,9 @@ Issuesに書いてある問題についてはなるべく対処しますので
## 主なコントリビューター
[![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
* <img src="https://user-images.githubusercontent.com/17561618/66582029-162df380-ebbc-11e9-8a6f-1832b3a35d89.png" width="20">[とねぢ](https://minohdon.jp/@toneji) macOSビルダー(現在はTravis CI)
* <img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4" width="20">[ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja) Linuxビルダー(現在はTravis CI)
* <img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png" width="20">[kPherox](https://pl.kpherox.dev/kPherox)
## 支援

View File

@ -4,7 +4,7 @@
<head>
<title>TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport" />
<link href="./node_modules/@cutls/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
<link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
<link href="./css/font-awesome.css" rel="stylesheet" type="text/css" />
<link href="./css/themes.css" type="text/css" rel="stylesheet" />
<link href="./css/master.css" type="text/css" rel="stylesheet" />
@ -87,7 +87,7 @@
<body class="center" style="overflow: hidden;">
<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
<script type="text/javascript" src="./node_modules/@cutls/materialize-css/dist/js/materialize.js"></script>
<script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
<img src="./img/desk.svg" style="max-width: 58%;" />
<h5>TheDesk</h5>
<div class="container">
@ -105,7 +105,7 @@
<div class="area-data6" id="node"></div>
</div>
<div class="cp">
Copyright &copy; TheDesk 2018<br /> Main developer(author): <a href="https://2m.cutls.com/@Cutls" target="_blank">Cutls P</a><br />
Copyright &copy; TheDesk 2018<br /> Main developer(author): <a href="https://1m.cutls.com/@Cutls" target="_blank">Cutls P</a><br />
<a href="https://github.com/cutls/TheDesk/graphs/contributors" style="text-align: center; user-select: none;"><img src="https://opencollective.com/TheDesk/contributors.svg?width=700&button=false" style="width: 100%"></a>
<br /><a href="https://thedesk.top" target="_blank">Web site</a>
</div>
@ -124,9 +124,8 @@
}
$('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
$(document).on('click', 'a', (e) => {
e.preventDefault()
var url = $(e.target).attr('href')
postMessage(['openUrlMainProcess', url], '*')
postMessage(['openUrl', url], '*')
return false
})
</script>

1
app/build.d.ts vendored
View File

@ -10,6 +10,5 @@ declare function _exports(options?: {
skipLinux?: boolean;
skipMacOS?: boolean;
unnotarize?: boolean;
skipUniversal?: boolean;
}): void;
export = _exports;

View File

@ -11,7 +11,6 @@ const construct = require('./view/make/make.js')
const { platform, arch } = process
const Platform = builder.Platform
const Arch = builder.Arch
require('dotenv').config()
const artifactName = 'TheDesk-setup-${arch}.${ext}'
const config = {
productName: 'TheDesk',
@ -42,9 +41,6 @@ const config = {
target: ['zip', 'appImage', 'snap', 'deb'],
category: 'Network',
},
deb: {
depends: ['gconf2', 'gconf-service', 'libnotify4', 'libappindicator1', 'libxtst6', 'libnss3']
},
mac: {
hardenedRuntime: true,
gatekeeperAssess: false,
@ -74,8 +70,8 @@ async function cmd(options) {
if (isTrue(options, 'onlyStore') || isTrue(options, 'withStore')) {
console.log('start building for application stores')
construct(ver, basefile, false, true)
if ((platform === 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
if ((isTrue(options, 'withIa32') && arch === 'x64') || arch === 'ia32') {
if ((platform == 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
if ((isTrue(options, 'withIa32') && arch == 'x64') || arch == 'ia32') {
config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
await build(Platform.WINDOWS, Arch.ia32, config)
fs.renameSync(
@ -87,7 +83,7 @@ async function cmd(options) {
'../build/TheDesk-setup-ia32-store.exe'
)
}
if (arch === 'x64') {
if (arch == 'x64') {
config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
await build(Platform.WINDOWS, Arch.x64, config)
fs.renameSync(
@ -100,14 +96,14 @@ async function cmd(options) {
)
}
}
if ((platform === 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
if (arch === 'ia32') {
if ((platform == 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
if (arch == 'ia32') {
await build(Platform.LINUX, Arch.ia32, config)
}
if ((isTrue(options, 'withIa32') && arch === 'x64')) {
if ((isTrue(options, 'withIa32') && arch == 'x64')) {
console.log('snapcraft does not curretly support builing i386 on amd64')
}
if (arch === 'x64') {
if (arch == 'x64') {
await build(Platform.LINUX, Arch.x64, config)
if (!isTrue(options, 'onlyStore')) {
fs.renameSync(
@ -121,8 +117,8 @@ async function cmd(options) {
if (!isTrue(options, 'onlyStore')) {
console.log('start building for normal usage')
construct(ver, basefile, false, false)
if ((platform === 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
if ((isTrue(options, 'withIa32') && arch === 'x64') || arch === 'ia32') {
if ((platform == 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
if ((isTrue(options, 'withIa32') && arch == 'x64') || arch == 'ia32') {
config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
await build(Platform.WINDOWS, Arch.ia32, config)
fs.renameSync(
@ -130,7 +126,7 @@ async function cmd(options) {
'../build/TheDesk-ia32.exe'
)
}
if (arch === 'x64') {
if (arch == 'x64') {
config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
await build(Platform.WINDOWS, Arch.x64, config)
fs.renameSync(
@ -142,7 +138,7 @@ async function cmd(options) {
'../build/TheDesk-setup.exe'
)
}
if ((isTrue(options, 'withArm64') && arch === 'x64') || arch === 'arm64') {
if ((isTrue(options, 'withArm64') && arch == 'x64') || arch == 'arm64') {
config.nsis.artifactName = artifactName.replace('${arch}', 'arm64')
await build(Platform.WINDOWS, Arch.arm64, config)
fs.renameSync(
@ -151,14 +147,14 @@ async function cmd(options) {
)
}
}
if ((platform === 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
if (arch === 'ia32') {
if ((platform == 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
if (arch == 'ia32') {
await build(Platform.LINUX, Arch.ia32, config)
}
if (isTrue(options, 'withIa32') && arch === 'x64') {
if (isTrue(options, 'withIa32') && arch == 'x64') {
console.log('snapcraft does not curretly support builing i386 on amd64')
}
if (arch === 'x64') {
if (arch == 'x64') {
await build(Platform.LINUX, Arch.x64, config)
fs.renameSync(
`../build/thedesk_${version}_amd64.snap`,
@ -172,27 +168,9 @@ async function cmd(options) {
}
}
}
if (platform === 'darwin' && !isTrue(options, 'skipMacOS')) {
if (isTrue(options, 'unnotarize')) delete config.afterSign
if (isTrue(options, 'unnotarize')) delete config.mac.entitlements
if (isTrue(options, 'unnotarize')) delete config.mac.entitlementsInherit
if (isTrue(options, 'unnotarize')) process.env.CSC_IDENTITY_AUTO_DISCOVERY = false
if (isTrue(options, 'unnotarize')) delete config.afterSign
if (!isTrue(options, 'skipUniversal')) await build(Platform.MAC, Arch.universal, config)
if (isTrue(options, 'withArm64')) {
await build(Platform.MAC, Arch.arm64, config)
fs.renameSync(
`../build/TheDesk-${version}.dmg`,
`../build/TheDesk-${version}-arm64.dmg`
)
}
if (isTrue(options, 'withX64')) {
await build(Platform.MAC, Arch.x64, config)
fs.renameSync(
`../build/TheDesk-${version}.dmg`,
`../build/TheDesk-${version}-x64.dmg`
)
}
if (platform == 'darwin' && !isTrue(options, 'skipMacOS')) {
if(isTrue(options, 'unnotarize')) delete config.afterSign
await build(Platform.MAC, Arch.x64, config)
}
}
}
@ -232,10 +210,6 @@ TheDesk Builder command tool
[only macOS]
--unnotarize: Without notarize
Build as a "universal" package.
--skipUniversal: skip build for universal enviroment
--withX64: build x64-only build
--withArm64: build arm64-only build
`
}
@ -249,4 +223,4 @@ TheDesk Builder command tool
* @param {boolean} [options.withArm64] - [Windows only(beta)] arm64 build on x64 system(if your machine is arm64, it will be built if this arg is not passed, and not build store build for arm64)
* @return {void}
*/
module.exports = cmd
module.exports = cmd

View File

@ -2,13 +2,7 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>com.apple.security.cs.disable-executable-page-protection</key>
<true/>
</dict>
</plist>

View File

@ -1,6 +1,10 @@
require('dotenv').config()
const { notarize } = require('@electron/notarize')
const { notarize } = require('electron-notarize')
// Notarizeをしない場合、下のuseNotarizeをtrueからfalseに変更してください。
const useNotarize = true
exports.default = async function notarizing(context) {
const { electronPlatformName, appOutDir } = context
if (electronPlatformName !== 'darwin' || !useNotarize) return
@ -16,4 +20,4 @@ exports.default = async function notarizing(context) {
} catch (e) {
throw console.log(e)
}
}
}

View File

@ -1,23 +0,0 @@
require('dotenv').config()
const { notarize } = require('electron-notarize')
// Notarizeをしない場合、下のuseNotarizeをtrueからfalseに変更してください。
const useNotarize = true
exports.default = async function notarizing(context) {
const { electronPlatformName, appOutDir } = context
if (electronPlatformName !== 'darwin' || !useNotarize) return
const appName = context.packager.appInfo.productFilename
console.log(`start notarize: ${appOutDir}/${appName}.app`)
try {
return await notarize({
appBundleId: 'top.thedesk',
appPath: `${appOutDir}/${appName}.app`,
appleId: process.env.APPLEID,
appleIdPassword: process.env.APPLEIDPASS,
})
} catch (e) {
throw console.log(e)
}
}

View File

@ -86,7 +86,6 @@ option {
#imagemodal .modal-footer {
overflow-x: hidden;
overflow-y: hidden;
height: 56px;
}
#imagewrap {

View File

@ -721,11 +721,9 @@
text-rendering: auto;
line-height: 1;
font-weight: 900;
color: var(--text);
color: #000;
position: relative;
font-size: 1.5em;
top: 1.7rem;
left: 1rem;
font-size: 1.5em
}
.swal2-icon {

View File

@ -297,7 +297,7 @@ iframe,
.area-display_name {
user-select: text;
height: 1.5rem;
height: 1.5em;
margin: 0.15rem;
margin-left: 0.4rem;
overflow: hidden;
@ -780,11 +780,6 @@ p:not(:last-child) {
.dropdown-content li {
padding-top: 0.4rem;
}
.dropdown-content li > a, .dropdown-content li > span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.fa-2x > .emoji-img {
width: 2.3rem !important;
height: 2.3rem !important;

File diff suppressed because it is too large Load Diff

View File

@ -1,219 +1,172 @@
/*アイコンをクリックした時とかにでてくるユーザーデータ*/
#his-data {
background-repeat: no-repeat;
background-image: url('../img/loading.svg');
overflow-y: hidden;
background-repeat: no-repeat;
background-image: url('../img/loading.svg');
overflow-y: hidden;
}
#his-data .btn .material-icons {
float: left;
float: left;
}
#his-data-content {
display: flex;
justify-content: center;
display: flex;
justify-content: center;
}
#his-name {
font-size: 1.5rem;
font-size: 1.5rem;
}
#his-prof {
width: 7.7rem;
margin-right: 0.4rem;
width: 7.7rem;
margin-right: 0.4rem;
}
.his-float {
overflow-y: scroll;
padding: 0.4rem;
overflow-y: scroll;
padding: 0.4rem;
}
#his-float-data {
height: 100%;
overflow-y: hidden;
height: 100%;
overflow-y: hidden;
}
#his-leftside {
width: 28.4rem;
max-width: 30vw;
width: 28.4rem;
max-width: 30vw;
}
#his-float-timeline {
max-width: 47.5rem;
width: calc(100% - 28.4rem);
height: 100%;
overflow-y: hidden;
max-width: 47.5rem;
width: calc(100% - 28.4rem);
height: 100%;
overflow-y: hidden;
}
#his-basic-prof {
display: flex;
min-height: 10rem;
display: flex;
min-height: 10rem;
}
#his-field {
vertical-align: baseline;
text-align: center;
padding: 0;
vertical-align: baseline;
text-align: center;
padding: 0;
}
#his-field tr {
height: 1.5rem;
height: 1.5rem;
}
.his-field-title {
height: 1.5rem;
padding: 0;
background-color: #757575;
text-align: center;
padding: 0.4rem;
margin-bottom: 1px;
width: 30%;
height: 1.5rem;
padding: 0;
background-color: #757575;
text-align: center;
padding: 0.4rem;
margin-bottom: 1px;
width: 30%;
}
.his-field-content {
height: 1.5rem;
padding: 0;
padding-left: 0.4rem;
height: 1.5rem;
padding: 0;
padding-left: 0.4rem;
}
.his-var-content a span.ellipsis:after {
content: '...';
content: '...';
}
.his-var-content a:not(.mention) span:last-of-type {
display: none;
display: none;
}
#his-data a .rep_ct,
#his-data a .rt_ct,
#his-data a .fav_ct {
display: inline !important;
display: inline !important;
}
#his-data-show {
margin: 1.5rem;
margin-left: 3.8rem;
margin-right: 3.8rem;
background-color: var(--his-data);
height: calc(100% - 1.5rem);
margin-bottom: 0;
padding: 0.4rem;
margin: 1.5rem;
margin-left: 3.8rem;
margin-right: 3.8rem;
background-color: var(--his-data);
height: calc(100% - 1.5rem);
margin-bottom: 0;
padding: 0.4rem;
}
#his-data-wrap {
display: flex;
display: flex;
}
.his-var-content {
overflow-y: scroll;
overflow-x: hidden;
height: calc(100% - 3.4rem);
padding-bottom: 60px;
overflow-y: scroll;
overflow-x: hidden;
height: calc(100% - 3.4rem);
padding-bottom: 60px;
}
#my-data-nav .btn {
width: 10.6rem;
width: 10.6rem;
}
#my-data-nav .active-back {
display: none;
display: none;
}
#his-name .emojione,
#his-name .emoji-img {
width: 1.538rem;
width: 1.538rem;
}
#his-plus-action .btn {
padding-right: 0.4rem;
padding-left: 0.4rem;
padding-right: 0.4rem;
padding-left: 0.4rem;
}
.tabs {
display: flex;
display: flex;
}
.tabs .tab a {
padding: 0.6rem 0.9rem;
padding: 0.6rem 0.9rem;
}
#his-des {
max-height: 17.7rem;
overflow-y: scroll;
user-select: text;
cursor: text;
max-height: 17.7rem;
overflow-y: scroll;
}
#his-sign-action {
border: 1px solid;
border-radius: 0.4rem;
display: flex;
align-items: center;
padding-left: 0.75rem;
padding-right: 0.75rem;
flex-wrap: wrap;
border: 1px solid;
border-radius: 0.4rem;
display: flex;
align-items: center;
padding-left: 0.75rem;
padding-right: 0.75rem;
flex-wrap: wrap;
}
#his-sign-action .shrinker {
margin-right: 0.5rem;
flex-basis: calc(50% - 1rem);
#his-sign-action .btn {
flex-basis: calc(50% - 10.6px);
}
#his-sign-action .shrinker.btn {
width: 100%;
}
#his-sign-action .dropdown-trigger {
flex-basis: 100%;
flex-basis: 100%;
}
#his-des .mention {
color: #039be5;
cursor: pointer;
color: #039be5;
cursor: pointer;
}
#his-table {
max-height: 9.2rem;
overflow-y: scroll;
user-select: text;
max-height: 11.538rem;
overflow-y: scroll;
}
#his-float-blocked {
display: flex;
justify-content: center;
align-items: center;
font-size: 2rem;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
font-size: 2rem;
height: 100%;
}
#hisdropdown {
background-color: var(--bg);
background-color: var(--bg);
}
#hisdropdown li a {
color: var(--text);
color: var(--text);
}
#hisdropdown li:hover {
background-color: var(--active);
background-color: var(--active);
}
#his-data-title-wrap {
width: 100%;
text-align: center;
font-size: 1.5rem;
display: flex;
justify-content: center;
align-items: center;
width: 100%;
text-align: center;
font-size: 1.5rem;
display: flex;
justify-content: center;
align-items: center;
}
#his-data-title .material-icons {
position: relative;
top: 5px;
margin-right: 3px;
position: relative;
top: 5px;
margin-right: 3px;
}
#his-data-title a {
color: white;
color: white;
}

View File

@ -1,12 +1,7 @@
<!doctype html>
<html>
<head>
<script>
if (/^ja\b/.test(navigator.language)) {
location.href = './view/ja'
} else {
location.href = './view/en'
}
</script>
<meta http-equiv=”refresh” content=”0;URL=./view/ja'” />
<script>location.href = './view/ja';</script>
</head>
</html>
</html>

View File

@ -94,7 +94,7 @@ $(function($) {
if (e.keyCode === 88) {
if (!$('#post-box').hasClass('appear')) {
show()
document.getElementById('textarea').focus()
$('textarea').focus()
} else {
hide()
}
@ -105,8 +105,7 @@ $(function($) {
if (!$('#post-box').hasClass('appear')) {
show()
}
document.getElementById('textarea').focus()
$('textarea').focus()
return false
}
//Ctrl+E:全ての通知未読を既読にする

View File

@ -1,18 +1,18 @@
//バージョンチェッカー
async function verck(ver, jp) {
function verck(ver, jp) {
if (store) return false
console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
$('body').addClass(localStorage.getItem('platform'))
const date = new Date()
let showVer = false
var date = new Date()
var showVer = false
if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
showVer = true
console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
$(document).ready(function () {
$(document).ready(function() {
if (localStorage.getItem('winstore') && !pwa) {
$('#releasenote').modal('open')
}
let verp = ver.replace('(', '')
verp = ver.replace('(', '')
verp = verp.replace('.', '-')
verp = verp.replace('.', '-')
verp = verp.replace('[', '-')
@ -30,14 +30,13 @@ async function verck(ver, jp) {
localStorage.setItem('ver', ver)
if (!showVer) {
console.log(showVer)
let nextmonth
if (!localStorage.getItem('showSupportMe')) {
if (date.getMonth() == 11) {
const yrs = date.getFullYear() + 1
nextmonth = yrs * 100 + 1
var yrs = date.getFullYear() + 1
var nextmonth = yrs * 100 + 1
} else {
const yrs = date.getFullYear()
nextmonth = yrs * 100 + date.getMonth() + 2
var yrs = date.getFullYear()
var nextmonth = yrs * 100 + date.getMonth() + 2
}
localStorage.setItem('showSupportMe', nextmonth)
} else {
@ -45,11 +44,11 @@ async function verck(ver, jp) {
date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe')
) {
if (date.getMonth() == 11) {
const yrs = date.getFullYear() + 1
nextmonth = yrs * 100 + 1
var yrs = date.getFullYear() + 1
var nextmonth = yrs * 100 + 1
} else {
const yrs = date.getFullYear()
nextmonth = yrs * 100 + date.getMonth() + 2
var yrs = date.getFullYear()
var nextmonth = yrs * 100 + date.getMonth() + 2
}
localStorage.setItem('showSupportMe', nextmonth)
if (lang.language != 'ja') {
@ -67,55 +66,76 @@ async function verck(ver, jp) {
)
}
}
}
const platform = localStorage.getItem('platform')
var platform = localStorage.getItem('platform')
console.log('Your platform:' + platform)
//if (!localStorage.getItem('winstore') && !pwa) {
// $('#start').css('display', 'flex')
//}
const winstore = localStorage.getItem('winstore') == 'brewcask' ||
if (
localStorage.getItem('winstore') == 'brewcask' ||
localStorage.getItem('winstore') == 'snapcraft' ||
localStorage.getItem('winstore') == 'winstore'
const l = 5
) {
var winstore = true
} else {
var winstore = false
}
var l = 5
// 生成する文字列に含める文字セット
const c = 'abcdefghijklmnopqrstuvwxyz0123456789'
const cl = c.length
let r = ''
var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
var cl = c.length
var r = ''
for (var i = 0; i < l; i++) {
r += c[Math.floor(Math.random() * cl)]
}
const start1 = 'https://thedesk.top/ver.json'
const response = await fetch(start1, { method: 'GET' })
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
const mess = await response.json()
console.table(mess)
if (mess) {
const platform = localStorage.getItem('platform')
const newest = platform == 'darwin' ? mess.desk_mac : mess.desk
if (newest == ver) {
todo(lang.lang_version_usever.replace('{{ver}}', mess.desk))
//betaかWinstoreならアプデチェックしない
} else if (ver.indexOf('beta') != -1 || winstore) {
} else {
localStorage.removeItem('instance')
if (localStorage.getItem('new-ver-skip')) {
if (localStorage.getItem('next-ver') != newest) {
postMessage(['sendSinmpleIpc', 'update'], '*')
} else {
console.warn(lang.lang_version_skipver)
todo(lang.lang_version_skipver)
}
} else {
postMessage(['sendSinmpleIpc', 'update'], '*')
var start = 'https://thedesk.top/ver.json'
fetch(start, {
method: 'GET'
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
}
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(mess) {
console.table(mess)
if (mess) {
var platform = localStorage.getItem('platform')
if (platform == 'darwin') {
var newest = mess.desk_mac
} else {
var newest = mess.desk
}
if (newest == ver) {
todo(lang.lang_version_usever.replace('{{ver}}', mess.desk))
//betaかWinstoreならアプデチェックしない
} else if (ver.indexOf('beta') != -1 || winstore) {
} else {
localStorage.removeItem('instance')
if (localStorage.getItem('new-ver-skip')) {
if (localStorage.getItem('next-ver') != newest) {
postMessage(['sendSinmpleIpc', 'update'], '*')
} else {
console.warn(lang.lang_version_skipver)
todo(lang.lang_version_skipver)
}
} else {
postMessage(['sendSinmpleIpc', 'update'], '*')
}
}
}
})
if (!localStorage.getItem('last-notice-id')) {
localStorage.setItem('last-notice-id', 0)
}
@ -124,20 +144,20 @@ async function verck(ver, jp) {
method: 'GET',
cors: true
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (mess) {
.then(function(mess) {
if (mess.length < 1) {
return false
} else {
@ -171,7 +191,7 @@ async function verck(ver, jp) {
if (multi) {
showVer = false
var accts = JSON.parse(multi)
Object.keys(accts).forEach(function (key) {
Object.keys(accts).forEach(function(key) {
var acct = accts[key]
if (acct.domain == obj.domain) {
showVer = true
@ -198,11 +218,11 @@ async function verck(ver, jp) {
var infostreaming = false
function infowebsocket() {
infows = new WebSocket('wss://thedesk.top/ws/')
infows.onopen = function (mess) {
infows.onopen = function(mess) {
console.log([tlid, ':Connect Streaming Info:', mess])
infostreaming = true
}
infows.onmessage = function (mess) {
infows.onmessage = function(mess) {
console.log([tlid, ':Receive Streaming:', JSON.parse(mess.data)])
var obj = JSON.parse(mess.data)
if (obj.type != 'counter') {
@ -230,7 +250,7 @@ function infowebsocket() {
if (multi) {
showVer = false
var accts = JSON.parse(multi)
Object.keys(accts).forEach(function (key) {
Object.keys(accts).forEach(function(key) {
var acct = accts[key]
if (acct.domain == obj.domain) {
showVer = true
@ -255,18 +275,18 @@ function infowebsocket() {
$('#persons').text(obj.text)
}
}
infows.onerror = function (error) {
infows.onerror = function(error) {
infostreaming = false
console.error('Error closing:info')
console.error(error)
return false
}
infows.onclose = function () {
infows.onclose = function() {
infostreaming = false
console.error('Closing:info')
}
}
setInterval(function () {
setInterval(function() {
if (!infostreaming) {
console.log('try to connect to base-streaming')
infowebsocket()
@ -294,7 +314,7 @@ function closeSupport() {
},
{
duration: 300,
complete: function () {
complete: function() {
$('#support-btm').addClass('hide')
}
}

View File

@ -611,9 +611,8 @@ function multiSelector(parseC) {
$('#add-acct-sel').append(
'<option value="noauth">' +
lang.lang_login_noauth +
`</option><option value="webview">TweetDeck</option>`
`</option>${webview ? `<option value="webview">TweetDeck</option>` : ''}`
)
if (!webview) $('#webview-add').append(`<br /><span style="font-size: 0.7rem">${lang.lang_setting_webview_warn}</span>`)
$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
}
$('select').formSelect()

View File

@ -367,13 +367,9 @@ function support() {
}
})
}
function backToInit() {
$('#auth').hide()
$('#add').show()
}
//URL指定してポップアップ
async function login(url) {
function login(url) {
var multi = localStorage.getItem('multi')
var obj = JSON.parse(multi)
if ($('#misskey:checked').val() == 'on') {
@ -382,18 +378,16 @@ async function login(url) {
return
}
$('#compt').hide()
const start = `https://${url}/api/v1/apps`
$('#loginBtn').attr('disabled', true)
const nextSetup = await versionChecker(url)
$('#loginBtn').attr('disabled', false)
let red = 'thedesk://manager'
if (!nextSetup) {
red = 'urn:ietf:wg:oauth:2.0:oob'
if ($('#linux:checked').val() == 'on') {
var red = 'urn:ietf:wg:oauth:2.0:oob'
if (~url.indexOf('pixelfed')) {
red = 'https://thedesk.top/hello.html'
}
} else {
var red = 'thedesk://manager'
}
localStorage.setItem('redirect', red)
var start = 'https://' + url + '/api/v1/apps'
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
@ -426,86 +420,103 @@ async function login(url) {
localStorage.setItem('client_id', json['client_id'])
localStorage.setItem('client_secret', json['client_secret'])
$('#auth').show()
versionChecker(url)
$('#add').hide()
postMessage(['openUrl', auth], '*')
}
}
}
async function versionChecker(url) {
const start = `https://${url}/api/v1/instance`
try {
const response = await fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
function versionChecker(url) {
var start = 'https://' + url + '/api/v1/instance'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
}
})
.then(function (response) {
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
var version = json.version
if (version) {
var reg = version.match(/^([0-9])\.[0-9]\.[0-9]/u)
if (reg) {
versionCompat(reg[1], reg, json.title, reg[0])
}
}
})
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
const json = await response.json()
const version = json.version
if (version) {
const reg = version.match(/^([0-9])\.[0-9]\.[0-9]/u)
if (reg) versionCompat(json.title, version)
if (version.match('compatible')) {
$('#compt-warn').show()
return false
} else {
$('#compt-warn').hide()
if (pwa) return false
const codeSetupCheck = await Swal.fire({
title: lang.lang_manager_codesetup_title,
text: lang.lang_manager_codesetup,
icon: 'info',
showCancelButton: true
})
if (!codeSetupCheck.isConfirmed) return false
return true
}
}
} catch {
return false
}
}
async function versionCompat(title, version) {
const [sem, a, b, c] = version.match(/^([0-9]+)\.([0-9]+)\.([0-9]+)/)
function versionCompat(prefix, ver, title, real) {
$('#compt-instance').text(title)
$('#compt-ver').text(version)
$('#compt-ver').text(real)
if (~real.indexOf('compatible')) {
$('#compt-warn').show()
} else {
$('#compt-warn').hide()
}
$('#compt-list').html('')
var start = '../../source/version.json'
const response = await fetch(start)
const json = await response.json()
const keys = Object.keys(json)
let i = 0
let onceAdd = false
for (const targetVersion of keys) {
const data = json[targetVersion]
const [tsem, ta, tb, tc] = targetVersion.match(/^([0-9]+)\.([0-9]+)\.([0-9]+)/)
let add = false
if (ta === a) {
if (tb === b) {
if (tc > c) {
add = true
}
} else if (tb > b) {
add = true
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
}
})
.then(function (response) {
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
} else if (ta > a) {
add = true
}
if (!add) break
if (add) onceAdd = true
for (const note of data) {
$('#compt-list').append(`<li>${note}(${targetVersion})</li>`)
}
i++
}
if (lang.language == 'ja' && onceAdd) {
$('#compt').show()
}
return response.json()
})
.catch(function (error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
var complete = false
var ct = 0
var jl = 0
var jl2 = 0
Object.keys(json).forEach(function (key) {
var data = json[key]
if (data) {
jl++
if (key != real && !complete) {
for (var i = 0; i < data.length; i++) {
var e = ''
if (i == 0) {
e = '(' + key + ')'
}
$('#compt-list').append('<li>' + data[i] + e + '</li>')
ct++
e = ''
}
jl2++
} else if (!complete) {
complete = true
}
}
})
if (lang.language == 'ja' && ct > 0) {
if (jl2 != jl && prefix != '1') {
$('#compt').show()
}
}
})
}
//これが後のMisskeyである。
function misskeyLogin(url) {
@ -1145,8 +1156,9 @@ function asReadEnd() {
// Or with jQuery
$(document).ready(function () {
$('input.autocomplete').autocomplete({
data: {},
});
});
$(document).ready(function(){
$('input.autocomplete').autocomplete({
data: {},
});
});

View File

@ -145,7 +145,7 @@ onmessage = function (e) {
} else if (e.data[0] == 'udg') {
udg(e.data[1][0], e.data[1][1])
} else if (e.data[0] == 'media') {
media(e.data[1][0], e.data[1][1], e.data[1][2], e.data[1][3], e.data[1][4])
media(e.data[1][0], e.data[1][1], e.data[1][2], e.data[1][3])
} else if (e.data[0] == 'post') {
post('pass')
} else if (e.data[0] == 'toastSaved') {

View File

@ -4,11 +4,7 @@ window.onload = function() {
connection()
initPlugin(plugins)
if (localStorage.getItem('control-center-np')) $('#ccnp').removeClass('hide')
}
const size = localStorage.getItem('size')
if (size) $('html,body').css('font-size', `${size}px`)
$.strip_tags = function(str, allowed) {
if (!str) {
return ''
@ -103,10 +99,8 @@ function formattimeutc(date) {
}
postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
incrementid=0
function makeCID()
{
return incrementid++
function makeCID() {
return uuid()
}
function rgbToHex(color) {

View File

@ -48,13 +48,13 @@ function initPlugin() {
})
})
asCommon['TheDesk:confirm'] = asValue.FN_NATIVE(async (z) => {
const alertSwal = await Swal.fire({
const alert = await Swal.fire({
title: z[0].value,
text: z[1].value,
icon: z[2] ? z[2].value : 'info',
showCancelButton: true
})
return asUtil.jsToVal(!!(alertSwal.value && alertSwal.value === true))
return asUtil.jsToVal(!!(alert.value && alert.value === true))
})
asCommon['TheDesk:css'] = asValue.FN_NATIVE((z) => {
$(escapeHTML(z[0].value)).css(escapeHTML(z[1].value), escapeHTML(z[2].value))
@ -227,13 +227,13 @@ async function testExec(exe) {
})
})
asCommon['TheDesk:confirm'] = asValue.FN_NATIVE(async (z) => {
const alertSwal = await Swal.fire({
const alert = await Swal.fire({
title: z[0].value,
text: z[1].value,
icon: z[2] ? z[2].value : 'info',
showCancelButton: true
})
return asUtil.jsToVal(!!(alertSwal.value && alertSwal.value === true))
return asUtil.jsToVal(!!(alert.value && alert.value === true))
})
asCommon['TheDesk:css'] = asValue.FN_NATIVE((z) => {
$(escapeHTML(z[0].value)).css(escapeHTML(z[1].value), escapeHTML(z[2].value))

View File

@ -7,17 +7,12 @@ window.addEventListener('DOMContentLoaded', () => {
ipc.send('acsCheck', '')
})
onmessage = async function (e) {
onmessage = function(e) {
if (e.data[0] == 'openUrl') {
urls = e.data[1].match(/https?:\/\/(.+)/)
if (urls) {
shell.openExternal(e.data[1])
}
} else if (e.data[0] == 'openUrlMainProcess') {
urls = e.data[1].match(/https?:\/\/(.+)/)
if (urls) {
ipc.send('openUrl', e.data[1])
}
} else if (e.data[0] == 'sendSinmpleIpc') {
ipc.send(e.data[1], '')
} else if (e.data[0] == 'dialogStore') {
@ -84,8 +79,6 @@ onmessage = async function (e) {
ipc.send('sendMarkersComplete', null)
} else if (e.data[0] == 'copy') {
ipc.send('copy', e.data[1])
} else if (e.data[0] == 'copyBinary') {
ipc.send('copyBinary', e.data[1])
} else if (e.data[0] == 'log') {
ipc.send('log', e.data[1])
} else if (e.data[0] == 'twitterLogin') {
@ -96,16 +89,17 @@ onmessage = async function (e) {
}
//version.js
ipc.send('getPlatform', '')
ipc.on('platform', function (event, args) {
ipc.on('platform', function(event, args) {
localStorage.setItem('platform', args[0])
localStorage.setItem('bit', args[1])
localStorage.setItem('about', JSON.stringify([args[2], args[3], args[4], args[5]]))
})
ipc.on('reload', function (event, arg) {
ipc.on('reload', function(event, arg) {
location.reload()
})
//Native Notf
ipc.on('shownotf', function (event, args) {
ipc.on('shownotf', function(event, args) {
if (args['type'] == 'toot') {
postMessage(['details', [id, acct_id]], '*')
} else if (args['type'] == 'userdata') {
@ -114,7 +108,7 @@ ipc.on('shownotf', function (event, args) {
})
//first.js
ipc.on('custom-css-response', function (event, arg) {
ipc.on('custom-css-response', function(event, arg) {
if (arg == '') {
return false
}
@ -125,7 +119,7 @@ ipc.on('custom-css-response', function (event, arg) {
styleNode.append(content)
document.getElementsByTagName('head')[0].append(styleNode)
})
ipc.on('theme-css-response', function (event, arg) {
ipc.on('theme-css-response', function(event, arg) {
if (arg == '') {
return false
}
@ -137,7 +131,7 @@ ipc.on('theme-css-response', function (event, arg) {
document.getElementsByTagName('head')[0].append(styleNode)
})
//img.js
ipc.on('bmp-img-comp', function (event, b64) {
ipc.on('bmp-img-comp', function(event, b64) {
if (b64[2]) {
var stamped = true
} else {
@ -145,108 +139,108 @@ ipc.on('bmp-img-comp', function (event, b64) {
}
postMessage(['media', [b64[0], 'image/png', b64[1], stamped]], '*')
})
ipc.on('resizeJudgement', function (event, b64) {
ipc.on('resizeJudgement', function(event, b64) {
var resize = localStorage.getItem('uploadCrop') * 1
if (resize > 0) {
var element = new Image()
var width
element.onload = function () {
element.onload = function() {
var width = element.naturalWidth
var height = element.naturalHeight
if (width > resize || height > resize) {
ipc.send('resize-image', [b64[0], resize])
} else {
postMessage(['media', [b64[0], 'image/png', b64[1], null, b64[2]]], '*')
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
}
}
element.src = 'data:image/png;base64,' + b64[0]
} else {
postMessage(['media', [b64[0], 'image/png', b64[1], null, b64[2]]], '*')
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
}
})
//ui,img.js
ipc.on('general-dl-prog', function (event, arg) {
ipc.on('general-dl-prog', function(event, arg) {
console.log('Progress: ' + arg)
})
ipc.on('general-dl-message', function (event, arg) {
ipc.on('general-dl-message', function(event, arg) {
var argC = arg.replace(/\\/g, '\\\\')
console.log('saved')
postMessage(['toastSaved', [arg, argC]], '*')
})
//setting.js
ipc.on('langres', function (event, arg) {
ipc.on('langres', function(event, arg) {
location.href = '../' + arg + '/setting.html'
})
ipc.on('exportSettingsFile', function (event, arg) {
ipc.on('exportSettingsFile', function(event, arg) {
postMessage(['exportSettingsCore', arg], '*')
})
ipc.on('exportAllComplete', function (event, arg) {
ipc.on('exportAllComplete', function(event, arg) {
postMessage(['alert', 'Complete'], '*')
})
ipc.on('config', function (event, arg) {
ipc.on('config', function(event, arg) {
postMessage(['importSettingsCore', arg], '*')
})
ipc.on('savefolder', function (event, arg) {
ipc.on('savefolder', function(event, arg) {
localStorage.setItem('savefolder', arg)
})
ipc.on('font-list', function (event, arg) {
ipc.on('font-list', function(event, arg) {
postMessage(['fontList', arg], '*')
})
ipc.on('customSoundRender', function (event, args) {
ipc.on('customSoundRender', function(event, args) {
postMessage(['customSoundSave', [args[0], args[1]]], '*')
})
ipc.on('theme-json-list-response', function (event, args) {
ipc.on('theme-json-list-response', function(event, args) {
postMessage(['ctLoadCore', args], '*')
})
ipc.on('theme-json-delete-complete', function (event, args) {
ipc.on('theme-json-delete-complete', function(event, args) {
postMessage(['ctLoad', ''], '*')
})
ipc.on('theme-json-response', function (event, args) {
ipc.on('theme-json-response', function(event, args) {
postMessage(['customConnect', args], '*')
})
ipc.on('theme-json-create-complete', function (event, args) {
if (args != '') alert(args)
ipc.on('theme-json-create-complete', function(event, args) {
if(args != '') alert(args)
postMessage(['clearCustomImport', ''], '*')
postMessage(['ctLoad', ''], '*')
})
//spotify.js
ipc.on('itunes-np', function (event, arg) {
ipc.on('itunes-np', function(event, arg) {
postMessage(['npCore', arg], '*')
})
//tips.js
ipc.on('memory', function (event, arg) {
ipc.on('memory', function(event, arg) {
var use = arg[0]
var cpu = arg[1]
var total = arg[2]
postMessage(['renderMem', [use, cpu, total, arg[3], arg[4]]], '*')
})
//log
ipc.on('logData', function (event, args) {
ipc.on('logData', function(event, args) {
postMessage(['logData', args], '*')
})
//update.html
ipc.on('prog', function (event, arg) {
ipc.on('prog', function(event, arg) {
postMessage(['updateProg', arg], '*')
})
ipc.on('mess', function (event, arg) {
ipc.on('mess', function(event, arg) {
postMessage(['updateMess', arg], '*')
})
//misc
ipc.on('asRead', function (event, arg) {
ipc.on('asRead', function(event, arg) {
postMessage(['asRead', ''], '*')
})
ipc.on('asReadEnd', function (event, arg) {
ipc.on('asReadEnd', function(event, arg) {
postMessage(['asReadEnd', ''], '*')
})
ipc.on('accessibility', function (event, arg) {
ipc.on('accessibility', function(event, arg) {
postMessage(['accessibility', 'true'], '*')
})
ipc.on('twitterLoginComplete', function (event, arg) {
ipc.on('twitterLoginComplete', function(event, arg) {
postMessage(['twitterLoginComplete', ''], '*')
})
ipc.on('alert', function (event, arg) {
ipc.on('alert', function(event, arg) {
postMessage(['alert', arg], '*')
})
ipc.on('customUrl', function (event, args) {
ipc.on('customUrl', function(event, args) {
postMessage(['customUrl', args], '*')
})

View File

@ -57,7 +57,6 @@ function fileselect() {
//ファイル読み込み
function handleFileUpload(files, obj, no) {
console.log('nignog\n'+files+'\n'+obj+'\n'+no)
var fr = new FileReader()
fr.onload = function(evt) {
var b64 = evt.target.result
@ -73,24 +72,21 @@ function handleFileUpload(files, obj, no) {
return false
} else {
$('#b64-box').val(b64)
var ret = media(b64, files['type'], no, null, files['name'])
var ret = media(b64, files['type'], no)
}
}
element.src = b64
return false
}
$('#b64-box').val(b64)
var ret = media(b64, files['type'], no, null, files['name'])
var ret = media(b64, files['type'], no)
}
fr.readAsDataURL(files)
$('#mec').append(files['name'] + '/')
}
//ファイルアップロード
async function media(b64, type, no, stamped, filename) {
if (filename) filename=filename.split('/').slice(-1)
else filename='image.png' // probably from clipboard
console.log('nognig\n'+type+'\n'+no+'\n'+stamped)
async function media(b64, type, no, stamped) {
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var user = localStorage.getItem('user_' + acct_id)
@ -116,7 +112,7 @@ async function media(b64, type, no, stamped, filename) {
todo('Image Upload...')
var media = toBlob(b64, type)
var fd = new FormData()
fd.append('file', media, filename)
fd.append('file', media)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var httpreq = new XMLHttpRequest()
if (localStorage.getItem('mode_' + domain) == 'misskey') {
@ -269,7 +265,7 @@ element.addEventListener('paste', function(e) {
var i = mediav.split(',').length
}
// DataTransferItem の type に mime tipes があるのでそれを使う
media(base64, imageType, i, null, 'image.png')
media(base64, imageType, i)
}
fr.readAsDataURL(imageFile)

View File

@ -82,13 +82,7 @@ function post(mode, postvis, dry) {
$('.toot-btn-group').prop('disabled', true)
todo('Posting')
var at = localStorage.getItem('acct_' + acct_id + '_at')
let start = 'https://' + domain + '/api/v1/statuses'
let method = 'POST'
const editTarget = $('#tootmodal').attr('data-edit')
if (editTarget) {
start = start + `/${editTarget}`
method = 'PUT'
}
var start = 'https://' + domain + '/api/v1/statuses'
var reply = $('#reply').val()
if (str.indexOf(localStorage.getItem('stable')) == -1) {
str + ' #' + localStorage.getItem('stable')
@ -180,7 +174,7 @@ function post(mode, postvis, dry) {
return toot
}
var httpreq = new XMLHttpRequest()
httpreq.open(method, start, true)
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.setRequestHeader('Idempotency-Key', ideKey)
@ -381,6 +375,5 @@ function clear() {
width = 300
}
$('#post-box').css('width', width)
$('#tootmodal').attr('data-edit', null)
mdCheck()
}

View File

@ -15,7 +15,7 @@ function fav(id, acct_id, remote) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -34,7 +34,7 @@ function fav(id, acct_id, remote) {
}
} else {
var fav = json.favourites_count
//var fav = json.favourites_count;
//var fav = json.favourites_count;
}
} else {
var fav = json.favourites_count
@ -75,7 +75,7 @@ function rt(id, acct_id, remote, vis) {
} else {
httpreq.send()
}
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -132,7 +132,7 @@ function bkm(id, acct_id, tlid) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -201,7 +201,7 @@ async function follow(acct_id, resolve) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send(JSON.stringify(ent))
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -296,7 +296,7 @@ function block(acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
if (this.status !== 200) {
setLog(start, this.status, this.response)
@ -340,23 +340,13 @@ function muteDo(acct_id) {
var id = $('#his-data').attr('user-id')
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
const days = parseInt($('#days_mute').val(), 10)
const hours = parseInt($('#hours_mute').val(), 10)
const mins = parseInt($('#mins_mute').val(), 10)
const notf = $('#notf_mute:checked').val() === '1'
let duration = days * 24 * 60 * 60 + hours * 60 + mins
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var start = 'https://' + domain + '/api/mute/' + flagm
var ent = { i: at, userId: id }
var rq = JSON.stringify(ent)
} else {
var start = 'https://' + domain + '/api/v1/accounts/' + id + '/' + flag
const q = {
notifications: notf
}
if (duration > 0) q.duration = duration * 60
if (days < 0 || hours < 0 || mins < 0) return Swal.fire('Invalid number')
var rq = JSON.stringify(q)
var rq = ''
}
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
@ -364,7 +354,7 @@ function muteDo(acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send(rq)
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
if (this.status !== 200) {
setLog(start, this.status, this.response)
@ -381,15 +371,6 @@ function muteDo(acct_id) {
}
})
}
function muteMenu() {
$('#muteDuration').toggleClass('hide')
!$('#muteDuration').hasClass('hide') ? $('#his-des').css('max-height', '112px') : $('#his-des').css('max-height', '196px')
}
function muteTime(day, hour, min) {
$('#days_mute').val(day)
$('#hours_mute').val(hour)
$('#mins_mute').val(min)
}
//投稿削除
function del(id, acct_id) {
@ -413,7 +394,7 @@ function del(id, acct_id) {
httpreq.responseType = 'json'
httpreq.send()
}
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
if (this.status !== 200) {
setLog(start, this.status, this.response)
@ -453,50 +434,27 @@ function redraft(id, acct_id) {
httpreq.responseType = 'json'
httpreq.send()
}
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
var json = httpreq.response
draftToPost(json, acct_id, null)
draftToPost(json, acct_id, id)
}
}
}
})
}
// edit
function editToot(id, acct_id) {
show()
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/statuses/' + id + '/source'
var httpreq = new XMLHttpRequest()
httpreq.open('GET', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
var json = httpreq.response
draftToPost(json, acct_id, id)
}
}
}
function draftToPost(json, acct_id, id) {
$('#post-acct-sel').prop('disabled', true)
$('#post-acct-sel').val(acct_id)
$('select').formSelect()
if (id) $('#tootmodal').attr('data-edit', id)
mdCheck()
mediack = null
if (json.media_attachments) mediack = json.media_attachments[0]
//メディアがあれば
//メディアがあれば
var media_ids = []
if (mediack) {
for (var i = 0; i <= 4; i++) {
@ -555,7 +513,7 @@ function pin(id, acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -586,7 +544,7 @@ function request(id, flag, acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -612,7 +570,7 @@ function domainblock(add, flag, acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -639,7 +597,7 @@ function empUser() {
M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
} else {
var can
Object.keys(obj).forEach(function (key) {
Object.keys(obj).forEach(function(key) {
var usT = obj[key]
if (usT != id && !can) {
can = false
@ -671,7 +629,7 @@ function pinUser() {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -701,26 +659,26 @@ function staEx(mode) {
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + url
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
.then(function (response) {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
if (json.statuses) {
if (json.statuses[0]) {
var id = json.statuses[0].id

View File

@ -6,7 +6,7 @@ function additional(acct_id, tlid) {
$('#timeline-container .mention').addClass('parsed')
$('#timeline-container .hashtatwemg, #timeline-container [rel=tag]').each(function(i, elem) {
$('#timeline-container .hashtag, #timeline-container [rel=tag]').each(function(i, elem) {
var tags = $(this)
.attr('href')
.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/tags?\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/)
@ -233,10 +233,10 @@ function cardHtml(json, acct_id, id) {
if (json.html || json.provider_name == 'Twitter') {
if(isHad) {
var prved = `<img class="emoji" draggable="false" alt="✅"
src="https://energised.botegirl.parts/v/12.1.3/72x72/2705.png">`
src="https://twemoji.maxcdn.com/v/12.1.3/72x72/2705.png">`
var title = lang.lang_cards_trusted
}else{
var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://energised.botegirl.parts/v/12.1.4/72x72/26a0.png">'
var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/26a0.png">'
var title = lang.lang_cards_untrusted
}
analyze =`<a onclick="cardHtmlShow('${acct_id}','${id}')" class="add-show pointer" title="${title}">
@ -335,17 +335,7 @@ function cardCheck(tlid) {
}
}
function mov(id, tlid, type, rand, target)
{
mouseover=localStorage.getItem('mouseover')
switch (mouseover)
{
case 'yes': if (type=='mv') $(target).removeClass('hide-actions'); break;
case 'click': if (type=='cl') $(target).toggleClass('hide-actions'); break;
case 'no': break;
}
}
/*function mov(id, tlid, type, rand, target) {
function mov(id, tlid, type, rand, target) {
const dropdownTrigger = `dropdown_${rand}`
let elm = document.querySelector(`#timeline_${tlid} #${dropdownTrigger}`)
if(tlid == 'notf') {
@ -393,7 +383,7 @@ function mov(id, tlid, type, rand, target)
//$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
//$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
}
}*/
}
function resetmv(type) {
var mouseover = localStorage.getItem('mouseover')

View File

@ -1,12 +1,12 @@
//トゥートの詳細
async function details(id, acct_id, tlid, mode) {
function details(id, acct_id, tlid, mode) {
if (mode == 'dm') {
$('.dm-hide').hide()
} else {
$('.dm-hide').show()
}
const context = localStorage.getItem('moreContext')
if (context != 'yes') {
if(context != 'yes') {
$('.contextTool').hide()
} else {
$('.contextTool').show()
@ -39,99 +39,90 @@ async function details(id, acct_id, tlid, mode) {
}
}
}
try {
const response = await fetch(start, i)
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
const json = await response.json()
console.log(['Toot data:', json])
if (!$('#timeline_' + tlid + ' #pub_' + id).length) {
var mute = getFilterTypeByAcct(acct_id, 'thread')
var html = parse([json], '', acct_id, '', '', mute)
$('#toot-this').html(html)
jQuery('time.timeago').timeago()
}
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var url = 'https://' + domain + '/notes/' + json.id
var scn = json.user.username
if (!json.user.host) {
var local = true
fetch(start, i)
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
console.log(['Toot data:', json])
if (!$('#timeline_' + tlid + ' #pub_' + id).length) {
var html = parse([json], '', acct_id)
$('#toot-this').html(html)
jQuery('time.timeago').timeago()
}
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var url = 'https://' + domain + '/notes/' + json.id
var scn = json.user.username
if (!json.user.host) {
var local = true
} else {
var local = false
scn = scn + '@' + host
}
var rep = ''
var uid = json.user.id
if (json._replyIds) {
replyTL(json._replyIds[0], acct_id)
}
} else {
var local = false
scn = scn + '@' + host
var url = json.url
if (json.account.acct == json.account.username) {
var local = true
} else {
var local = false
}
var scn = json.account.acct
var uid = json.account.id
if (json['in_reply_to_id']) {
replyTL(json['in_reply_to_id'], acct_id)
}
}
var rep = ''
var uid = json.user.id
if (json._replyIds) {
replyTL(json._replyIds[0], acct_id)
}
} else {
var url = json.url
if (json.account.acct == json.account.username) {
var local = true
$('#toot-this .fav_ct').text(json.favourites_count)
$('#toot-this .rt_ct').text(json.reblogs_count)
$('#tootmodal').attr('data-url', url)
$('#tootmodal').attr('data-id', json.id)
$('#tootmodal').attr('data-acct', acct_id)
if (local) {
$('#tootmodal').attr('data-user', scn + '@' + domain)
} else {
var local = false
$('#tootmodal').attr('data-user', scn)
}
var scn = json.account.acct
var uid = json.account.id
if (json['in_reply_to_id']) {
replyTL(json['in_reply_to_id'], acct_id)
getContext(id, acct_id)
var dom = null
if (!local) {
dom = scn.replace(/.+@/g, '')
} else {
dom = domain
}
}
$('#toot-this .fav_ct').text(json.favourites_count)
$('#toot-this .rt_ct').text(json.reblogs_count)
$('#tootmodal').attr('data-url', url)
$('#tootmodal').attr('data-id', json.id)
$('#tootmodal').attr('data-acct', acct_id)
if (local) {
$('#tootmodal').attr('data-user', scn + '@' + domain)
} else {
$('#tootmodal').attr('data-user', scn)
}
getContext(id, acct_id)
var dom = null
if (!local) {
dom = scn.replace(/.+@/g, '')
} else {
dom = domain
}
beforeToot(id, acct_id, dom)
userToot(id, acct_id, uid)
afterToot(id, acct_id, dom)
afterUserToot(id, acct_id, uid)
afterFTLToot(id, acct_id, dom)
faved(id, acct_id)
rted(id, acct_id)
if (json.edited_at) {
$('.edited-hide').show()
try {
const history = await (await fetch(`https://${domain}/api/v1/statuses/${id}/history`, i)).json()
const temp = parse(history, 'noauth', acct_id)
console.log(temp)
$('#toot-edit').html(temp)
} catch(e) { console.error(e) }
} else {
$('#toot-edit').html('')
$('.edited-hide').hide()
}
if ($('#toot-this div').hasClass('cvo')) {
$('#toot-this').removeClass('cvo')
} else {
if (!$('#toot-this .cvo').hasClass('cvo')) {
$('#toot-this').addClass('cvo')
beforeToot(id, acct_id, dom)
userToot(id, acct_id, uid)
afterToot(id, acct_id, dom)
afterUserToot(id, acct_id, uid)
afterFTLToot(id, acct_id, dom)
faved(id, acct_id)
rted(id, acct_id)
if ($('#toot-this div').hasClass('cvo')) {
$('#toot-this').removeClass('cvo')
} else {
if (!$('#toot-this .cvo').hasClass('cvo')) {
$('#toot-this').addClass('cvo')
}
}
}
if (!$('#activator').hasClass('active')) {
$('#det-col').collapsible('open', 4)
}
} catch (error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
}
if (!$('#activator').hasClass('active')) {
$('#det-col').collapsible('open', 4)
}
})
}
//返信タイムライン
@ -154,20 +145,20 @@ function replyTL(id, acct_id) {
return false
}
fetch(start, i)
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var mute = getFilterTypeByAcct(acct_id, 'thread')
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var templete = misskeyParse([json], '', acct_id, '', '', mute)
@ -210,20 +201,20 @@ function getContext(id, acct_id) {
}
}
fetch(start, i)
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
if (localStorage.getItem('mode_' + domain) == 'misskey') {
json.reverse()
var templete = misskeyParse(json, '', acct_id, '', '', [])
@ -278,20 +269,20 @@ function beforeToot(id, acct_id, domain) {
untilID: id
})
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = misskeyParse(json, 'noauth', acct_id)
$('#toot-before').html(templete)
jQuery('time.timeago').timeago()
@ -304,20 +295,20 @@ function beforeToot(id, acct_id, domain) {
'content-type': 'application/json'
}
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = parse(json, 'noauth', acct_id)
if (templete != '') {
$('#toot-before .no-data').hide()
@ -344,20 +335,20 @@ function userToot(id, acct_id, user) {
userId: user
})
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = misskeyParse(json, 'noauth', acct_id)
$('#user-before').html(templete)
jQuery('time.timeago').timeago()
@ -371,20 +362,20 @@ function userToot(id, acct_id, user) {
Authorization: 'Bearer ' + at
}
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = parse(json, '', acct_id)
if (templete != '') {
$('#user-before .no-data').hide()
@ -405,20 +396,20 @@ function afterToot(id, acct_id, domain) {
'content-type': 'application/json'
}
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = parse(json, 'noauth', acct_id)
if (templete != '') {
$('#ltl-after .no-data').hide()
@ -439,20 +430,20 @@ function afterUserToot(id, acct_id, user) {
Authorization: 'Bearer ' + at
}
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = parse(json, '', acct_id)
if (templete != '') {
$('#user-after .no-data').hide()
@ -472,20 +463,20 @@ function afterFTLToot(id, acct_id, domain) {
'content-type': 'application/json'
}
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = parse(json, 'noauth', acct_id)
if (templete != '') {
$('#ftl-after .no-data').hide()
@ -510,20 +501,20 @@ function faved(id, acct_id) {
Authorization: 'Bearer ' + at
}
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = userparse(json, '', acct_id)
if (templete != '') {
$('#toot-fav .no-data').hide()
@ -548,20 +539,20 @@ function rted(id, acct_id) {
Authorization: 'Bearer ' + at
}
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var templete = userparse(json, '', acct_id)
$('#toot-rt').html(templete)
jQuery('time.timeago').timeago()
@ -600,38 +591,44 @@ function staCopy(id) {
}
//翻訳
function trans(tar, to, elem) {
var id = elem.parents('.cvo').attr('toot-id')
//alert(id)
$('#toot-this .additional').text('Loading...(Powered by Mastodon API)')
var domain = localStorage.getItem('domain_' + acct_id)
if (localStorage.getItem('mode_' + domain) == 'misskey') {
return false
var html = elem.parents('.cvo').find('.toot').html()
if (html.match(/^<p>(.+)<\/p>$/)) {
html = html.match(/^<p>(.+)<\/p>$/)[1]
}
var at = localStorage.getItem('acct_' + acct_id + '_at')
var exec = `https://${domain}/api/v1/statuses/${id}/translate`
html = html.replace(/<br\s?\/?>/g, '\n')
html = html.replace(/<p>/g, '\n')
html = html.replace(/<\/p>/g, '\n')
html = $.strip_tags(html)
if (~tar.indexOf('zh')) {
tar = 'zh'
}
$('#toot-this .additional').text('Loading...(Powered by Google Translate)')
var exec =
'https://script.google.com/macros/s/AKfycbxhwW5tjjop9Irg-y1zr_WsXlCKEzwWG6KuoOt_vVRDfEbRv0c/exec?format=json&text=' +
encodeURIComponent(html) +
'&source=' +
tar +
'&target=' +
to
console.log('Try to translate from ' + tar + ' to ' + to + ' at ' + exec)
fetch(exec, {
method: 'POST',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
method: 'GET'
})
.then(function (response) {
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (text) {
console.log(text)
elem.parents('.cvo').find('.toot').append('<span class="gray translate">' + text.content + '</span>')
.then(function(text) {
elem.parents('.cvo').find('.toot').append('<span class="gray translate">' + text.text + '</span>')
})
}
//ブラウザで開く

View File

@ -278,7 +278,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
var if_notf = 'data-notfIndv="' + acct_id + "_" + toot.id + '"'
var toot = toot.note
var dis_name = escapeHTML(toot.user.name || toot.user.username)
var dis_name = escapeHTML(toot.user.name)
} else {
var if_notf = ""
if (toot.renote) {
@ -291,7 +291,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if (!toot.text) {
var toot = toot.renote
}
var dis_name = escapeHTML(toot.user.name || toot.user.username)
var dis_name = escapeHTML(toot.user.name)
var uniqueid = toot.id
var actemojick = false
} else {
@ -606,8 +606,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
//Ticker
var tickerdom = ""
var tickerdata = JSON.parse(localStorage.getItem("ticker"))
if (ticker && tickerdata) {
if (ticker) {
var tickerdata = JSON.parse(localStorage.getItem("ticker"))
var thisdomain = toot.user.username.split("@")
if (thisdomain.length > 1) {
thisdomain = thisdomain[1]
@ -771,7 +772,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
} else {
var actemojick = false
}
var rand = makeCID()
var rand = uuid()
templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
boostback + ' ' + fav_app + ' ' + rt_app + ' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[
key].created_at, 'unix') + '" ' + if_notf + ' onmouseover="mov(\'' + toot.id + '\',\'' + tlid + '\',\'mv\', \'' + rand + '\')" onclick="mov(\'' + toot.id + '\',\'' + tlid + '\',\'cl\', \'' + rand + '\')" onmouseout="resetmv(\'mv\')" reacted="' + reacted + '">' +
@ -797,7 +798,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
'</span>' +
'' + viewer + '' +
'</div><div class="area-additional"><span class="additional">' + analyze +
'<div class="reactions ' + fullhide + '" style="height: 25px; position: relative; top: -7px;"><span class="' + likehide + ' reaction re-like"><a onclick="reaction(\'like\',\'' + toot.id + '\',' + acct_id +
'<div class="reactions ' + fullhide + '" style="height: 25px;"><span class="' + likehide + ' reaction re-like"><a onclick="reaction(\'like\',\'' + toot.id + '\',' + acct_id +
',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat" style="padding:0;margin-left:3px;">' + twemoji.parse("👍") + '</a><span class="re-likect">' + like +
'</span></span><span class="' + lovehide + ' reaction re-love"><a onclick="reaction(\'love\',\'' + toot.id + '\',' + acct_id +
',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">' + twemoji.parse("💓") + '</a><span class="re-lovect">' + love +

View File

@ -191,7 +191,6 @@ async function mixmore(tlid, type) {
var obj = JSON.parse(multi)
var acct_id = obj[tlid].domain
moreloading = true
console.log('moreloading mixmore '+tlid+' '+type)
todo('Integrated TL MoreLoading...(Local)')
const domain = localStorage.getItem('domain_' + acct_id)
const sid = $('#timeline_' + tlid + ' .cvo')

View File

@ -32,7 +32,6 @@ function notfColumn(acct_id, tlid, sys) {
} else {
var exc = ''
}
if (exc === 'null') exc = ''
var start = 'https://' + domain + '/api/v1/notifications' + exc
httpreq.open('GET', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
@ -42,7 +41,7 @@ function notfColumn(acct_id, tlid, sys) {
httpreq.responseType = 'json'
httpreq.send(body)
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -57,7 +56,7 @@ function notfColumn(acct_id, tlid, sys) {
var templete = ''
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
Object.keys(json).forEach(function (key) {
Object.keys(json).forEach(function(key) {
var obj = json[key]
if (lastnotf == obj.id && key > 0 && native == 'yes') {
var ct = key
@ -72,8 +71,8 @@ function notfColumn(acct_id, tlid, sys) {
var n = new Notification('TheDesk:' + domain, options)
}
var mute = getFilterTypeByAcct(acct_id, 'notif')
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (obj.type !== 'follow' && obj.type !== 'move' && obj.type !== 'request' && obj.type !== 'admin.sign_up') {
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
} else {
@ -91,12 +90,12 @@ function notfColumn(acct_id, tlid, sys) {
})
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#timeline_' + tlid).html(templete)
// $('#landing_' + tlid).hide()
// $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#notf-box').addClass('fetched')
todc()
//Markers
//Markers
var markers = localStorage.getItem('markers')
if (markers == 'yes') {
markers = true
@ -156,10 +155,10 @@ function notfCommon(acct_id, tlid, sys, stream) {
return false
}
fetch(start, i)
.then(function (response) {
.then(function(response) {
console.log('header to get param:' + response.headers.get('link'))
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
console.log('notf error', 'div[data-notf=' + acct_id + '] .landing')
$('div[data-notf=' + acct_id + '] .landing').append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
setLog(response.url, response.status, text)
@ -167,17 +166,17 @@ function notfCommon(acct_id, tlid, sys, stream) {
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
if (json[0]) {
var templete = ''
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
Object.keys(json).forEach(function (key) {
Object.keys(json).forEach(function(key) {
var obj = json[key]
if (lastnotf == obj.id && key > 0 && native == 'yes') {
var ct = key
@ -192,8 +191,8 @@ function notfCommon(acct_id, tlid, sys, stream) {
var n = new Notification('TheDesk:' + domain, options)
}
var mute = getFilterTypeByAcct(acct_id, 'notif')
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (obj.type !== 'follow' && obj.type !== 'move' && obj.type !== 'request' && obj.type !== 'admin.sign_up') {
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (obj.type != 'follow' && obj.type != 'move') {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
@ -208,7 +207,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
}
})
$('div[data-notf=' + acct_id + ']').html(templete)
// $('#landing_' + tlid).hide()
// $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#notf-box').addClass('fetched')
@ -229,7 +228,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
var wsid = websocketNotf.length
websocketNotf[acct_id] = new WebSocket(start)
websocketNotf[acct_id].onopen = function (mess) {
websocketNotf[acct_id].onopen = function(mess) {
console.table({
acct_id: acct_id,
type: 'Connect Streaming API(Notf)',
@ -238,9 +237,9 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
})
$('i[data-notf=' + acct_id + ']').removeClass('red-text')
}
websocketNotf[acct_id].onmessage = function (mess) {
websocketNotf[acct_id].onmessage = function(mess) {
$('#landing_' + tlid).hide()
//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
var popup = localStorage.getItem('popup')
if (!popup) {
popup = 0
@ -252,7 +251,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
localStorage.setItem('lastnotf_' + acct_id, obj.id)
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
//markers show中はダメ
if (obj.type !== 'follow' && obj.type !== 'move' && obj.type !== 'request' && obj.type !== 'admin.sign_up') {
if (obj.type != 'follow' && obj.type != 'follow_request') {
templete = parse([obj], 'notf', acct_id, 'notf', popup)
} else if (obj.type == 'follow_request') {
templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
@ -270,7 +269,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
$('[toot-id=' + obj + ']').remove()
}
}
websocketNotf[acct_id].onerror = function (error) {
websocketNotf[acct_id].onerror = function(error) {
console.error('WebSocket Error ', error)
errorct++
console.log(errorct)
@ -278,7 +277,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
notfWS(misskey, acct_id, tlid, domain, at)
}
}
websocketNotf[acct_id].onclose = function (error) {
websocketNotf[acct_id].onclose = function(error) {
console.error('WebSocket Close ', error)
errorct++
console.log(errorct)
@ -306,7 +305,6 @@ function notfmore(tlid) {
var domain = localStorage.getItem('domain_' + acct_id)
if (sid && !moreloading) {
moreloading = true
console.log('moreloading notfmore '+tlid)
var httpreq = new XMLHttpRequest()
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true
@ -333,7 +331,7 @@ function notfmore(tlid) {
httpreq.responseType = 'json'
httpreq.send(body)
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
@ -345,10 +343,10 @@ function notfmore(tlid) {
var templete = ''
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
Object.keys(json).forEach(function (key) {
Object.keys(json).forEach(function(key) {
var obj = json[key]
var mute = getFilterTypeByAcct(acct_id, 'notif')
if (obj.type !== 'follow' && obj.type !== 'move' && obj.type !== 'request' && obj.type !== 'admin.sign_up') {
if (obj.type != 'follow') {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
@ -365,7 +363,7 @@ function notfmore(tlid) {
moreloading = false
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#timeline_' + tlid).append(templete)
// $('#landing_' + tlid).hide()
// $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#notf-box').addClass('fetched')
@ -383,7 +381,7 @@ function notfToggle(acct, tlid) {
height: '400px',
}, {
duration: 300,
complete: function () {
complete: function() {
$('#notf-box_' + tlid).css('overflow-y', 'scroll')
$('#notf-box_' + tlid).removeClass('column-hide')
},
@ -394,7 +392,7 @@ function notfToggle(acct, tlid) {
height: '0',
}, {
duration: 300,
complete: function () {
complete: function() {
$('#notf-box_' + tlid).addClass('column-hide')
$('#notf-box_' + tlid).css('display', 'none')
},
@ -431,7 +429,7 @@ function allNotfRead() {
var multi = localStorage.getItem('multi')
if (multi) {
var obj = JSON.parse(multi)
Object.keys(obj).forEach(function (key) {
Object.keys(obj).forEach(function(key) {
notfCanceler(key)
})
}

File diff suppressed because it is too large Load Diff

View File

@ -30,14 +30,13 @@ function src(mode, offset) {
`)
var add = ''
} else {
var add = '&type=accounts&offset=' + $('#src-accts .cusr').length
var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
}
var q = $('#src').val()
var acct_id = $('#src-acct-sel').val()
if (acct_id == 'tootsearch') {
tsAdd(q)
$('#src-contents').html('')
return false
}
localStorage.setItem('last-use', acct_id)
@ -92,11 +91,6 @@ function src(mode, offset) {
#${escapeHTML(tag)}
</a>
<br> `
} else if (!tag.history) {
tags+=`<a onclick="tl('tag','${tag.name}','${acct_id}','add')" class="pointer">
#${escapeHTML(tag.name)}
</a>
<br> `
} else {
tags = tags + graphDraw(tag, acct_id)
}
@ -193,7 +187,6 @@ function moreTs(tlid, q) {
.last()
.attr('data-maxid')
moreloading = true
console.log('moreloading src '+tlid)
var start =
'https://tootsearch.chotto.moe/api/v1/search?from=' + sid + '&sort=created_at%3Adesc&q=' + q
$('#notice_' + tlid).text('tootsearch(' + q + ')')
@ -291,89 +284,51 @@ function graphDrawCore(his, tag, acct_id) {
</div>
</div>`
}
async function trend() {
/*
<svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
<path d="M0,0 L10,0 20,10 20,50" fill="#3F51B5"></path>
</svg>
*/
function trend() {
console.log('get trend')
$('#src-contents').html('')
var acct_id = $('#src-acct-sel').val()
if (acct_id == 'tootsearch') {
return false
}
const domain = localStorage.getItem('domain_' + acct_id)
const at = localStorage.getItem('acct_' + acct_id + '_at')
try {
const tagTrendUrl = 'https://' + domain + '/api/v1/trends'
const tagTrendResponse = await fetch(tagTrendUrl, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/trends'
console.log(start)
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
})
.then(function (response) {
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
if (!tagTrendResponse.ok) {
tagTrendResponse.text().then(function (text) {
setLog(tagTrendResponse.url, tagTrendResponse.status, text)
})
}
const tagTrends = await tagTrendResponse.json()
let tags = ''
for (const tag of tagTrends) {
const his = tag.history
tags = tags + graphDrawCore(his, tag, acct_id)
}
$('#src-contents').append(`<div id="src-content-tag">Trend Tags<br />${tags || 'none'}</div>`)
} catch {
}
try {
const tootTrendUrl = 'https://' + domain + '/api/v1/trends/statuses'
const tootTrendResponse = await fetch(tootTrendUrl, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
.catch(function (error) {
setLog(start, 'JSON', error)
console.error(error)
})
if (!tootTrendResponse.ok) {
tootTrendResponse.text().then(function (text) {
setLog(tootTrendResponse.url, tootTrendResponse.status, text)
.then(function (json) {
var tags = ''
Object.keys(json).forEach(function (keye) {
var tag = json[keye]
var his = tag.history
tags = graphDrawCore(his, tag, acct_id)
$('#src-contents').append(tags)
})
}
const tootTrends = await tootTrendResponse.json()
if (tootTrends.length) {
const templete = parse(tootTrends, '', acct_id)
$('#src-contents').append(`<div id="src-content-status">Trend Statuses<br />${templete}</div>`)
} else {
$('#src-contents').append(`<div id="src-content-status">Trend Statuses<br />none</div>`)
}
} catch {
}
try {
const linkTrendUrl = 'https://' + domain + '/api/v1/trends/links'
const linkTrendResponse = await fetch(linkTrendUrl, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
})
if (!linkTrendResponse.ok) {
linkTrendResponse.text().then(function (text) {
setLog(linkTrendResponse.url, linkTrendResponse.status, text)
})
}
const linkTrends = await linkTrendResponse.json()
console.log(linkTrends)
let links = ''
for (const link of linkTrends) {
links = links + `<a href="${link.url}" target="_blank">${link.url}</a><br />` + cardHtml(link, acct_id, '') + `<hr />`
}
$('#src-contents').append(`<div id="src-content-link">Trend Links<br />${links}</div>`)
} catch {
}
}
function srcBox(mode) {
if (mode == 'open') {

View File

@ -285,7 +285,6 @@ function stremaingSubscribe(type, acct_id, data, unsubscribe) {
let name = data
if (data.name) name = data.name
arr.push(name)
console.log(data.any, data.all, acct_id, type)
if (data.any) arr = arr.concat(data.any.split(','))
if (data.all) arr = arr.concat(data.all.split(','))
for (const tag of arr) {
@ -540,7 +539,6 @@ function moreload(type, tlid) {
return
}
moreloading = true
console.log('moreloading moreload '+tlid)
localStorage.setItem('now', type)
todo(cap(type) + ' TL MoreLoading')
if (type != 'noauth') {
@ -674,7 +672,6 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
return
}
moreloading = true
console.log('moreloading tldiff '+tlid)
localStorage.setItem('now', type)
todo(cap(type) + ' TL MoreLoading')
if (type != 'noauth') {
@ -1355,7 +1352,6 @@ function asReadEnd() {
//ブックマーク
function getBookmark(acct_id, tlid, more) {
moreloading = true
console.log('moreloading getbookmark '+tlid)
console.log(acct_id, tlid, more)
if (more) {
var sid = $('#timeline_' + tlid + ' .notif-marker')
@ -1410,7 +1406,6 @@ function getBookmark(acct_id, tlid, more) {
function getUtl(acct_id, tlid, data, more) {
moreloading = true
console.log('moreloading getutl '+tlid)
if (more) {
var sid = $('#timeline_' + tlid + ' .cvo')
.last()

View File

@ -22,40 +22,20 @@ function imgv(id, key, acct_id) {
murl = ourl
}
$(document).ready(function () {
if (type == 'image') {display_image(murl,id,key)}
else if (type == 'video') {display_video(murl)}
else if (type == 'gifv')
{
if (remote_img == 'no') {display_video(murl)}
else
{
// Need to detect if it's a video or a gif, depends if it came from pleroma or mastodon
// Using extension is a bad idea but w/e
// Actually if it's from mastodon the extension will be mp4.
if (murl.endsWith('.mp4')) {display_video(murl)}
else {display_image(murl,id,key)}
}
if (type == 'image') {
$('#imagemodal').modal('open')
imageXhr(id, key, murl)
$('#imagewrap').dragScroll() // ドラッグスクロール設定
$('#imgmodal').show()
$('#imagemodal').attr('data-key', key)
$('#imagemodal').attr('data-id', id)
} else if (type == 'video' || type == 'gifv') {
$('#video').attr('src', murl)
$('#videomodal').modal('open')
$('#imgmodal').show()
}
})
}
function display_image(murl,id,key)
{
$('#imagemodal').modal('open')
imageXhr(id, key, murl)
$('#imagewrap').dragScroll() // ドラッグスクロール設定
$('#imgmodal').show()
$('#imagemodal').attr('data-key', key)
$('#imagemodal').attr('data-id', id)
}
function display_video(murl,id=null,key=null)
{
$('#video').attr('src', murl)
$('#videomodal').modal('open')
$('#imgmodal').show()
}
//イメージビューワーの送り
function imgCont(type) {
var key = $('#imagemodal').attr('data-key')
@ -67,9 +47,6 @@ function imgCont(type) {
}
var murl = $('#' + id + '-image-' + key).attr('data-url')
var ourl = $('#' + id + '-image-' + key).attr('data-original')
if (!ourl || ourl == 'null') {
ourl = murl
}
var type = $('#' + id + '-image-' + key).attr('data-type')
$('#imagemodal').attr('data-id', id)
$('#imagemodal').attr('data-acct', acct_id)
@ -77,7 +54,7 @@ function imgCont(type) {
$('#imagemodal').attr('data-image', murl)
//表示はリモートを使うか(どちらにしろコピーはオリジナル)
var remote_img = localStorage.getItem('remote_img')
if (remote_img == 'yes') {
if (remote_img == 'yes' && ourl != 'null') {
murl = ourl
}
if (murl) {
@ -99,12 +76,7 @@ function imgCont(type) {
}
}
function imageXhr(id, key, murl) {
let time = 0
var startTime = new Date()
const timer = setInterval(function () {
time = time + 1
$('#imgsec').text(time < 5000 ? time : '?')
}, 10)
$('#imgmodal-progress div').removeClass('determinate')
$('#imgmodal-progress div').addClass('indeterminate')
$('#imgmodal-progress').removeClass('hide')
@ -117,7 +89,6 @@ function imageXhr(id, key, murl) {
if (event.lengthComputable) {
var total = event.total
var now = event.loaded
$('#imgbyte').text(`${Math.floor(now / 1024)}KB/${Math.floor(total / 1024)}`)
var per = (now / total) * 100
$('#imgmodal-progress div').removeClass('indeterminate')
$('#imgmodal-progress div').addClass('determinate')
@ -176,7 +147,6 @@ function imageXhr(id, key, murl) {
}
element.src = b64
var endTime = new Date()
clearInterval(timer)
var proctime = endTime.getTime() - startTime.getTime()
$('#imgsec').text(proctime)
$('#imgmodal').attr('src', b64)
@ -359,23 +329,10 @@ function openFinder(dir) {
postMessage(['openFinder', dir], '*')
}
function stopVideo() {
video=document.getElementById('video')
video.pause()
video.src=''
//document.getElementById('video').pause()
document.getElementById('video').pause()
}
function copyImgUrl() {
var murl = $('#imagemodal').attr('data-original')
execCopy(murl)
M.toast({ html: lang.lang_img_copyDone, displayLength: 1500 })
}
async function copyImgBinary() {
var murl = $('#imagemodal').attr('data-original')
const blob = await (await fetch(murl)).blob()
const reader = new FileReader()
reader.onloadend = function () {
postMessage(['copyBinary', reader.result], '*')
M.toast({ html: lang.lang_imgBin_copyDone, displayLength: 1500 })
}
reader.readAsDataURL(blob)
}

View File

@ -26,6 +26,12 @@ function parseColumn(target, dontclose) {
target = 'zero'
}
console.log('%c Parse column', 'color:red;font-size:125%')
var size = localStorage.getItem('size')
if (size) {
$('#timeline-container').css('font-size', size + 'px')
$('.toot-reset').css('font-size', size + 'px')
$('.cont-series').css('font-size', size + 'px')
}
if (localStorage.getItem('menu-done')) {
$('#fukidashi').addClass('hide')
}
@ -642,6 +648,8 @@ function addselCk() {
}
//カラム削除
function removeColumn(tlid) {
$('#sort-box').addClass('hide')
$('#sort-box').removeClass('show')
Swal.fire({
title: lang.lang_layout_deleteColumn,
text: lang.lang_layout_deleteColumnDesc,

View File

@ -60,10 +60,11 @@ function goTop(id) {
$('#timeline_box_' + id + '_box .tl-box').animate({ scrollTop: 0 })
}
function goColumn(key) {
$('#sort-box').addClass('hide')
$('#sort-box').removeClass('show')
if ($('[tlid=' + key + ']').length) {
$('#timeline-container').animate({
scrollLeft: $('#timeline-container').scrollLeft() + $('[tlid=' + key + ']').offset().left
})
}
sortLoad()
}

View File

@ -1,13 +1,10 @@
//設定(setting.html)で読む
const envView = Vue.createApp({
data() {
return {
config: envConstruction
}
},
var envView = new Vue({
el: '#envView',
data: { config: envConstruction },
methods: {
complete: function (i, val) {
var ls = this.config[i]
complete: function(i, val) {
var ls = envView.config[i]
let header = ls.text.head
if (!ls.data) {
ls = [ls]
@ -32,19 +29,17 @@ const envView = Vue.createApp({
if (ls[0].id == 'frame') {
frameSet(val)
}
if (ls[0].id == 'size') {
$('html,body').css('font-size', `${val}px`)
}
M.toast({ html: `Updated: ${header}`, displayLength: 3000 })
return true
},
},
}).mount('#envView')
const tlView = Vue.createApp({
data() { return { config: tlConstruction } },
})
var tlView = new Vue({
el: '#tlView',
data: { config: tlConstruction },
methods: {
complete: function (i, val) {
var ls = this.config[i]
complete: function(i, val) {
var ls = tlView.config[i]
let header = ls.text.head
if (val) {
localStorage.setItem(ls.storage, val)
@ -64,40 +59,39 @@ const tlView = Vue.createApp({
return true
},
},
}).mount('#tlView')
const postView = Vue.createApp({
data() {
return {
})
var postView = new Vue({
el: '#postView',
data: {
config: postConstruction,
kirishima: localStorage.getItem('kirishima'),
quoters: localStorage.getItem('quoters'),
}
},
methods: {
complete: function (i, val) {
var ls = this.config[i]
let header = ls.text.head
if (val) {
localStorage.setItem(ls.storage, val)
} else {
if (!ls.data) {
ls = [ls]
} else {
ls = ls.data
}
for (var j = 0; j < ls.length; j++) {
M.toast({ html: 'Complete', displayLength: 3000 })
var id = ls[j].id
var val = $('#' + id).val()
localStorage.setItem(ls[j].storage, val)
}
}
M.toast({ html: `Updated: ${header}`, displayLength: 3000 })
return true
},
},
}).mount('#postView')
//設定ボタン押した。
methods: {
complete: function(i, val) {
var ls = postView.config[i]
let header = ls.text.head
if (val) {
localStorage.setItem(ls.storage, val)
} else {
if (!ls.data) {
ls = [ls]
} else {
ls = ls.data
}
for (var j = 0; j < ls.length; j++) {
M.toast({ html: 'Complete', displayLength: 3000 })
var id = ls[j].id
var val = $('#' + id).val()
localStorage.setItem(ls[j].storage, val)
}
}
M.toast({ html: `Updated: ${header}`, displayLength: 3000 })
return true
},
},
})
//設定ボタン押した。
function settings() {
var fontd = $('#font').val()
if (fontd) {
@ -231,7 +225,7 @@ function climute() {
return
}
var templete
Object.keys(obj).forEach(function (key) {
Object.keys(obj).forEach(function(key) {
var cli = obj[key]
var list = key * 1 + 1
templete =
@ -346,18 +340,18 @@ function exportSettings() {
function exportSettingsCore() {
var exp = {}
//Accounts
//Accounts
var multi = localStorage.getItem('multi')
var acct = JSON.parse(multi)
exp.accts = acct
//Columns
//Columns
var multi = localStorage.getItem('column')
var column = JSON.parse(multi)
exp.columns = column
//Themes
//Themes
var config = {}
config.theme = localStorage.getItem('theme')
//Other configs
//Other configs
var max = envView.config.length
for (var i = 0; i < max; i++) {
var ls = envView.config[i].storage
@ -376,17 +370,17 @@ function exportSettingsCore() {
//Font
config.font = localStorage.getItem('font')
exp.config = config
//keysc
//keysc
exp.ksc = [localStorage.getItem('oks-1'), localStorage.getItem('oks-2'), localStorage.getItem('oks-3')]
//climu
//climu
var cli = localStorage.getItem('client_mute')
var climu = JSON.parse(cli)
exp.clientMute = climu
//wordmu
//wordmu
var wdm = localStorage.getItem('word_mute')
var wordmu = JSON.parse(wdm)
exp.wordMute = wordmu
//spotify
//spotify
exp.spotifyArtwork = localStorage.getItem('artwork')
var content = localStorage.getItem('np-temp')
if (content || content == '' || content == 'null') {
@ -397,7 +391,7 @@ function exportSettingsCore() {
//tags
var tagarr = localStorage.getItem('tag')
var favtag = JSON.parse(tagarr)
//plugins
//plugins
var plugins = localStorage.getItem('plugins')
var plugin = JSON.parse(plugins)
exp.plugins = plugin
@ -488,7 +482,7 @@ function importSettingsCore(obj) {
localStorage.setItem('cwtext', obj.cw)
}
localStorage.setItem('vis', obj.vis)
//End
//End
}
if (obj.ksc[0]) {
localStorage.setItem('oks-1', obj.ksc[0])
@ -657,297 +651,297 @@ function ctLoad() {
function ctLoadCore(args) {
var template = ''
var editTemplate = ''
Object.keys(args).forEach(function (key) {
var theme = args[key]
var themeid = theme.id
template = template + `<option value="${themeid}">${theme.name}${theme.compatible ? `(${lang.lang_setting_compat})` : ''}</option>`
if (!theme.compatible) editTemplate = editTemplate + `<option value="${themeid}">${theme.name}</option>`
})
$('#custom-sel-sel').html(template)
editTemplate = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + editTemplate
$('#custom-edit-sel').html(editTemplate)
$('#custom-sel-sel').val(localStorage.getItem('customtheme-id'))
$('select').formSelect()
Object.keys(args).forEach(function(key) {
var theme = args[key]
var themeid = theme.id
template = template + `<option value="${themeid}">${theme.name}${theme.compatible ? `(${lang.lang_setting_compat})` : ''}</option>`
if (!theme.compatible) editTemplate = editTemplate + `<option value="${themeid}">${theme.name}</option>`
})
$('#custom-sel-sel').html(template)
editTemplate = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + editTemplate
$('#custom-edit-sel').html(editTemplate)
$('#custom-sel-sel').val(localStorage.getItem('customtheme-id'))
$('select').formSelect()
}
function customSel() {
var id = $('#custom-sel-sel').val()
localStorage.setItem('customtheme-id', id)
themes(id)
var id = $('#custom-sel-sel').val()
localStorage.setItem('customtheme-id', id)
themes(id)
}
function custom() {
var id = $('#custom-edit-sel').val()
if (id == 'add_new') {
$('#custom_name').val('')
$('#custom_desc').val('')
$('#dark').prop('checked', true)
$('#custom_json').val('')
for (var i = 0; i <= 13; i++) {
if (i >= 4) $(`#use-color_${i}`).prop('checked', false)
$('#color-picker' + i + '_value').val('')
}
$('#delTheme').addClass('disabled')
} else {
$('#delTheme').removeClass('disabled')
postMessage(['themeJsonRequest', id + '.thedesktheme'], '*')
}
var id = $('#custom-edit-sel').val()
if (id == 'add_new') {
$('#custom_name').val('')
$('#custom_desc').val('')
$('#dark').prop('checked', true)
$('#custom_json').val('')
for (var i = 0; i <= 13; i++) {
if (i >= 4) $(`#use-color_${i}`).prop('checked', false)
$('#color-picker' + i + '_value').val('')
}
$('#delTheme').addClass('disabled')
} else {
$('#delTheme').removeClass('disabled')
postMessage(['themeJsonRequest', id + '.thedesktheme'], '*')
}
}
function customConnect(raw) {
var args = raw[0]
$('#custom_name').val(`${args.name} ${args.default ? 'Customed' : ''}`)
$('#custom_desc').val(args.default ? 'TheDesk default theme with some changes by user' : args.desc)
$('#' + args.base).prop('checked', true)
//Background
$('#color-picker0_value').val(args.primary.background)
//Text
$('#color-picker1_value').val(args.primary.text)
//Subcolor
$('#color-picker2_value').val(args.primary.subcolor)
//Accent
$('#color-picker3_value').val(args.primary.accent)
let advanced = ['modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
let i = 4
for (tag of advanced) {
if (args.advanced[tag]) {
$(`#color-picker${i}_value`).val(args.advanced[tag])
}
$(`#use-color_${i}`).prop('checked', true)
i++
}
$('#custom_json').val(raw[1])
if (args.default) {
$('#delTheme').addClass('disabled')
}
var args = raw[0]
$('#custom_name').val(`${args.name} ${args.default ? 'Customed' : ''}`)
$('#custom_desc').val(args.default ? 'TheDesk default theme with some changes by user' : args.desc)
$('#' + args.base).prop('checked', true)
//Background
$('#color-picker0_value').val(args.primary.background)
//Text
$('#color-picker1_value').val(args.primary.text)
//Subcolor
$('#color-picker2_value').val(args.primary.subcolor)
//Accent
$('#color-picker3_value').val(args.primary.accent)
let advanced = ['modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
let i = 4
for (tag of advanced) {
if (args.advanced[tag]) {
$(`#color-picker${i}_value`).val(args.advanced[tag])
}
$(`#use-color_${i}`).prop('checked', true)
i++
}
$('#custom_json').val(raw[1])
if (args.default) {
$('#delTheme').addClass('disabled')
}
}
function customImp() {
var json = $('#custom_import').val()
if (JSON5.parse(json)) {
postMessage(['themeJsonCreate', json], '*')
} else {
Swal.fire({
type: 'error',
title: 'Error',
})
}
var json = $('#custom_import').val()
if (JSON5.parse(json)) {
postMessage(['themeJsonCreate', json], '*')
} else {
Swal.fire({
type: 'error',
title: 'Error',
})
}
}
function advanced() {
$('.advanced').toggleClass('hide')
$('#pickers').toggleClass('advanceTheme')
$('.advanced').toggleClass('hide')
$('#pickers').toggleClass('advanceTheme')
}
function clearCustomImport() {
$('#custom_import').val('')
$('#custom_import').val('')
}
function hardwareAcceleration(had) {
postMessage(['ha', had], '*')
postMessage(['ha', had], '*')
}
function useragent(val) {
postMessage(['ua', val], '*')
postMessage(['ua', val], '*')
}
function frameSet(val) {
postMessage(['frameSet', val], '*')
postMessage(['frameSet', val], '*')
}
function customSound(key) {
postMessage(['customSound', key], '*')
postMessage(['customSound', key], '*')
}
function customSoundSave(key, file) {
localStorage.setItem('custom' + key, file)
$(`#c${key}-file`).text(file)
localStorage.setItem('custom' + key, file)
$(`#c${key}-file`).text(file)
}
function pluginLoad() {
$('#plugin-edit-sel').val('add_new')
$('.plugin_delete').addClass('disabled')
var template = ''
var pgns = localStorage.getItem('plugins')
var args = JSON.parse(pgns ? pgns : '[]')
Object.keys(args).forEach(function (key) {
var theme = args[key]
var themeid = theme.id
template = template + `<option value="${themeid}">${getMeta(theme.content).data.name}</option>`
})
template = '<option value="add_new">' + $('#plugin-selector').attr('data-add') + '</option>' + template
$('#plugin-edit-sel').html(template)
$('select').formSelect()
$('#plugin-edit-sel').val('add_new')
$('.plugin_delete').addClass('disabled')
var template = ''
var pgns = localStorage.getItem('plugins')
var args = JSON.parse(pgns ? pgns : '[]')
Object.keys(args).forEach(function (key) {
var theme = args[key]
var themeid = theme.id
template = template + `<option value="${themeid}">${getMeta(theme.content).data.name}</option>`
})
template = '<option value="add_new">' + $('#plugin-selector').attr('data-add') + '</option>' + template
$('#plugin-edit-sel').html(template)
$('select').formSelect()
}
function pluginEdit() {
var id = $('#plugin-edit-sel').val()
$('#plugin').attr('data-id', id)
if (id == 'add_new') {
editor.setValue('', -1)
$('.plugin_delete').addClass('disabled')
} else {
$('.plugin_delete').removeClass('disabled')
var pgns = localStorage.getItem('plugins')
var args = JSON.parse(pgns ? pgns : '[]')
Object.keys(args).forEach(function (key) {
var plugin = args[key]
var targetId = plugin.id
if (targetId == id) editor.setValue(plugin.content, -1)
})
}
var id = $('#plugin-edit-sel').val()
$('#plugin').attr('data-id', id)
if (id == 'add_new') {
editor.setValue('', -1)
$('.plugin_delete').addClass('disabled')
} else {
$('.plugin_delete').removeClass('disabled')
var pgns = localStorage.getItem('plugins')
var args = JSON.parse(pgns ? pgns : '[]')
Object.keys(args).forEach(function (key) {
var plugin = args[key]
var targetId = plugin.id
if (targetId == id) editor.setValue(plugin.content, -1)
})
}
}
function completePlugin(comp) {
var pgns = localStorage.getItem('plugins')
var args = JSON.parse(pgns ? pgns : '[]')
var id = $('#plugin').attr('data-id')
var pgns = localStorage.getItem('plugins')
var args = JSON.parse(pgns ? pgns : '[]')
var id = $('#plugin').attr('data-id')
var inputPlugin = editor.getValue()
var meta = getMeta(inputPlugin)
if (!meta.data) {
Swal.fire({
icon: 'error',
title: 'Syntax Error',
text: `error on line ${meta.location.start.line}`,
text: meta,
})
return false
}
if (!meta.data.name || !meta.data.version || !meta.data.event || !meta.data.author) {
Swal.fire({
icon: 'error',
title: 'Meta data error',
title: 'Syntax Error of META DATA',
})
return false
}
if (id == 'add_new') {
id = makeCID()
args.push({
id: id,
content: inputPlugin,
})
} else {
Object.keys(args).forEach(function (key) {
var plugin = args[key]
var targetId = plugin.id
if (targetId == id) args[key].content = inputPlugin
})
}
var ss = args
localStorage.setItem('plugins', JSON.stringify(ss))
if (comp) return false
$('#plugin').attr('data-id', 'add_new')
editor.setValue('', -1)
pluginLoad()
var inputPlugin = editor.getValue()
var meta = getMeta(inputPlugin)
if (!meta.data) {
Swal.fire({
icon: 'error',
title: 'Syntax Error',
text: `error on line ${meta.location.start.line}`,
text: meta,
})
return false
}
if (!meta.data.name || !meta.data.version || !meta.data.event || !meta.data.author) {
Swal.fire({
icon: 'error',
title: 'Meta data error',
title: 'Syntax Error of META DATA',
})
return false
}
if (id == 'add_new') {
id = makeCID()
args.push({
id: id,
content: inputPlugin,
})
} else {
Object.keys(args).forEach(function (key) {
var plugin = args[key]
var targetId = plugin.id
if (targetId == id) args[key].content = inputPlugin
})
}
var ss = args
localStorage.setItem('plugins', JSON.stringify(ss))
if (comp) return false
$('#plugin').attr('data-id', 'add_new')
editor.setValue('', -1)
pluginLoad()
}
function testExecTrg() {
var inputPlugin = editor.getValue()
var meta = getMeta(inputPlugin)
if (meta.location) {
Swal.fire({
icon: 'error',
title: 'Error',
text: `error on line ${meta.location.start.line}`,
text: meta,
})
return false
}
testExec(inputPlugin)
var inputPlugin = editor.getValue()
var meta = getMeta(inputPlugin)
if (meta.location) {
Swal.fire({
icon: 'error',
title: 'Error',
text: `error on line ${meta.location.start.line}`,
text: meta,
})
return false
}
testExec(inputPlugin)
}
async function deletePlugin() {
const delIsIt = await Swal.fire({
title: 'delete',
icon: 'warning',
showCancelButton: true,
})
if (!delIsIt.isConfirmed) return false
editor.setValue('', -1)
var pgns = localStorage.getItem('plugins')
var args = JSON.parse(pgns ? pgns : '[]')
var id = $('#plugin').attr('data-id')
$('#plugin').attr('data-id', 'add_new')
var ss = []
Object.keys(args).forEach(function (key) {
var plugin = args[key]
var targetId = plugin.id
if (targetId != id) ss.push(plugin)
})
localStorage.setItem('plugins', JSON.stringify(ss))
pluginLoad()
const alert = await Swal.fire({
title: 'delete',
icon: 'warning',
showCancelButton: true,
})
if (!alert) return false
editor.setValue('', -1)
var pgns = localStorage.getItem('plugins')
var args = JSON.parse(pgns ? pgns : '[]')
var id = $('#plugin').attr('data-id')
$('#plugin').attr('data-id', 'add_new')
var ss = []
Object.keys(args).forEach(function (key) {
var plugin = args[key]
var targetId = plugin.id
if (targetId != id) ss.push(plugin)
})
localStorage.setItem('plugins', JSON.stringify(ss))
pluginLoad()
}
function execEditPlugin() {
completePlugin(true)
var id = $('#plugin').attr('data-id')
var inputPlugin = editor.getValue()
var meta = getMeta(inputPlugin).data
execPlugin(id, meta.event, { acct_id: 0, id: null })
completePlugin(true)
var id = $('#plugin').attr('data-id')
var inputPlugin = editor.getValue()
var meta = getMeta(inputPlugin).data
execPlugin(id, meta.event, { acct_id: 0, id: null })
}
window.onload = function () {
//最初に読む
load()
climute()
wordmute()
wordemp()
checkSpotify()
voiceSettingLoad()
oksload()
ctLoad()
pluginLoad()
$('body').addClass(localStorage.getItem('platform'))
//最初に読む
load()
climute()
wordmute()
wordemp()
checkSpotify()
voiceSettingLoad()
oksload()
ctLoad()
pluginLoad()
$('body').addClass(localStorage.getItem('platform'))
}
//設定画面で未読マーカーは要らない
function asReadEnd() {
postMessage(['asReadComp', ''], '*')
postMessage(['asReadComp', ''], '*')
}
function checkupd() {
if (localStorage.getItem('winstore') == 'brewcask' || localStorage.getItem('winstore') == 'snapcraft' || localStorage.getItem('winstore') == 'winstore') {
var winstore = true
} else {
var winstore = false
}
var ver = localStorage.getItem('ver')
var start = 'https://thedesk.top/ver.json'
fetch(start, {
method: 'GET',
})
.then(function (response) {
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (mess) {
console.table(mess)
if (mess) {
var platform = localStorage.getItem('platform')
if (platform == 'darwin') {
var newest = mess.desk_mac
} else {
var newest = mess.desk
}
if (newest == ver) {
Swal.fire({
type: 'info',
text: lang.lang_setting_noupd,
html: ver,
})
} else if (ver.indexOf('beta') != -1 || winstore) {
Swal.fire({
type: 'info',
text: lang.lang_setting_thisisbeta,
html: ver,
})
} else {
localStorage.removeItem('new-ver-skip')
location.href = 'index.html'
}
}
})
if (localStorage.getItem('winstore') == 'brewcask' || localStorage.getItem('winstore') == 'snapcraft' || localStorage.getItem('winstore') == 'winstore') {
var winstore = true
} else {
var winstore = false
}
var ver = localStorage.getItem('ver')
var start = 'https://thedesk.top/ver.json'
fetch(start, {
method: 'GET',
})
.then(function (response) {
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (mess) {
console.table(mess)
if (mess) {
var platform = localStorage.getItem('platform')
if (platform == 'darwin') {
var newest = mess.desk_mac
} else {
var newest = mess.desk
}
if (newest == ver) {
Swal.fire({
type: 'info',
text: lang.lang_setting_noupd,
html: ver,
})
} else if (ver.indexOf('beta') != -1 || winstore) {
Swal.fire({
type: 'info',
text: lang.lang_setting_thisisbeta,
html: ver,
})
} else {
localStorage.removeItem('new-ver-skip')
location.href = 'index.html'
}
}
})
}
function lastFmSet() {
if ($('#lastFmUser').val()) {
localStorage.setItem('lastFmUser', $('#lastFmUser').val())
} else {
localStorage.removeItem('lastFmUser')
}
M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
if ($('#lastFmUser').val()) {
localStorage.setItem('lastFmUser', $('#lastFmUser').val())
} else {
localStorage.removeItem('lastFmUser')
}
M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
}
function stopVideo() {
return false
return false
}

View File

@ -1,6 +1,6 @@
//ユーザーデータ表示
localStorage.removeItem('history')
//コード受信
//コード受信
if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
var mode = m[1]
@ -45,30 +45,30 @@ async function udgEx(user, acct_id) {
onBeforeOpen: () => {
Swal.showLoading()
},
onClose: () => { },
}).then((result) => { })
onClose: () => {},
}).then((result) => {})
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
.then(function (response) {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
.then(function(response) {
if (!response.ok) {
Swal.close()
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
if (json.accounts[0]) {
var id = json.accounts[0].id
udg(id, acct_id, true)
@ -80,7 +80,7 @@ async function udgEx(user, acct_id) {
return true
}
async function udg(user, acct_id, isSwal) {
function udg(user, acct_id, isSwal) {
reset()
if (!user) {
user = localStorage.getItem('user-id_' + acct_id)
@ -91,203 +91,203 @@ async function udg(user, acct_id, isSwal) {
misskeyUdg(user, acct_id)
return
}
const at = localStorage.getItem('acct_' + acct_id + '_at')
const start = 'https://' + domain + '/api/v1/accounts/' + user
const response = await fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
if (isSwal) Swal.close()
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/accounts/' + user
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
}
const json = await response.json()
//一つ前のユーザーデータ
if (!localStorage.getItem('history')) {
$('#his-history-btn').prop('disabled', true)
} else {
$('#his-history-btn').prop('disabled', false)
$('#his-data').attr('history', localStorage.getItem('history'))
}
//moved設定時
if (json.moved) {
M.toast({
html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>',
displayLength: 4000,
.then(function(response) {
if (isSwal) Swal.close()
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
}
if (json.limited) {
const limitedCheck = await Swal.fire({
title: lang.lang_showontl_limited_title,
text: lang.lang_showontl_limited,
icon: 'info',
showCancelButton: true
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
if (!limitedCheck.isConfirmed) return false
}
$('#his-data').modal('open')
$('#his-data').attr('user-id', user)
$('#his-data').attr('use-acct', acct_id)
if (json.username != json.acct) {
//Remote
$('#his-data').attr('remote', 'true')
var fullname = json.acct
} else {
$('#his-data').attr('remote', 'false')
var fullname = json.acct + '@' + domain
}
utlShow(json.id, '', acct_id)
flw(json.id, '', acct_id)
fer(json.id, '', acct_id)
var dis_name = escapeHTML(json.display_name)
dis_name = twemoji.parse(dis_name)
.then(function(json) {
//一つ前のユーザーデータ
if (!localStorage.getItem('history')) {
$('#his-history-btn').prop('disabled', true)
} else {
$('#his-history-btn').prop('disabled', false)
$('#his-data').attr('history', localStorage.getItem('history'))
}
//moved設定時
if (json.moved) {
M.toast({
html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>',
displayLength: 4000,
})
}
$('#his-data').modal('open')
$('#his-data').attr('user-id', user)
$('#his-data').attr('use-acct', acct_id)
if (json.username != json.acct) {
//Remote
$('#his-data').attr('remote', 'true')
var fullname = json.acct
} else {
$('#his-data').attr('remote', 'false')
var fullname = json.acct + '@' + domain
}
utlShow(json.id, '', acct_id)
flw(json.id, '', acct_id)
fer(json.id, '', acct_id)
var dis_name = escapeHTML(json.display_name)
dis_name = twemoji.parse(dis_name)
var note = json.note
if (json.emojis) {
var actemojick = json.emojis[0]
} else {
var actemojick = false
}
//絵文字があれば
if (actemojick) {
Object.keys(json.emojis).forEach(function (key5) {
var emoji = json.emojis[key5]
var shortcode = emoji.shortcode
var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">'
var regExp = new RegExp(':' + shortcode + ':', 'g')
dis_name = dis_name.replace(regExp, emoji_url)
note = note.replace(regExp, emoji_url)
})
}
//noteの解析
//var tags = '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
//var mens = '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
//note=note.replace(/#(\S+)/gi, tags)
//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
$('#his-name').html(dis_name)
$('#his-acct').text(json.acct)
$('#his-acct').attr('fullname', fullname)
$('#his-prof').attr('src', json.avatar)
$('#util-add').removeClass('hide')
const title = $('.column-first').html()
$('#my-data-nav .anc-link').removeClass('active-back')
$('.column-first').addClass('active-back')
$('#his-data-title').html(title)
$('#his-data').css('background-image', 'url(' + json.header + ')')
$('#his-sta').text(json.statuses_count)
$('#his-follow').text(json.following_count)
var flerc = json.followers_count
if (flerc < 0) {
flerc = '-'
}
$('#his-follower').text(flerc)
$('#his-since').text(crat(json.created_at))
$('#his-openin').attr('data-href', json.url)
if (json.fields) {
var table = ''
if (json.fields.length > 0) {
$('#his-des').css('max-height', '196px')
table = '<table id="his-field">'
for (var i = 0; i < json.fields.length; i++) {
var fname = json.fields[i].name
var fval = json.fields[i].value
if (json.fields[i].verified_at) {
var when = lang.lang_showontl_verified + ':' + crat(json.fields[i].verified_at)
var color = 'rgba(121,189,154,.25);'
var note = json.note
if (json.emojis) {
var actemojick = json.emojis[0]
} else {
var actemojick = false
}
//絵文字があれば
if (actemojick) {
Object.keys(json.emojis).forEach(function(key5) {
var emoji = json.emojis[key5]
var shortcode = emoji.shortcode
var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">'
var regExp = new RegExp(':' + shortcode + ':', 'g')
dis_name = dis_name.replace(regExp, emoji_url)
note = note.replace(regExp, emoji_url)
})
}
//noteの解析
//var tags = '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
//var mens = '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
//note=note.replace(/#(\S+)/gi, tags)
//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
$('#his-name').html(dis_name)
$('#his-acct').text(json.acct)
$('#his-acct').attr('fullname', fullname)
$('#his-prof').attr('src', json.avatar)
$('#util-add').removeClass('hide')
const title = $('.column-first').html()
$('#my-data-nav .anc-link').removeClass('active-back')
$('.column-first').addClass('active-back')
$('#his-data-title').html(title)
$('#his-data').css('background-image', 'url(' + json.header + ')')
$('#his-sta').text(json.statuses_count)
$('#his-follow').text(json.following_count)
var flerc = json.followers_count
if (flerc < 0) {
flerc = '-'
}
$('#his-follower').text(flerc)
$('#his-since').text(crat(json.created_at))
$('#his-openin').attr('data-href', json.url)
if (json.fields) {
var table = ''
if (json.fields.length > 0) {
$('#his-des').css('max-height', '250px')
table = '<table id="his-field">'
for (var i = 0; i < json.fields.length; i++) {
var fname = json.fields[i].name
var fval = json.fields[i].value
if (json.fields[i].verified_at) {
var when = lang.lang_showontl_verified + ':' + crat(json.fields[i].verified_at)
var color = 'rgba(121,189,154,.25);'
} else {
var when = ''
var color = 'inherit'
}
table =
table +
'<tr><td class="his-field-title">' +
escapeHTML(fname) +
'</td><td class="his-field-content" title="' +
when +
'" style="background-color:' +
color +
'">' +
fval +
'</td></tr>'
}
table = table + '</table>'
$('#his-des').html(twemoji.parse(note))
} else {
var when = ''
var color = 'inherit'
$('#his-des').css('max-height', '400px')
}
table =
table +
'<tr><td class="his-field-title">' +
escapeHTML(fname) +
'</td><td class="his-field-content" title="' +
when +
'" style="background-color:' +
color +
'">' +
fval +
'</td></tr>'
$('#his-table').html(twemoji.parse(table))
} else {
$('#his-des').css('max-height', '400px')
}
table = table + '</table>'
$('#his-des').html(twemoji.parse(note))
} else {
$('#his-des').css('max-height', '400px')
}
$('#his-table').html(twemoji.parse(table))
} else {
$('#his-des').css('max-height', '400px')
}
$('#his-des').html(twemoji.parse(note))
if (json.bot) {
$('#his-bot').html(lang.lang_showontl_botacct)
$('#his-bot').removeClass('hide')
}
$('#his-des').attr('data-acct', acct_id)
$('#his-data').css('background-size', 'cover')
$('#his-float-timeline').css('height', $('#his-data-show').height() + 'px')
localStorage.setItem('history', user)
//自分の時
if (json.acct == localStorage.getItem('user_' + acct_id)) {
showFav('', acct_id)
showBlo('', acct_id)
showMut('', acct_id)
showDom('', acct_id)
showReq('', acct_id)
showFrl('', acct_id)
$('#his-name-val').val(json.display_name)
if (json.fields.length > 0) {
if (json.fields[0]) {
$('#his-f1-name').val(json.fields[0].name)
$('#his-f1-val').val($.strip_tags(json.fields[0].value))
if (json.bot) {
$('#his-bot').html(lang.lang_showontl_botacct)
$('#his-bot').removeClass('hide')
}
if (json.fields[1]) {
$('#his-f2-name').val(json.fields[1].name)
$('#his-f2-val').val($.strip_tags(json.fields[1].value))
$('#his-des').attr('data-acct', acct_id)
$('#his-data').css('background-size', 'cover')
$('#his-float-timeline').css('height', $('#his-data-show').height() + 'px')
localStorage.setItem('history', user)
//自分の時
if (json.acct == localStorage.getItem('user_' + acct_id)) {
showFav('', acct_id)
showBlo('', acct_id)
showMut('', acct_id)
showDom('', acct_id)
showReq('', acct_id)
showFrl('', acct_id)
$('#his-name-val').val(json.display_name)
if (json.fields.length > 0) {
if (json.fields[0]) {
$('#his-f1-name').val(json.fields[0].name)
$('#his-f1-val').val($.strip_tags(json.fields[0].value))
}
if (json.fields[1]) {
$('#his-f2-name').val(json.fields[1].name)
$('#his-f2-val').val($.strip_tags(json.fields[1].value))
}
if (json.fields[2]) {
$('#his-f3-name').val(json.fields[2].name)
$('#his-f3-val').val($.strip_tags(json.fields[2].value))
}
if (json.fields[3]) {
$('#his-f4-name').val(json.fields[3].name)
$('#his-f4-val').val($.strip_tags(json.fields[3].value))
}
}
var des = json.note
des = des.replace(/<br \/>/g, '\n')
des = $.strip_tags(des)
$('#his-des-val').val(des)
$('#his-follow-btn').hide()
$('#his-block-btn').hide()
$('#his-mute-btn').hide()
$('#his-notf-btn').hide()
$('#his-domain-btn').hide()
$('#his-emp-btn').hide()
$('.only-my-data').show()
$('.only-his-data').hide()
if (localStorage.getItem('main') == acct_id) {
$('#his-main-acct').hide()
}
} else {
relations(user, acct_id)
$('.only-my-data').hide()
$('.only-his-data').show()
}
if (json.fields[2]) {
$('#his-f3-name').val(json.fields[2].name)
$('#his-f3-val').val($.strip_tags(json.fields[2].value))
todc()
if (json.locked) {
$('#his-data').addClass('locked')
} else {
$('#his-data').removeClass('locked')
}
if (json.fields[3]) {
$('#his-f4-name').val(json.fields[3].name)
$('#his-f4-val').val($.strip_tags(json.fields[3].value))
}
}
var des = json.note
des = des.replace(/<br \/>/g, '\n')
des = $.strip_tags(des)
$('#his-des-val').val(des)
$('#his-follow-btn').hide()
$('#his-block-btn').hide()
$('#his-mute-btn').hide()
$('#his-notf-btn').hide()
$('#his-domain-btn').hide()
$('#his-emp-btn').hide()
$('.only-my-data').show()
$('.only-his-data').hide()
if (localStorage.getItem('main') == acct_id) {
$('#his-main-acct').hide()
}
} else {
relations(user, acct_id)
$('.only-my-data').hide()
$('.only-his-data').show()
}
todc()
if (json.locked) {
$('#his-data').addClass('locked')
} else {
$('#his-data').removeClass('locked')
}
//外部データ取得(死かもしれないので)
udAdd(acct_id, user, json.url)
//外部データ取得(死かもしれないので)
udAdd(acct_id, user, json.url)
})
}
function misskeyUdg(user, acct_id) {
@ -304,29 +304,29 @@ function misskeyUdg(user, acct_id) {
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/users/show'
fetch(start, {
method: 'POST',
headers: {
'content-type': 'application/json',
},
body: JSON.stringify({
i: at,
userId: user,
}),
})
.then(function (response) {
method: 'POST',
headers: {
'content-type': 'application/json',
},
body: JSON.stringify({
i: at,
userId: user,
}),
})
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
//一つ前のユーザーデータ
if (!localStorage.getItem('history')) {
$('#his-history-btn').prop('disabled', true)
@ -370,7 +370,7 @@ function misskeyUdg(user, acct_id) {
}
$('#his-data').css('background-size', 'cover')
localStorage.setItem('history', user)
//自分の時
//自分の時
if (json.username == localStorage.getItem('user_' + acct_id) && !json.host) {
//showFav('', acct_id);
//showMut('', acct_id);
@ -438,26 +438,26 @@ function relations(user, acct_id) {
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/accounts/relationships?id=' + user
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
.then(function (response) {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
.then(function(response) {
if (!response.ok) {
response.text().then(function (text) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function (json) {
.then(function(json) {
var json = json[0]
if (json.requested) {
//フォロリク中
@ -597,7 +597,7 @@ function reset() {
$('#his-data').removeClass('locked')
$('#his-data').removeClass('requesting')
}
$('#my-data-nav .anc-link').on('click', function () {
$('#my-data-nav .anc-link').on('click', function() {
var target = $(this).attr('go')
if (target) {
let title = $(this).html()

View File

@ -29,10 +29,14 @@ if (!gotTheLock) {
} else {
app.on('second-instance', (event, commandLine, workingDirector) => {
opening = false
const m = commandLine[2].match(/([a-zA-Z0-9]+)\/?\?[a-zA-Z-0-9]+=(.+)/)
const m = commandLine[2].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
if (m) {
mainWindow.send('customUrl', [m[1], m[2]])
}
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore()
mainWindow.focus()
}
})
}
@ -41,13 +45,6 @@ app.on('window-all-closed', function () {
electron.session.defaultSession.clearCache(() => { })
app.quit()
})
app.on('open-url', function (event, url) {
event.preventDefault()
const m = url.match(/([a-zA-Z0-9]+)\/?\?[a-zA-Z-0-9]+=(.+)/)
if (m) {
mainWindow.send('customUrl', [m[1], m[2]])
}
})
function isFile(file) {
try {
fs.statSync(file)
@ -58,7 +55,6 @@ function isFile(file) {
}
function createWindow() {
var lang_path = join(app.getPath('userData'), 'language')
console.log(lang_path)
if (isFile(lang_path)) {
var lang = fs.readFileSync(lang_path, 'utf8')
} else {
@ -171,7 +167,6 @@ function createWindow() {
nodeIntegration: false,
contextIsolation: true,
spellcheck: false,
sandbox: false,
preload: join(__dirname, 'js', 'platform', 'preload.js'),
},
width: window_size.width,

View File

@ -26,7 +26,7 @@ function img(mainWindow, dir) {
for (var i = 0; i < fileNames.length; i++) {
var path = fileNames[i]
var bin = fs.readFileSync(path, 'base64')
e.sender.send('resizeJudgement', [bin, 'new', fileNames[i]])
e.sender.send('resizeJudgement', [bin, 'new'])
}
})
ipc.on('bmp-image', (e, args) => {

View File

@ -1,5 +1,3 @@
const { shell } = require('electron')
function system(mainWindow, dir, lang, dirname) {
const electron = require('electron')
const app = electron.app
@ -9,7 +7,6 @@ function system(mainWindow, dir, lang, dirname) {
var JSON5 = require('json5')
var ipc = electron.ipcMain
const clipboard = electron.clipboard
const nativeImage = electron.nativeImage
var tmp_img = join(app.getPath('userData'), 'tmp.png')
var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
var wv_path = join(app.getPath('userData'), 'webview')
@ -146,9 +143,6 @@ function system(mainWindow, dir, lang, dirname) {
ipc.on('about', (e, args) => {
about()
})
ipc.on('openUrl', function (event, arg) {
shell.openExternal(arg)
})
function about() {
var ver = app.getVersion()
var window = new BrowserWindow({
@ -156,9 +150,7 @@ function system(mainWindow, dir, lang, dirname) {
webviewTag: false,
nodeIntegration: false,
contextIsolation: true,
spellcheck: false,
sandbox: false,
preload: join(__dirname, 'js', 'platform', 'preload.js'),
preload: join(dirname, 'js', 'platform', 'preload.js'),
},
width: 300,
height: 500,
@ -182,7 +174,6 @@ function system(mainWindow, dir, lang, dirname) {
webviewTag: false,
nodeIntegration: false,
contextIsolation: true,
sandbox: false,
preload: join(dirname, 'js', 'platform', 'preload.js'),
},
width: 350,
@ -264,10 +255,6 @@ function system(mainWindow, dir, lang, dirname) {
ipc.on('copy', (e, arg) => {
clipboard.writeText(arg)
})
ipc.on('copyBinary', (e, arg) => {
const ni = nativeImage.createFromDataURL(arg)
clipboard.writeImage(ni)
})
//ログ
ipc.on('log', (e, arg) => {
var today = new Date()
@ -329,7 +316,6 @@ function system(mainWindow, dir, lang, dirname) {
webviewTag: false,
nodeIntegration: false,
contextIsolation: true,
sandbox: false,
preload: join(dirname, 'js', 'platform', 'preload.js'),
},
width: 414,
@ -346,12 +332,5 @@ function system(mainWindow, dir, lang, dirname) {
}
})
})
function trust_insecure(event, webContents, url, error, certificate, callback)
{
if (url.startsWith('^')) // TODO: Load this from a conf file/option for each account, whatever.
{ event.preventDefault(); callback(true)}
else { callback(false) }
}
//app.on('certificate-error',trust_insecure)
}
exports.system = system

View File

@ -86,9 +86,6 @@
.voice {
display: none;
}
.contextMenu {
display: none;
}
</style>
</head>
@ -148,18 +145,14 @@
var lang = "ja";
}
</script>
<script src="https://energised.harpy.faith/2/twemoji.min.js?2.7"></script>
<script type="text/javascript" src="./node_modules/lodash/lodash.min.js"></script>
<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
<script type="text/javascript" src="./js/platform/first.js"></script>
<script type="text/javascript" src="./js/platform/plugin.js"></script>
<script type="text/javascript" src="./js/post/status.js"></script>
<script type="text/javascript" src="./js/post/post.js"></script>
<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
<script type="text/javascript" src="./js/platform/native.js"></script>
<script type="text/javascript" src="./js/tl/parse.js"></script>
<script type="text/javascript" src="./js/ui/theme.js"></script>
<script type="text/javascript" src="./js/tl/date.js"></script>
<script type="text/javascript" src="./js/tl/card.js"></script>
<script type="text/javascript" src="./js/common/time.js"></script>
<script type="text/javascript" src="./js/platform/nano.js"></script>
<script type="text/javascript" src="./js/platform/end.js"></script>

5
app/netlify.toml Normal file
View File

@ -0,0 +1,5 @@
[[redirects]]
from = "/"
to = "/app"
status = 301
force = true

View File

@ -1,7 +1,7 @@
{
"name": "thedesk",
"version": "23.0.3",
"codename": "Chieri",
"version": "22.3.0",
"codename": "Koume",
"description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk",
"main": "main.js",
@ -18,7 +18,7 @@
"build": "node buildCli.js",
"build:pwa": "node view/make/makeCli.js --pwa",
"build:all:x64": "node buildCli.js --withStore",
"build:all": "node buildCli.js --withStore --withX64 --withIa32 --withArm64",
"build:all": "node buildCli.js --withStore --withIa32 --withArm64",
"lint:fix": "eslint js --fix",
"lint": "eslint js"
},
@ -57,40 +57,38 @@
],
"license": "GPL-3.0",
"dependencies": {
"@cutls/materialize-css": "1.0.0",
"@fortawesome/fontawesome-free": "^6.2.1",
"@fortawesome/fontawesome-free": "^5.15.3",
"@syuilo/aiscript": "^0.11.1",
"electron-dl": "^3.4.0",
"electron-dl": "^3.2.1",
"itunes-nowplaying-mac": "https://github.com/cutls/itunes-nowplaying-mac/releases/download/v0.4.0/itunes-nowplaying-mac-0.4.0.tgz",
"jimp": "^0.16.2",
"jquery": "^3.6.1",
"jquery-ui-dist": "^1.13.2",
"json5": "^2.2.1",
"jimp": "^0.16.1",
"jquery": "^3.6.0",
"jquery-ui-dist": "^1.12.1",
"json5": "^2.2.0",
"lodash": "^4.17.21",
"sanitize-html": "^2.7.2",
"materialize-css": "git://github.com/cutls/materialize#v1-dev",
"sanitize-html": "^2.4.0",
"sumchecker": "^3.0.1",
"sweetalert2": "^11.6.15",
"system-font-families": "^0.6.0",
"sweetalert2": "^11.0.17",
"system-font-families": "^0.4.1",
"textarea-caret": "^3.1.0",
"uuid": "^9.0.0",
"vue": "^3.2.45"
"uuid": "^8.3.2",
"vue": "^2.6.14"
},
"devDependencies": {
"@electron/notarize": "^1.2.3",
"browserify": "^17.0.0",
"chokidar": "^3.5.3",
"dotenv": "^16.0.3",
"electron": "^22.0.0",
"electron-builder": "^23.2.0",
"electron-rebuild": "^3.2.9",
"eslint": "^8.25.0",
"chokidar": "^3.5.2",
"dotenv": "^10.0.0",
"electron": "^13.1.6",
"electron-builder": "^22.11.7",
"electron-notarize": "^1.0.0",
"electron-rebuild": "^2.3.5",
"eslint": "^7.28.0",
"npm-run-all": "^4.1.5",
"readline-sync": "1.4.10"
},
"resolutions": {
"@types/fs-extra": "^9.0.11",
"plist": "^3.0.5",
"minimist": "^1.2.6",
"got": "^11.8.5"
"@types/fs-extra": "9.0.11",
"plist": "3.0.2"
}
}

View File

@ -1,14 +1,5 @@
{
"4.0.0": [
"トゥートの翻訳"
],
"3.5.0": [
"投稿の編集",
"トレンドタグ・投稿"
],
"3.3.0": [
"ミュートの継続時間設定"
],
"latest":[],
"3.2.0": [],
"3.1.5": [],
"3.1.4": [

View File

@ -5,7 +5,7 @@
<title>Account Manager - TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport" />
<link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href="../../@@node_base@@/@cutls/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
<link href="../../@@node_base@@/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
<link href="../../css/master.css" type="text/css" rel="stylesheet" />
<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
@ -25,7 +25,7 @@
<body id="mainView" class="@@pwaClass@@">
<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script>
<script type="text/javascript" src="../../@@node_base@@/@cutls/materialize-css/dist/js/materialize.js"></script>
<script type="text/javascript" src="../../@@node_base@@/materialize-css/dist/js/materialize.js"></script>
<script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="../../@@node_base@@/sweetalert2/dist/sweetalert2.min.js"></script>
<script>
@ -55,9 +55,8 @@
<label for="autocomplete-input">URL</label>
</div>
<div class="col s4 loginBtnWrap">
<button class="btn waves-effect" id="loginBtn" onclick="instance()">
<i class="material-icons left">login</i>Login
</button>
<button class="btn waves-effect" onclick="instance()"><i
class="material-icons left">login</i>Login</button>
</div>
</div>
@ -81,7 +80,6 @@
</div>
<div id="auth" style="display:none">
@@codepastewarn@@<br />
<a onclick="backToInit()" class="pointer">@@redo@@</a>
<input type="text" id="code" placeholder="@@codepaste@@" required />
<button class="btn waves-effect" onclick="code()">Auth</button><br />
<br />

View File

@ -1,56 +0,0 @@
<!--bottom-->
<div id="bottom" class="reverse hide">
<div class="leftside reverse">
<div id="dambox">
<button id="posttgl" class="btn waves-effect" style="width: 100%; height: 2.5rem; line-height: 0; margin: 0">
<i class="material-icons" style="position: relative; top: 0.38rem; font-size: 1.5rem; text-align: center; margin-right: 0.76rem">edit</i>@@toot@@
</button>
</div>
<div class="leftside reverse" id="group">
<div class="btnsgroup">
<a href="acct.html" class="nex waves-effect">
<i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)">account_circle</i>
</a>
<a href="setting.html" class="nex waves-effect">
<i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
</a>
<a onclick="nano()" class="nex waves-effect pwa">
<i class="material-icons" title="@@nanoDes@@TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
</a>
<a onclick="menu()" class="nex waves-effect">
<i class="material-icons" title="@@menu@@">apps</i>
</a>
<span id="fukidashi">@@hereAddColumns@@</span>
</div>
<a href="https://thedesk.top/bugs/?lang=@@lang@@" target="_blank" class="waves-effect bgReport" draggable="false" title="Feeling unlucky"> @@foundBug@@ </a>
</div>
</div>
<div>
<div id="tips-menu">
<div class="btnsgroup" style="height: 2.61rem">
<span class="grouptitle">Tips:</span>
<a onclick="tips('ver')" class="nex waves-effect">
<i class="material-icons nex" title="@@verTips@@" data-trans-title="ver">info</i>
</a>
<a onclick="tips('clock')" class="nex waves-effect">
<i class="material-icons nex" title="@@clockTips@@" data-trans-title="clock">access_time</i>
</a>
<a onclick="tips('memory')" class="nex waves-effect pwa">
<i class="material-icons nex" title="@@ramTips@@" data-trans-title="memory">memory</i>
</a>
<a onclick="tips('trend')" class="nex waves-effect imasonly" style="display: none">
<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
</a>
<a onclick="tips('spotify')" class="nex waves-effect">
<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
</a>
</div>
</div>
<div id="tips" class="hide">
<a onclick="tipsToggle()" class="nex waves-effect">
<i class="material-icons nex" title="@@changeTips@@" data-trans-title="tips">bubble_chart</i>
</a>
<div id="tips-text" style="width: 23rem; line-height: 1rem"></div>
</div>
</div>
</div>

View File

@ -1,121 +0,0 @@
<!DOCTYPE html>
<html lang="@@lang@@">
<head>
<script type="text/javascript" src="../../js/ui/theme.js"></script>
<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
<meta content="width=device-width,initial-scale=1.0" name="viewport" />
<link href="../../@@node_base@@/@cutls/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
<link href="../../@@node_base@@/jquery-ui-dist/jquery-ui.min.css" type="text/css" rel="stylesheet" />
<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
<link href="../../css/post.css" rel="stylesheet" type="text/css" />
<link href="../../css/master.css" type="text/css" rel="stylesheet" />
<link href="../../css/sort.css" rel="stylesheet" type="text/css" />
<link href="../../css/sweetalert2-material.css" type="text/css" rel="stylesheet" />
<link href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet" />
<meta charset="utf-8" />
@@comment-start@@
<script type="text/javascript">
var _jipt = []
_jipt.push(['project', 'thedesk'])
</script>
<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
@@comment-end@@ @@pwa@@ @@store@@
</head>
<body class="@@pwaClass@@">
<script>
var ver = '@@versionLetter@@'
var gitHash = '@@gitHash@@'
//betaを入れるとバージョンチェックしない
//var ver="beta";
var acct_id = 0
var tlid = 0
</script>
@@preTL@@ @@starterAndDragHandler@@ @@postBox@@ @@tootModal@@ @@userDataModal@@ @@mediaModal@@ @@releaseNote@@
<!--PiP-->
<div id="pip" class="hide pip-bottom pip-left">
<i class="material-icons pip-horiz pointer" onclick="pipHoriz()">chevron_right</i>
<i class="material-icons pip-vert pointer" onclick="pipVert()">expand_less</i>
<i class="material-icons pointer" onclick="endPip()">close</i>
<div id="pip-content"></div>
</div>
@@menuHtml@@
<div id="main">
<!--TLのTL-->
<div id="timeline-container">
<div id="something-wrong">
<img src="../../img/thinking.svg" style="width: 150px; margin: 5px; display: none" draggable="false" />
<div class="stw" style="display: none">@@helloTheDesk@@</div>
</div>
</div>
</div>
@@bottomBarHtml@@ @@supportMe@@
<!--左下メッセージ-->
<div id="message"></div>
<!--Radio Happy(Yui) Taku Inoue-->
<audio src="" id="radio"></audio>
<!--JS-->
<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script>
<script type="text/javascript" src="../../js/platform/native.js"></script>
<script type="text/javascript" src="../../js/platform/plugin.js"></script>
<script type="text/javascript" src="../../@@node_base@@/@cutls/materialize-css/dist/js/materialize.js"></script>
<script type="text/javascript" src="../../@@node_base@@/grapheme-splitter/index.js"></script>
<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
<script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="../../js/common/time.js"></script>
<script type="text/javascript" src="../../js/common/blurhash.js"></script>
<script type="text/javascript" src="../../js/common/version.js"></script>
<script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
<script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../@@node_base@@/jquery-ui-dist/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../@@node_base@@/sweetalert2/dist/sweetalert2.min.js"></script>
<script type="text/javascript" src="../../js/platform/punycode.js"></script>
<script type="text/javascript" src="../../js/ui/tips.js"></script>
<script src="https://energised.botegirl.parts/2/twemoji.min.js?2.7"></script>
<script type="text/javascript" src="../../js/common/about.js"></script>
<script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
<script type="text/javascript" src="../../js/tl/dm.js"></script>
<script type="text/javascript" src="../../js/ui/scroll.js"></script>
<script type="text/javascript" src="../../js/tl/announParse.js"></script>
<script type="text/javascript" src="../../js/tl/tl.js"></script>
<script type="text/javascript" src="../../js/tl/card.js"></script>
<script type="text/javascript" src="../../js/tl/parse.js"></script>
<script type="text/javascript" src="../../js/tl/poll.js"></script>
<script type="text/javascript" src="../../js/tl/date.js"></script>
<script type="text/javascript" src="../../js/tl/notification.js"></script>
<script type="text/javascript" src="../../js/tl/datails.js"></script>
<script type="text/javascript" src="../../js/tl/mix.js"></script>
<script type="text/javascript" src="../../js/tl/src.js"></script>
<script type="text/javascript" src="../../js/tl/directory.js"></script>
<script type="text/javascript" src="../../js/tl/filter.js"></script>
<script type="text/javascript" src="../../js/tl/tag.js"></script>
<script type="text/javascript" src="../../js/tl/list.js"></script>
<script type="text/javascript" src="../../js/tl/speech.js"></script>
<script type="text/javascript" src="../../js/ui/post-box.js"></script>
<script type="text/javascript" src="../../js/ui/layout.js"></script>
<script type="text/javascript" src="../../js/post/emoji.js"></script>
<script type="text/javascript" src="../../js/login/instance.js"></script>
<script type="text/javascript" src="../../js/login/login.js"></script>
<script type="text/javascript" src="../../js/ui/img.js"></script>
<script type="text/javascript" src="../../js/ui/pip.js"></script>
<script type="text/javascript" src="../../js/ui/sort.js"></script>
<script type="text/javascript" src="../../js/ui/spotify.js"></script>
<script type="text/javascript" src="../../js/post/post.js"></script>
<script type="text/javascript" src="../../js/post/use-txtbox.js"></script>
<script type="text/javascript" src="../../js/post/secure.js"></script>
<script type="text/javascript" src="../../js/post/img.js"></script>
<script type="text/javascript" src="../../js/post/status.js"></script>
<script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
<script type="text/javascript" src="../../js/post/suggest.js"></script>
<script type="text/javascript" src="../../js/post/bb-md.js"></script>
<script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
<script type="text/javascript" src="../../js/userdata/his-data.js"></script>
<script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
<script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
<script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
<script type="text/javascript" src="../../js/platform/end.js"></script>
<script type="text/javascript" src="../../js/ui/menu.js"></script>
</body>
</html>

View File

@ -1,12 +0,0 @@
[
"bottomBarHtml",
"mediaModal",
"menuHtml",
"postBox",
"preTL",
"releaseNote",
"starterAndDragHandler",
"supportMe",
"tootModal",
"userDataModal"
]

View File

@ -1,62 +0,0 @@
<!-- Modal Structure Image-->
<div id="imagemodal" class="modal modal-fixed-footer">
<div class="modal-content">
<div id="imagewrap">
<img src="" id="imgmodal" />
</div>
<div class="progress nomargin hide transparent" id="imgmodal-progress">
<div class="indeterminate"></div>
</div>
<br />
</div>
<div class="modal-footer">
<div id="imginfo">
<span id="imgprog"></span>% <br />
<span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
</div>
<span style="padding: 0.6rem" class="btnsgroup">
<a class="waves-effect white-text" onclick="zoom(2)">
<i class="material-icons">zoom_in</i>
</a>
<a class="waves-effect white-text" onclick="zoom(0.5)">
<i class="material-icons">zoom_out</i>
</a>
<a class="waves-effect white-text" onclick="rotate(false)">
<i class="material-icons">rotate_90_degrees_ccw</i>
</a>
</span>
<span style="padding: 0.6rem" class="btnsgroup">
<span style="position: relative; top: -2px;">Copy:</span>
<a class="waves-effect white-text" onclick="copyImgBinary()" title="@@copyBinary@@">
<i class="material-icons">image</i>
</a>
<a class="waves-effect white-text" onclick="copyImgUrl()" title="@@copyURL@@">
<i class="material-icons">link</i>
</a>
</span>
<button class="btn waves-effect purple" onclick="dlImg()">
<i class="material-icons">file_download</i>
</button>
<button class="btn waves-effect brown" onclick="detFromImg()" title="@@thisToot@@">
<i class="material-icons">pageview</i>
</button>
<button class="btn waves-effect orange" onclick="imgCont('prev')" id="image-prev">
<i class="material-icons">keyboard_arrow_left</i>
</button>
<button class="btn waves-effect orange" onclick="imgCont('next')" id="image-next">
<i class="material-icons">keyboard_arrow_right</i>
</button>
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">
<i class="material-icons">close</i>
</a>
</div>
</div>
<!-- Modal Structure Video-->
<div id="videomodal" class="modal modal-fixed-footer">
<div class="modal-content">
<video src="" id="video" style="max-width: 100%; max-height: 100%" controls loop="true" autoplay="true" />
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
</div>
</div>

View File

@ -1,229 +0,0 @@
<!--menu-->
<div id="menu" class="z-depth-5" style="display: none">
<div id="menu-bar" class="drag-bar"></div>
<span class="cancel">
<i class="material-icons waves-effect" onclick="menu()" title="@@closeThisBox@@(X)">cancel</i>
</span>
<div id="menu-wrapper">
<div id="left-menu">
<a class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"> <i class="material-icons" aria-hidden="true">add</i><span>@@addColumn@@</span> </a>
<a class="waves-effect" onclick="sortMenu()" id="sortMenu"> <i class="material-icons" aria-hidden="true">sort</i><span>@@sortColumns@@</span> </a>
<a class="waves-effect" onclick="searchMenu()" id="searchMenu"> <i class="material-icons" aria-hidden="true">search</i><span>@@search@@</span> </a>
<a class="waves-effect" onclick="listMenu()" id="listMenu"> <i class="material-icons" aria-hidden="true">view_headline</i><span>@@list@@</span> </a>
<a class="waves-effect" onclick="dirMenu()" id="dirMenu"> <i class="material-icons" aria-hidden="true">recent_actors</i><span>@@discover@@</span> </a>
<a class="waves-effect" onclick="filterMenu()" id="filterMenu"> <i class="material-icons" aria-hidden="true">filter_list</i><span>@@filter@@</span> </a>
<a class="waves-effect" onclick="help()" id="helpMenu"> <i class="material-icons" aria-hidden="true">help_outline</i><span>@@helpAndLogs@@</span> </a>
<a class="waves-effect" onclick="location.href='index.html'"> <i class="material-icons" aria-hidden="true">refresh</i><span>@@f5@@</span> </a>
</div>
<div id="right-menu">
<!--カラム追加-->
<div id="add-box" class="hide menu-content">
<div class="input-field">
<span data-trans="your_acct">@@selectAcct@@</span>
<br />
<select id="add-acct-sel" class="acct-sel" style="color: black" onchange="addselCk()"></select>
<label></label>
</div>
<div class="input-field">
<div id="auth">
<input type="hidden" value="local" id="type-sel" /> @@showThisTL@@
<div id="tltype">
<a class="type waves-effect active" data-type="local" title="@@local@@">
<div><i class="material-icons" aria-hidden="true">people_outline</i></div>
<span>@@local@@</span>
</a>
<a class="type waves-effect" data-type="local-media" title="@@localMedia@@">
<div><i class="material-icons" aria-hidden="true">perm_media</i></div>
<span>@@localMedia@@</span>
</a>
<a class="type waves-effect" data-type="home" title="@@home@@">
<div><i class="material-icons" aria-hidden="true">home</i></div>
<span>@@home@@</span>
</a>
<a class="type waves-effect" data-type="pub" title="@@fed@@">
<div><i class="material-icons" aria-hidden="true">language</i></div>
<span>@@fed@@</span>
</a>
<a class="type waves-effect" data-type="pub-media" title="@@fedMedia@@">
<div><i class="material-icons" aria-hidden="true">perm_media</i></div>
<span>@@fedMedia@@</span>
</a>
<a class="type waves-effect" data-type="dm" title="@@dm@@">
<div><i class="material-icons" aria-hidden="true">mail_outline</i></div>
<span>@@dm@@</span>
</a>
<a class="type waves-effect" data-type="mix" title="@@integratedTLDes@@">
<div><i class="material-icons" aria-hidden="true">merge_type</i></div>
<span>@@integratedTLDes@@</span>
</a>
<a class="type waves-effect" data-type="plus" title="@@localPlusDes@@">
<div><i class="material-icons" aria-hidden="true">reply</i></div>
<span>@@localPlusDes@@</span>
</a>
<a class="type waves-effect" data-type="notf" title="@@notf@@">
<div><i class="material-icons" aria-hidden="true">notifications</i></div>
<span>@@notf@@</span>
</a>
<a class="type waves-effect" data-type="bookmark" title="@@bookmark@@">
<div><i class="material-icons" aria-hidden="true">bookmark</i></div>
<span>@@bookmark@@</span>
</a>
</div>
</div>
<div id="noauth" class="hide">
@@showThisTL@@
<input id="noauth-url" type="text" class="validate" style="width: calc(70% - 3rem)" placeholder="e.g:mstdn.jp" />
</div>
<div id="webview-add" class="hide">@@webviewWarn@@</div>
</div>
<button class="btn waves-effect blue" style="width: calc(100% - 0.7rem)" onclick="addColumn()" data-trans-i="add"><i class="material-icons left">add</i>@@add@@</button>
<br />
<br />
</div>
<!--検索-->
<div id="src-box" class="hide menu-content">
<div class="input-field">
<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
</div>
<div class="input-field">
<input id="src" type="text" class="validate" style="width: calc(100% - 150px)" />
<label for="src" data-trans="src">@@search@@</label>
<button class="btn waves-effect indigo" style="width: 36%; padding: 0; padding-left: 1.15rem" onclick="src()" data-trans-i="src">
<i class="material-icons left" style="margin: 0">search</i>@@search@@
</button>
<br />
<br />
</div>
<div id="search">
<div id="src-contents"></div>
</div>
</div>
<!--ディレクトリ-->
<div id="dir-box" class="hide menu-content">
<label>
<input class="with-gap" onchange="dirChange('directory')" name="dirsug" type="radio" value="directory" checked />
<span>@@directory@@</span>
</label>
<label>
<input class="with-gap" onchange="dirChange('suggest')" name="dirsug" type="radio" value="suggest" />
<span>@@frc@@</span>
</label>
<div class="input-field">
<select id="dir-acct-sel" class="acct-sel" onchange="dirselCk()"></select>
</div>
<div id="dirNoAuth" class="hide">
<input id="dirNoAuth-url" type="text" class="validate" style="width: calc(70% - 3rem)" placeholder="e.g:mastodon.social" />
<button class="btn waves-effect indigo" style="width: 9.23rem; padding: 0; padding-left: 1.15rem" onclick="directory('directory')">
<i class="material-icons left" style="margin: 0">search</i>@@show@@
</button>
</div>
<div id="directoryConfig">
<label>
<input class="with-gap" onchange="directory('directory')" name="sort" type="radio" value="active" checked />
<span>@@active@@</span>
</label>
<label>
<input class="with-gap" onchange="directory('directory')" name="sort" type="radio" value="new" />
<span>@@newcomer@@</span> </label
><br />
<label>
<input type="checkbox" class="filled-in" id="local_only" value="true" onchange="directory('directory')" />
<span>@@local_only@@</span>
</label>
</div>
<div id="dir-contents"></div>
<button class="btn waves-effect teal disabled" style="width: 100%" id="moreDir" onclick="directory('check', 'more')">@@more@@</button>
</div>
<!--並べ替え-->
<div id="sort-box" class="hide menu-content">
<ul id="sort"></ul>
<div>
<button onclick="sort()" class="btn waves-effect nex" style="width: 97.5%" data-trans-i="sort"><i class="material-icons left">sort</i>@@sortSet@@</button>
</div>
</div>
<!--リスト-->
<div id="list-box" class="hide menu-content">
<div class="input-field" style="width: calc(100% - 100px); float: left">
<select id="list-acct-sel" class="acct-sel"></select>
<label>@@selectAcct@@</label>
</div>
<div style="float: left; padding-top: 8px; padding-bottom: 28px">
<button class="btn waves-effect indigo" style="width: 80px" onclick="list()" data-trans-i="lists">@@listLocale@@</button>
</div>
<br /><br />
<div id="lists"></div>
<div id="lists-user"></div>
<input type="text" style="width: calc(100% - 143px)" id="list-add" placeholder="@@name@@" />
<button class="btn waves-effect" style="width: 120px" onclick="makeNewList()">@@makeNew@@</button>
</div>
<!--フィルター-->
<div id="filter-box" class="hide menu-content">
<div class="input-field" style="width: calc(100% - 100px); float: left">
<select id="filter-acct-sel" class="acct-sel"></select>
<label>@@selectAcct@@</label>
</div>
<div style="float: left; padding-top: 8px; padding-bottom: 28px">
<button class="btn waves-effect indigo" style="width: 80px" onclick="filter()" data-trans-i="filters">@@listLocale@@</button>
</div>
<div id="filtered-words"></div>
<input type="hidden" id="filter-edit-id" />
<input type="text" style="width: 150px" id="filter-add-word" placeholder="@@filterWord@@" /><br /> @@degree@@
<br />
<label>
<input type="checkbox" class="filled-in" id="home_filter" value="home" />
<span>@@home@@</span>
</label>
<label>
<input type="checkbox" class="filled-in" id="local_filter" value="public" />
<span>@@local@@</span>
</label>
<label>
<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
<span>@@notf@@</span>
</label>
<label>
<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
<span>@@conver@@</span>
</label>
<label>
<input type="checkbox" class="filled-in" id="prof_filter" value="profiles" />
<span>@@prof@@</span> </label
><br />
@@option@@
<br />
<label>
<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
<span>@@matchWord@@</span>
</label>
<br />
<span class="sml">@@warnMatchWord@@</span><br />
<label>
<input type="checkbox" class="filled-in" id="except_filter" value="1" />
<span>@@except@@</span>
</label>
<br />
<span class="sml">@@exceptWorn@@</span><br /> @@avalableBefore@@ <span class="sml">@@warnAvBefore@@<b>@@warnAvBefore2@@</b></span
><br /><br />
<input type="number" style="width: 50px" id="days_filter" placeholder="d" value="0" />@@days@@
<input type="number" style="width: 50px" id="hours_filter" placeholder="h" value="0" />@@hours@@
<input type="number" style="width: 50px" id="mins_filter" placeholder="m" value="0" />@@mins@@<br />
Quick: <a onclick="filterTime(0,0,30)" class="pointer">30@@mins@@</a>/ <a onclick="filterTime(0,1,0)" class="pointer">1@@hours@@</a>/
<a onclick="filterTime(0,6,0)" class="pointer">6@@hours@@</a>/ <a onclick="filterTime(0,12,0)" class="pointer">12@@hours@@</a>/
<a onclick="filterTime(1,0,0)" class="pointer">1@@days@@</a>/ <a onclick="filterTime(7,0,0)" class="pointer">7@@days@@</a>/
<a onclick="filterTime(0,0,0)" class="pointer">@@unlimited@@</a><br />
<button class="btn waves-effect" style="width: 120px" onclick="makeNewFilter()" id="add-filter-btn">@@add@@</button><br />
<span class="sml">@@warnOnIntegratedTL@@</span>
</div>
<!--ヘルプとログ-->
<div id="help-box" class="hide menu-content">
<a href="https://docs.thedesk.top" class="btn waves-effect" style="width: 97.5%">@@help@@</a><br /> @@contactwithlog@@
<br />
<textarea id="logs" style="height: 250px"></textarea><br />
</div>
</div>
</div>
<a onclick="about()" class="nex waves-effect pwa"> <i class="material-icons menu-icon">info</i>@@about@@ </a>&nbsp;|&nbsp;
<a onclick="bottomReverse()" class="nex waves-effect"> <i class="material-icons menu-icon">swap_horiz</i>@@reverse@@ </a>&nbsp;|&nbsp;
<a href="https://github.com/cutls/TheDesk/releases" class="nex waves-effect"> <i class="material-icons menu-icon">new_releases</i>Release Note </a>
</div>

View File

@ -1,244 +0,0 @@
<div id="post-box" class="z-depth-5">
<div id="post-bar" class="drag-bar"><span id="unreact">@@post-new@@</span><span id="addreact" class="hide">Reaction</span></div>
<!--トゥートボックス-->
<div id="left-side">
<div class="row" style="margin-bottom: 0">
<div class="" style="float: left">
<a onclick="profShow()" style="vertical-align: -1.7rem" class="pointer mize">
<img src="../../img/missing.svg" id="acct-sel-prof" title="@@showSelectProf@@(Ctrl+Shift+P)" data-trans-title="post_box_prof" style="width: 1.8rem" />
</a>
</div>
<div class="input-field mize" style="float: left; width: calc(100% - 1.8rem); margin-top: 0">
<select id="post-acct-sel" class="acct-sel" onchange="mdCheck()"></select>
</div>
<span class="cancel">
<i class="material-icons waves-effect" onclick="hide()" title="@@closeThisBox@@(X)" data-trans-title="post_box_close">cancel</i>
</span>
<!--Markdown-->
<div class="row" style="margin-bottom: 0">
<div class="markdown mize hide">
<div class="col s12">
<i class="material-icons pointer setting waves-effect" onclick="tagsel('b')" title="太字(Ctrl+B)テキストボックス内を選択してから押すと囲みます。">format_bold</i>
<i class="material-icons pointer setting waves-effect" onclick="tagsel('i')" title="斜字(Ctrl+I)テキストボックス内を選択してから押すと囲みます。">format_italic</i>
<i class="material-icons pointer setting waves-effect" onclick="tagsel('u')" title="下線(Ctrl+U)テキストボックス内を選択してから押すと囲みます。">format_underlined</i>
<i class="material-icons pointer setting waves-effect" onclick="tagsel('s')" title="取り消し(Ctrl+S)テキストボックス内を選択してから押すと囲みます。">strikethrough_s</i>
<i class="material-icons pointer setting waves-effect" onclick="markdown('>','no','yes')" title="引用">format_quote</i>
<i class="material-icons pointer setting waves-effect" onclick="markdown('#','no','yes')" title="見出し">short_text</i>
<i class="material-icons pointer setting waves-effect" onclick="markdown('`','yes','no')" title="コード挿入 テキストボックス内を選択してから押すと囲みます。">code</i>
<i class="material-icons pointer setting waves-effect" onclick="markdown('- ','yes','yes')" title="箇条書きリスト">format_list_bulleted</i>
<i class="material-icons pointer setting waves-effect" onclick="markdown('1. ','yes','yes')" title="番号付きリスト">format_list_numbered</i>
<i
class="pointer setting fa fa-subscript waves-effect"
onclick="markdown('__','yes','no','before')"
title="下付き文字 テキストボックス内を選択してから押すと囲みます。"
style="font-size: 1.5rem"
></i>
<i
class="pointer setting fa fa-superscript waves-effect"
onclick="markdown('_','yes','no','before')"
title="上付き文字 テキストボックス内を選択してから押すと囲みます。"
style="font-size: 1.5rem"
></i>
<i class="material-icons pointer setting waves-effect" onclick="tagsel('spin')" title="回転 テキストボックス内を選択してから押すと囲みます。">autorenew</i>
<i class="material-icons pointer setting waves-effect" onclick="tagsel('pulse')" title="点滅 テキストボックス内を選択してから押すと囲みます。">flare</i>
<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=vertical')" title="上下反転 テキストボックス内を選択してから押すと囲みます。">swap_vert</i>
<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=horizontal')" title="左右反転 テキストボックス内を選択してから押すと囲みます。">swap_horiz</i>
<span class="sml gray pointer waves-effect">
<a onclick="mdToggle()">Markdownエディタを隠す</a>
</span>
<br />
<i class="material-icons pointer setting waves-effect" onclick="tagsel('size')" title="文字サイズ変更 テキストボックス内を選択してから押すと囲みます。">format_size</i>
<input id="size" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" value="12" />px
<i class="material-icons pointer setting waves-effect" onclick="tagsel('colorhex')" title="文字色変更 テキストボックス内を選択してから押すと囲みます。">color_lens</i>
<input id="colorhex" style="width: calc(50% - 3.8rem); margin: 0; height: 1.8rem" type="color" />
<br />
<i class="material-icons pointer setting waves-effect" onclick="markdownLink()" title="リンク挿入">link</i>
<input id="linkt" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="リンクテキスト" />&nbsp;
<input id="link2" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="リンクアドレス" />
<br />
<i class="material-icons pointer setting waves-effect" onclick="markdownImage()" title="インライン画像挿入">image</i>
<input id="image" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="代替テキスト" />&nbsp;
<input id="image2" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="画像アドレス" />
</div>
</div>
<div class="input-field col s12" id="preview-field" style="margin-top: 0">
<div id="md-preview"></div>
<span class="sml gray pointer">
<a onclick="previewEdit()">Edit</a>
</span>
</div>
<div class="input-field col s12" id="toot-field" style="margin-top: 0; margin-bottom: 0">
<textarea id="textarea" class="materialize-textarea unmize" style="margin-bottom: 0" data-length="500"></textarea>
<div id="suggest"></div>
<label for="textarea" data-trans="toot">@@toot@@</label>
<br />
<span class="sml gray pointer markdown mize" id="preview-btn">
<a onclick="preview()">Preview</a>
</span>
<span class="sml gray pointer anti-markdown mize">
<a onclick="mdToggle()">Markdownエディタを表示</a>
</span>
</div>
<div class="col s12 mize" style="margin-top: 0; display: flex; justify-content: space-between">
<i class="waves-effect gray material-icons" id="nsfw" title="@@nsfwDes@@" onclick="nsfw()">visibility_off</i>
<i class="waves-effect gray material-icons purple-text dropdown-trigger" data-target="dropdown1" id="vis-icon">public</i>
<a class="waves-effect gray" id="cw" onclick="cw()" title="@@cwDes@@">CW</a>
<span
><span id="imgup"></span><span id="imgsel" class="pwa"><i class="waves-effect material-icons gray" onclick="fileselect()" title="@@selfile@@">photo_library</i></span></span
>
<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="@@insertEmoji@@">tag_faces</i>
<i class="waves-effect gray material-icons dropdown-trigger" data-target="dropdown2">more_vert</i>
<i class="material-icons nex gray waves-effect" title="@@clearToot@@(Ctrl+Shit+C)" data-trans-title="post_box_clear" id="clear">clear</i>
</div>
<div class="col s12 mize" style="margin-bottom: 0.4rem; padding: 0">
<div id="taglist"></div>
<div id="preview" class="mize"></div>
<span class="sml mize"
><span>@@replyMode@@</span>: <span id="rec">@@no@@</span>/<span>@@temp@@</span>:
<span id="mec">@@nothing@@</span>
<a onclick="stamp()" class="pointer pwa" title="@@stampWarn@@">@@stamp@@: <span id="stamp">Off</span></a> /@@poll@@:
<span id="pollsta">@@no@@</span>
<span id="vis" class="hide">public</span>
</span>
<br />
<input type="text" id="cw-text" placeholder="@@cwtext@@" class="mize" style="margin: 0" />
<div id="sch-box">
@@postat@@<br /><span class="sml">@@scheduleWarn@@</span><a onclick="expPostMode()">Expire mode(beta)</a><br />
<input type="datetime-local" id="sch-date" placeholder="@@schedule@@" class="datepicker" style="margin: 0" />
</div>
</div>
</div>
<!-- 公開範囲 Dropdown Structure -->
<ul id="dropdown1" class="dropdown-content">
<li>
<a onclick="vis('public')">@@publicJP@@(Public)</a>
</li>
<li>
<a onclick="vis('unlisted')">@@unlistedJP@@(Unlisted)</a>
</li>
<li>
<a onclick="vis('private')" id="private-button">@@privateJP@@(Private)</a>
</li>
<li id="limited-button" class="hide">
<a onclick="vis('limited')">限定公開(Limited)</a>
</li>
<li id="local-button" class="hide">
<a onclick="vis('local')">@@localJP@@(Local)</a>
</li>
<li>
<a onclick="vis('direct')" class="disabled direct">@@directJP@@(Direct)</a>
</li>
</ul>
<!-- その他 Dropdown Structure -->
<ul id="dropdown2" class="dropdown-content">
<li>
<a onclick="nowplaying('spotify');">NowPlaying (Spotify)</a>
</li>
<li class="mac">
<a onclick="nowplaying('itunes');">NowPlaying (iTunes macOS)</a>
</li>
<li>
<a onclick="nowplaying('lastFm');">NowPlaying (Last.fm)</a>
</li>
<li>
<a onclick="schedule();">@@schedule@@</a>
</li>
<li>
<a onclick="pollToggle();">@@poll@@</a>
</li>
<li>
<a onclick="draftToggle();">@@draft@@</a>
</li>
</ul>
<!--hidden area-->
<input type="hidden" id="reply" />
<input type="hidden" id="ideKey" />
<input type="hidden" id="quote" />
<input type="hidden" id="media" />
<!--END hidden area-->
</div>
<div id="toot-btn-field">
<button class="btn waves-effect unmize toot-btn-group" onclick="post()" id="toot-post-btn">@@toot@@</button>
<button class="btn waves-effect darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn">
<i class="material-icons" id="toot-sec-icon" title="@@sectoot@@">lock_open</i>
</button>
</div>
</div>
<div id="right-side">
<div id="draft" class="hide right-side-content"></div>
<!--絵文字ピッカー-->
<div id="emoji" class="hide right-side-content">
<span class="gray sml"
>@@emojiWarn@@
<a onclick="emojiGet('true')" class="pointer">@@refreshEmoji@@</a>
<br />
</span>
<div id="emoji-list" class="" style=""></div>
<div class="emoji-control center">
<button class="btn waves-effect blue" style="width: 30%; padding: 0" onclick="emojiList('before')" id="emoji-before">
<i class="material-icons">navigate_before</i>
</button>
<span id="emoji-count"></span>/
<span id="emoji-sum"></span>
<button class="btn waves-effect blue" style="width: 30%; padding: 0" onclick="emojiList('next')" id="emoji-next">
<i class="material-icons">navigate_next</i>
</button>
</div>
<div id="default-emoji">
<span id="now-emoji"></span>@@showThisEmoji@@<br /><span class="gray sml">@@emojiInsertWarn@@</span>
<br />
<a onclick="customEmoji()" class="pointer waves-effect" title="@@customEmoji@@">
<i class="material-icons">add</i>
</a>
<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="@@peopleEmoji@@">
<i class="material-icons">people</i>
</a>
<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="@@natureEmoji@@">
<i class="material-icons">local_florist</i>
</a>
<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="@@foodEmoji@@">
<i class="material-icons">restaurant</i>
</a>
<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="@@activityEmoji@@">
<i class="material-icons">directions_run</i>
</a>
<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="@@placeEmoji@@">
<i class="material-icons">directions_car</i>
</a>
<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="@@thingsEmoji@@">
<i class="material-icons">attach_file</i>
</a>
<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="@@symbolEmoji@@">
<i class="material-icons">gesture</i>
</a>
<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="@@flagsEmoji@@">
<i class="material-icons">flag</i>
</a>
<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
<i class="fab fa-fort-awesome"></i>
</a>
</div>
</div>
<!--Poll UI-->
<div id="poll" class="hide right-side-content">
<div id="mastodon-poll" class="poll-provider">
<input type="text" class="mastodon-choice" placeholder="@@choice@@1" />
<input type="text" class="mastodon-choice" placeholder="@@choice@@2" />
<input type="text" class="mastodon-choice" placeholder="@@choice@@3" />
<input type="text" class="mastodon-choice" placeholder="@@choice@@4" />
<label>
<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
<span>@@pollmulti@@</span>
</label>
<label>
<input type="checkbox" class="filled-in" id="poll-until" value="1" />
<span>@@polluntil@@</span>
</label>
<input type="number" style="width: 50px" id="days_poll" placeholder="d" value="0" />@@days@@
<input type="number" style="width: 50px" id="hours_poll" placeholder="h" value="0" />@@hours@@
<input type="number" style="width: 50px" id="mins_poll" placeholder="m" value="6" />@@mins@@
</div>
</div>
</div>
</div>

View File

@ -1,17 +0,0 @@
<textarea id="copy" style="top: -100px; position: fixed"></textarea>
<canvas id="canvas" style="top: -100px; position: fixed; width: 32px; height: 32px" width="32" height="32"></canvas>
<div id="pageSrc" class="hide z-depth-2">
<div class="srcQ"></div>
<div class="pageSrcBtn pointer" onclick="doSrc('web')">@@webSrc@@</div>
<div class="pageSrcBtn pointer" onclick="doSrc('ts')">@@tsSrc@@</div>
<div class="pageSrcBtn pointer" onclick="doSrc('copy')">@@copy@@</div>
<div class="pageSrcBtn pointer lastPSB" onclick="doSrc('toot')">@@toot@@</div>
</div>
<div class="hide z-depth-2" id="tagContextMenu">
<a onclick="doTShowBox('tl')" class="pointer firstTCM" id="tagCMTL"></a>
<a onclick="doTShowBox('toot')" class="pointer" id="tagCMToot"></a>
<a onclick="doTShowBox('pin')" class="pointer" id="tagCMPin"></a>
<a onclick="doTShowBox('f')" class="pointer lastTCM" title="add it to Featured tags" id="tagCMFeature">Feature</a>
</div>
<div id="offline" class="hide">@@nowOffline@@</div>
<div id="re-online" class="hide">@@reOnline@@</div>

View File

@ -1,34 +0,0 @@
<!-- Modal Structure Release Note-->
<div id="releasenote" class="modal modal-fixed-footer scr">
<div class="modal-content">
<h3>TheDesk</h3>
<a href="https://thedesk.top" target="_blank">HP</a><br />
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
<br />
<div id="release-22-3-1_Koume" class="release-do" style="display: none">
Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br /> 困ったときは、 <a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note 22.3.1 (Koume)</h5>
<!--上のdivのidや1行上のところも変えてね-->
・時限ミュートに対応した
<a onclick="udgEx('Cutls@2m.cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png" />cutls</a><br /> ・軽微なバグの修正
<a onclick="udgEx('Cutls@2m.cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png" />cutls</a><br />
</div>
<div id="release-en" style="display: none">
<h5>Let's make it native!</h5>
<a href="https://translate.thedesk.top">Crowdin translation project</a>
</div>
<br /><br />
<h3>@@supportme@@</h3>
@@TheDeskDes@@<br />
<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank"> @@PixivSupport@@ </a>
<a class="btn-share btn waves-effect waves-light red darken-2" href="https://www.patreon.com/cutls" target="_blank"> @@PatreonSupport@@ </a>
<a class="btn-share btn waves-effect waves-light black-text" href="https://liberapay.com/cutls" target="_blank" style="background-color: #f6c915"> Liberapay </a>
<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> @@AWLSupport@@ </a>
<br /> @@SendAmazonGift1@@ <a href="mailto:web-pro@cutls.com" target="_blank">web-pro@cutls.com</a>@@SendAmazonGift2@@<br /> Kyash
<br />
<img src="../../img/kyash.png" width="100" /><br />
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
</div>
</div>

View File

@ -1,50 +0,0 @@
<div id="tl">
<!--TL-->
<!--スターター-->
<div id="start" class="scr">
<div id="start-content">
<h3 class="center">@@demoBottomBtns@@</h3>
@@lookAtBottom@@
<div id="demobottom">
<button class="btn waves-effect" style="width: 23rem; height: 2.5rem; line-height: 0; margin: 0; background-color: var(--active)">
<i class="material-icons" style="position: relative; top: 0.4rem; font-size: 1.5rem; text-align: center; margin-right: 0.7rem">edit</i>@@toot@@
</button>
<div class="leftside reverse" id="demogroup">
<div class="btnsgroup" style="margin-left: 0.4rem">
<a href="#" class="nex waves-effect">
<i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)">account_circle</i>
</a>
<a href="#" class="nex waves-effect">
<i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
</a>
<a class="nex waves-effect">
<i class="material-icons" title="@@nanoDes@@TheDesk Nano">remove_from_queue</i>
</a>
<a class="nex waves-effect" id="list-tgl">
<i class="material-icons" title="@@menu@@">apps</i>
</a>
</div>
</div>
</div>
<br />
<i class="material-icons nex big-icon">account_circle</i>: @@acctMan@@<br /> @@acctManDesc@@
<hr />
<i class="material-icons nex">settings</i>: @@setting@@<br /> @@settingDesc@@
<hr />
<i class="material-icons nex">remove_from_queue</i>: TheDesk Nano @@nanoDes@@<br /> @@nanoDescPlus@@
<hr />
<i class="material-icons nex">apps</i>: @@menu@@<br /> @@menuDesc@@
<br />
<br />
<button class="btn waves-effect" onclick="closeStart()" style="width: 300px">@@close@@</button>
</div>
</div>
<!--ドラッグハンドラ-->
<div id="drag">
<div id="drag-content">
@@draghere@@
<br />
<button class="btn waves-effect" onclick="closedrop()">@@close@@</button>
</div>
</div>
</div>

View File

@ -1,32 +0,0 @@
<!--Support me-->
<div id="support-btm" class="z-depth-4 hide scr">
<div id="support-btm-ja">
<h5>ご支援いただけませんか?</h5>
(これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br /> あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。<br /> 乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。
<br />
<br /> TheDeskになぜ金銭が発生するかについて: 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。
<br />
<b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。<br />
<b>@@TheDeskDes@@</b>
</div>
<div id="support-btm-en" class="hide">
<h5>Support me</h5>
It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!<br />
<b>@@TheDeskDes@@</b>
</div>
<div id="support-btm-middle">
<h5>@@monthly@@</h5>
<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank"> @@PixivSupport@@ </a>
<a class="btn-share btn waves-effect waves-light red darken-2" href="https://www.patreon.com/cutls" target="_blank"> @@PatreonSupport@@ </a>
<a class="btn-share btn waves-effect waves-light black-text" href="https://liberapay.com/cutls" target="_blank" style="background-color: #f6c915"> Liberapay </a>
</div>
<div id="support-btm-right">
<h5>@@once@@</h5>
<br /> @@SendAmazonGift1@@ <a href="mailto:web-pro@cutls.com" target="_blank">web-pro@cutls.com</a>@@SendAmazonGift2@@<br /> Kyash
<br />
<img src="../../img/kyash.png" width="100" /><br />
</div>
<div id="support-btm-close">
<button class="btn waves-effect" style="width: 100%" onclick="closeSupport()" id="add-filter-btn">@@close@@</button>
</div>
</div>

View File

@ -1,100 +0,0 @@
<!-- Modal Structure Tootdata-->
<div id="tootmodal" class="modal modal-fixed-footer">
<div class="modal-content">
<ul class="collapsible" id="det-col">
<li class="dm-hide contextTool">
<div class="collapsible-header"><i class="material-icons">people_outline</i>@@afterLTL@@</div>
<div class="collapsible-body toot-reset" id="ltl-after"></div>
</li>
<li class="dm-hide contextTool">
<div class="collapsible-header"><i class="material-icons">person_outline</i>@@afterUTL@@</div>
<div class="collapsible-body toot-reset" id="user-after"></div>
</li>
<li class="dm-hide contextTool">
<div class="collapsible-header"><i class="material-icons">language</i>@@afterFTL@@</div>
<div class="collapsible-body toot-reset" id="ftl-after"></div>
</li>
<li>
<div class="collapsible-header">
<i class="material-icons">arrow_upward</i>@@contextBefore@@
<i class="material-icons red-text hide" id="toot-reply-new">new_releases</i>
</div>
<div class="collapsible-body toot-reset" id="toot-reply"></div>
</li>
<li>
<div class="collapsible-header" id="activator"><i class="material-icons">more_horiz</i>@@thisToot@@</div>
<div class="collapsible-body">
<div class="toot-reset" id="toot-this"></div>
</div>
</li>
<li>
<div class="collapsible-header">
<i class="material-icons">arrow_downward</i>@@contextAfter@@
<i class="material-icons red-text hide" id="toot-after-new">new_releases</i>
</div>
<div class="collapsible-body toot-reset" id="toot-after"></div>
</li>
<li class="dm-hide contextTool">
<div class="collapsible-header"><i class="material-icons">people_outline</i>@@beforeLTL@@</div>
<div class="collapsible-body toot-reset" id="toot-before"></div>
</li>
<li class="dm-hide contextTool">
<div class="collapsible-header"><i class="material-icons">person_outline</i>@@beforeUTL@@</div>
<div class="collapsible-body toot-reset" id="user-before"></div>
</li>
<li>
<div class="collapsible-header"><i class="material-icons">star</i>@@favedPeople@@</div>
<div class="collapsible-body toot-reset" id="toot-fav"></div>
</li>
<li class="dm-hide">
<div class="collapsible-header"><i class="text-darken-3 false fas fa-retweet"></i>@@btedPeople@@</div>
<div class="collapsible-body toot-reset" id="toot-rt"></div>
</li>
<li class="edited-hide">
<div class="collapsible-header"><i class="material-icons">create</i>@@editHistory@@</div>
<div class="collapsible-body toot-reset" id="toot-edit"></div>
</li>
</ul>
<div class="dm-hide" style="max-width: 450px">
@@useOtherAcct1@@(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>@@useOtherAcct2@@)<br />
<div class="row">
<div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select>
</div>
<div class="col s2">
<button class="dropdown-button btn waves-effect" style="width: 100%" onclick="staEx('reply')">
<i class="fas fa-share"></i>
</button>
</div>
<div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width: 100%" onclick="staEx('rt')">
<i class="fas fa-retweet"></i>
</button>
</div>
<div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width: 100%" onclick="staEx('fav')">
<i class="fas fa-star"></i>
</button>
</div>
</div>
@@btWithVis@@<br />
<button class="btn waves-effect darken-3 toot-btn-group purple" onclick="boostWith('public')">
<i class="material-icons">public</i>
</button>
<button class="btn waves-effect darken-3 toot-btn-group blue" onclick="boostWith('unlisted')">
<i class="material-icons">lock_open</i>
</button>
<button class="btn waves-effect darken-3 toot-btn-group orange" onclick="boostWith('private')">
<i class="material-icons">lock</i>
</button>
<div id="toot-tools"></div>
<div id="toot-after"></div>
</div>
</div>
<div class="modal-footer">
<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">@@openBrowser@@</a>
<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">@@copyURL@@</a>
<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">@@embed@@</a>
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
</div>
</div>

View File

@ -1,210 +0,0 @@
<!-- Modal Structure Userdata -->
<div id="his-data" class="modal bottom-sheet modal-fixed-footer" style="max-height: 750px; height: 90%">
<div id="his-data-content" class="modal-content" style="padding-bottom: 0; overflow-y: hidden">
<div id="his-data-show">
<div id="his-data-wrap">
<div class="his-float" id="his-float-data">
<div id="his-leftside">
<div id="his-basic-prof">
<div>
<img src="../../img/loading.svg" id="his-prof" draggable="false" />
</div>
<div>
<span id="his-name">Loading...</span>
<span class="gray">@</span><span id="his-acct" class="gray"></span><br />
<span class="gray" id="his-relation"></span>
<br />
<span class="cbadge"> <span id="his-sta"></span>@@toots@@ </span>
<span class="cbadge"
>@@follow@@:
<span id="his-follow"></span>
</span>
<span class="cbadge">@@follower@@: <span id="his-follower"></span> </span><br />
<span class="cbadge" style="max-width: 11.5rem; width: 11.5rem"
>Since:
<span id="his-since"></span>
</span>
<span class="cbadge" id="his-bot">[bot]</span>
</div>
</div>
<div id="his-proof-prof"></div>
<div id="his-des" data-acct=""></div>
<br />
<div id="his-table"></div>
<br />
<div id="his-sign-action">
<a href="#!" class="waves-effect waves-green btn" onclick="follow()" style="flex-basis: 100%" id="his-follow-btn"
><i class="material-icons">people</i><span id="his-follow-btn-text">@@follow@@</span></a
>
<a href="#!" class="waves-effect waves-green btn blue shrinker" onclick="muteMenu()" id="his-mute-btn"
><i class="material-icons">voice_over_off</i><span id="his-mute-btn-text">@@mute@@</span>
</a>
<a href="#!" class="waves-effect waves-green btn red shrinker" onclick="block()" id="his-block-btn"
><i class="material-icons">block</i><span id="his-block-btn-text">@@block@@</span></a
>
<a class="dropdown-trigger btn waves-effect grey" href="#" data-target="actiondropdown"> <i class="material-icons">more_vert</i>@@more@@</a>
</div>
<div id="muteDuration" class="hide">
<label>
<input type="checkbox" class="filled-in" id="notf_mute" value="1" />
<span>@@notfMute@@</span>
</label>
<br />
@@zeroSetToInfinity@@<br />
Quick: <a onclick="muteTime(0,0,5)" class="pointer">5@@mins@@</a>/ <a onclick="muteTime(0,0,30)" class="pointer">30@@mins@@</a>/ <a onclick="muteTime(0,1,0)" class="pointer">1@@hours@@</a>/
<a onclick="muteTime(0,6,0)" class="pointer">6@@hours@@</a>/ <a onclick="muteTime(1,0,0)" class="pointer">1@@days@@</a>/
<a onclick="muteTime(3,0,0)" class="pointer">3@@days@@</a>/ <a onclick="muteTime(7,0,0)" class="pointer">7@@days@@</a>
<a onclick="muteTime(0,0,0)" class="pointer">@@unlimited@@</a><br />
<input type="number" style="width: 62px" id="days_mute" placeholder="d" value="0" />@@days@@
<input type="number" style="width: 62px" id="hours_mute" placeholder="h" value="0" />@@hours@@
<input type="number" style="width: 62px" id="mins_mute" placeholder="m" value="0" />@@mins@@
<a href="#!" class="waves-effect waves-green btn blue" onclick="muteDo()" id="his-mute-btn"
><i class="material-icons">voice_over_off</i><span id="his-mute-btn-text">@@mute@@</span>
</a>
</div>
<!-- Dropdown Structure -->
<ul id="actiondropdown" class="dropdown-content">
<li onclick="empUser()">
<a title="@@empUser@@"><i class="material-icons">highlight</i>@@empUser@@</a>
</li>
<li onclick="pinUser()" class="only-his-data">
<a title="@@endorse@@"><i class="material-icons">thumb_up</i>@@endorse@@</a>
</li>
<li onclick="profbrws()" id="his-openin">
<a title="@@openinbrowser@@"><i class="material-icons">open_in_browser</i>@@openinbrowser@@</a>
</li>
<li onclick="setMain()" class="only-my-data" id="his-main-acct">
<a title="@@mainacct@@"><i class="material-icons">grade</i>@@mainacct@@</a>
</li>
</ul>
</div>
</div>
<div class="his-float" id="his-float-timeline">
<div id="my-data-nav">
<a go="#his-tl" title="@@timeline@@" class="btn active-back column-first anc-link waves-effect"><i class="material-icons">timeline</i>@@timeline@@</a>
<a go="#his-follow-list" title="@@follow@@" class="btn anc-link waves-effect"><i class="material-icons">people</i>→@@follow@@</a>
<a go="#his-follower-list" title="@@follower@@" class="btn anc-link waves-effect"><i class="material-icons">people</i>←@@follower@@</a>
<a go="#his-fav-list" title="@@favRegist@@" class="btn only-my-data anc-link waves-effect"> <i class="material-icons">star</i>@@favRegist@@</a>
<a class="dropdown-trigger btn waves-effect" href="#" data-target="hisdropdown"><i class="material-icons">more_vert</i>@@more@@</a>
<div id="his-data-title-wrap">
<span id="his-data-title"><i class="material-icons">timeline</i>@@timeline@@</span>
<button class="btn waves-effect grey darken-2" style="width: 180px" id="util-add" onclick="utlAdd()">
<i class="material-icons">add</i>
@@utlColumn@@
</button>
</div>
<!-- Dropdown Structure -->
<ul id="hisdropdown" class="dropdown-content">
<li class="anc-link only-his-data" go="#his-list">
<a href="#" title="@@list@@"> <i class="material-icons">list</i>@@list@@ </a>
</li>
<li class="anc-link only-my-data" go="#his-blocking-list">
<a href="#" title="@@blocks@@"><i class="material-icons">block</i>@@blocks@@</a>
</li>
<li class="anc-link only-my-data" go="#his-muting-list">
<a href="#" title="@@mute@@"><i class="material-icons">voice_over_off</i>@@mute@@</a>
</li>
<li class="anc-link only-my-data" go="#his-domain-list">
<a href="#" title="@@domainBlock@@"><i class="material-icons">cancel_schedule_send</i>@@domainBlock@@</a>
</li>
<li class="anc-link only-my-data" go="#his-prof-list">
<a href="#" title="@@editProf@@"><i class="material-icons">create</i>@@editProf@@</a>
</li>
<li class="anc-link only-my-data" go="#his-request-list">
<a href="#" title="@@followReq@@"><i class="material-icons">how_to_reg</i>@@followReq@@</a>
</li>
<li class="anc-link only-my-data" go="#his-follow-recom-list">
<a href="#" title="@@frc@@"><i class="material-icons">recent_actors</i>@@frc@@</a>
</li>
<li class="anc-link only-his-data" go="#his-action">
<a href="#" title="@@operateOtherAcct@@"><i class="material-icons">account_box</i>@@operateOtherAcct@@</a>
</li>
</ul>
</div>
<div id="his-tl" class="his-var-content">
<div id="his-tl-contents" class="cont-series"></div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="utlShow('--now','more')">@@more@@</button>
</div>
<div id="his-follow-list" class="his-var-content">
<div id="his-follow-list-contents" class="cont-series"></div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="flw('--now','more')">@@more@@</button>
</div>
<div id="his-follower-list" class="his-var-content">
<div id="his-follower-list-contents" class="cont-series"></div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="fer('--now','more')">@@more@@</button>
</div>
<div id="his-action" class="his-var-content">
@@useOtherAcct1@@@@revoverJP@@@@follow@@(@@warnUseOtherAcct@@)<br />
<div style="max-width: 500px">
<select id="user-acct-sel" class="acct-sel"></select>
</div>
@@revoverJPde@@
<a href="#!" class="waves-effect btn" onclick="follow('selector','selector')">@@follow@@</a><br />
@@or@@
<br />
<a href="#!" class="waves-effect btn" onclick="udgEx('selector', 'selector')">@@openProf@@</a><br />
</div>
<div id="his-list" class="his-var-content">
<div id="his-lists-a">@@warnListRegist@@</div>
<div id="his-lists-b"></div>
</div>
<div id="his-fav-list" class="his-var-content">
<div id="his-fav-list-contents" class="cont-series"></div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showFav('more')">@@more@@</button>
</div>
<div id="his-blocking-list" class="his-var-content">
<div id="his-blocking-list-contents" class="cont-series"></div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showBlo('more')">@@more@@</button>
</div>
<div id="his-muting-list" class="his-var-content">
<div id="his-muting-list-contents" class="cont-series"></div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showMut('more')">@@more@@</button>
</div>
<div id="his-domain-list" class="his-var-content">
<div id="his-domain-list-contents" class="cont-series"></div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showDom('more')">@@more@@</button>@@blockDomain@@
<br />
<input type="text" placeholder="example.com" id="domainblock" />
<button class="btn waves-effect" onclick="addDomainblock()">@@add@@</button>
<br />
</div>
<div id="his-prof-list" class="his-var-content">
@@name@@
<br />
<input type="text" placeholder="@@name@@" id="his-name-val" style="max-width: 250px" />
<br />@@note@@
<br />
<div class="input-field col s12">
<textarea placeholder="@@note@@" id="his-des-val" class="materialize-textarea"></textarea>
<label for="his-des-val">@@note@@</label>
</div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="profedit()">@@change@@</button>
<br />@@editProfImg@@:
<span id="prof-change">
<input type="file" onchange="imgChange(this,'avatar')" />
</span>
<br />@@editHeader@@:
<span id="header-change">
<input type="file" onchange="imgChange(this,'header')" />
</span>
</div>
<div id="his-request-list" class="his-var-content">
<div id="his-request-list-contents" class="cont-series"></div>
<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showReq('more')">@@more@@</button>
</div>
<div id="his-follow-recom-list" class="his-var-content">
<div id="his-follow-recom-contents" class="cont-series"></div>
</div>
<div id="his-float-blocked">
<div>@@blocked@@</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn" onclick="historyShow()">@@historyBack@@</button>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">@@close@@</a>
</div>
</div>

File diff suppressed because it is too large Load Diff

View File

@ -65,7 +65,6 @@
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"editHistory": "Edit history",
"useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
@ -74,7 +73,6 @@
"favRegist": "Favourite",
"openBrowser": "Open in browser",
"screenshot": "Take a screenshot",
"copyBinary": "Copy raw image",
"copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed",
@ -88,8 +86,6 @@
"makeNew": "Save",
"blocks": "Blocks",
"mutes": "Mutes",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} of this account",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.",

View File

@ -13,13 +13,13 @@
"env": "System Preferences",
"setlang": "Languages",
"backup": "Import and export of preferences",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Import",
"export": "Export",
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Themes",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
@ -28,7 +28,7 @@
"nnwarn": "This does not work on Windows Portable ver.",
"nntest": "Notification test",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Minimum width of TweetDeck browser",
"fixwidthwarn": "",
"margin": "Margin between timelines",
@ -37,7 +37,7 @@
"fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
"fontsize": "Font size",
"savefolder": "Folder to save",
"savefolderwarn": "TheDesk uses this value when it tries to save pictures or take screenshots.",
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at the bottom of the window",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Background of 'active' elements",
@ -163,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",
@ -230,7 +230,7 @@
"reply": "Reply to this toot",
"keyselecttop": "Select the top & left(No.1 column) toot",
"reset": "Reset(Danger)",
"resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
"resetconfirm": "Delete all data. You cannot undo. Continue?",
"about": "About TheDesk",
"hp": "Website",
"support": "Support",

View File

@ -65,7 +65,6 @@
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"editHistory": "Edit history",
"useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
@ -74,7 +73,6 @@
"favRegist": "Favourite",
"openBrowser": "Open in browser",
"screenshot": "Take a screenshot",
"copyBinary": "Copy raw image",
"copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed",
@ -88,8 +86,6 @@
"makeNew": "Save",
"blocks": "Blocks",
"mutes": "Mutes",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} of this account",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.",

View File

@ -13,13 +13,13 @@
"env": "System Preferences",
"setlang": "Languages",
"backup": "Import and export of preferences",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Import",
"export": "Export",
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Themes",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
@ -28,7 +28,7 @@
"nnwarn": "This does not work on Windows Portable ver.",
"nntest": "Notification test",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Minimum width of TweetDeck browser",
"fixwidthwarn": "",
"margin": "Margin between timelines",
@ -37,7 +37,7 @@
"fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
"fontsize": "Font size",
"savefolder": "Folder to save",
"savefolderwarn": "TheDesk uses this value when it tries to save pictures or take screenshots.",
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at the bottom of the window",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Background of 'active' elements",
@ -163,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",
@ -230,7 +230,7 @@
"reply": "Reply to this toot",
"keyselecttop": "Select the top & left(No.1 column) toot",
"reset": "Reset(Danger)",
"resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
"resetconfirm": "Delete all data. You cannot undo. Continue?",
"about": "About TheDesk",
"hp": "Website",
"support": "Support",

View File

@ -65,7 +65,6 @@
"afterFTL": "Федерализиран TL след този тоот",
"favedPeople": "Хора, които го харесват",
"btedPeople": "Хората, които го подсилиха",
"editHistory": "Edit history",
"useOtherAcct1": "Използване на друг профил",
"useOtherAcct2": ":unfav и unBT са деактивирани.",
"btWithVis": "Подсилването е видимо",
@ -74,7 +73,6 @@
"favRegist": "Любими",
"openBrowser": "Отваряне в браузъра",
"screenshot": "Направете снимка на екрана",
"copyBinary": "Copy raw image",
"copyURL": "Копирай URL адреса на този тоот",
"copy": "Copy",
"embed": "Закрепи",
@ -88,8 +86,6 @@
"makeNew": "Запази",
"blocks": "Блокове",
"mutes": "Заглушаване",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Блокове",
"mute": "Заглуши",
"domainBlock": "Блок домейн",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "В процес...",
"lang_tl_postmarkers": "Данни за POST маркери. Моля изчакайте",
"lang_img_DLDone": "Изтеглени:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Копирано: URL адреса на това изображение",
"lang_layout_gotop": "Върнете се в горната част на тази колона. Когато иконата е червена, означава че тази колона не може да свърже API за споделане. Моля, презаредете.",
"lang_layout_thisacct": "{{notf}} от този акаунт",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Следвайте, за да добавите този потребител към списъците.",

View File

@ -13,13 +13,13 @@
"env": "Системни предпочитания",
"setlang": "Езици",
"backup": "Внос и износ на предпочитания",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Внос",
"export": "Износ",
"hardwareAcceleration": "Деактивиране на хардуерното ускорение",
"hardwareAccelerationWarn": "Автоматичното рестартиране",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Теми",
"popup": "Известие с изскачащ прозорец (за Windows)",
"popupwarn": "Скрито ако е зададено на „0“",
@ -28,7 +28,7 @@
"nnwarn": "Това не работи в Windows Portable вер.",
"nntest": "Тест за уведомяване",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Минимална ширина на браузъра TweetDeck",
"fixwidthwarn": "",
"margin": "Margin between timelines",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at the bottom of the window",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Background of 'active' elements",
@ -163,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "Можете да вмъкнете всякакви букви и емотикони само с 3 клавиша",

View File

@ -65,7 +65,6 @@
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"editHistory": "Edit history",
"useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
@ -74,7 +73,6 @@
"favRegist": "Favourite",
"openBrowser": "Open in browser",
"screenshot": "Take a screenshot",
"copyBinary": "Copy raw image",
"copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed",
@ -88,8 +86,6 @@
"makeNew": "Save",
"blocks": "Blocks",
"mutes": "Mutes",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} of this account",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.",

View File

@ -13,13 +13,13 @@
"env": "System Preferences",
"setlang": "Languages",
"backup": "Import and export of preferences",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Import",
"export": "Export",
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Themes",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
@ -28,7 +28,7 @@
"nnwarn": "This does not work on Windows Portable ver.",
"nntest": "Notification test",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Minimum width of TweetDeck browser",
"fixwidthwarn": "",
"margin": "Margin between timelines",
@ -37,7 +37,7 @@
"fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
"fontsize": "Font size",
"savefolder": "Folder to save",
"savefolderwarn": "TheDesk uses this value when it tries to save pictures or take screenshots.",
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at the bottom of the window",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Background of 'active' elements",
@ -163,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",
@ -230,7 +230,7 @@
"reply": "Reply to this toot",
"keyselecttop": "Select the top & left(No.1 column) toot",
"reset": "Reset(Danger)",
"resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
"resetconfirm": "Delete all data. You cannot undo. Continue?",
"about": "About TheDesk",
"hp": "Website",
"support": "Support",

View File

@ -65,7 +65,6 @@
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"editHistory": "Edit history",
"useOtherAcct1": "Použít jiný účet",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
@ -74,7 +73,6 @@
"favRegist": "Oblíbit",
"openBrowser": "Otevřít v prohlížeči",
"screenshot": "Vytvořit snímek obrazovky",
"copyBinary": "Copy raw image",
"copyURL": "Kopírovat URL tohoto tootu",
"copy": "Copy",
"embed": "Vložit",
@ -88,8 +86,6 @@
"makeNew": "Uložit",
"blocks": "Blocks",
"mutes": "Mutes",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} tohoto účtu",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "Tento účet byl přesunut",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[robot]",
"lang_showontl_followed": "Sledují vás",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Oznámení ",
"lang_showontl_domain": "Doména ",
"lang_showontl_listwarn": "Follow to add this user to lists.",

View File

@ -13,13 +13,13 @@
"env": "Systémové předvolby",
"setlang": "Jazyky",
"backup": "Import a export předvoleb",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Import",
"export": "Export",
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Motivy",
"popup": "Popupová oznámení (na Windows)",
"popupwarn": "Hide to set \"0\"",
@ -28,7 +28,7 @@
"nnwarn": "This does not work on Windows Portable ver.",
"nntest": "Odskoušet oznámení",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Minimální šířka TweetDeck prohlížeče",
"fixwidthwarn": "",
"margin": "Margin between timelines",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at the bottom of the window",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Background of 'active' elements",
@ -163,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",

View File

@ -65,7 +65,6 @@
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"editHistory": "Edit history",
"useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
@ -74,7 +73,6 @@
"favRegist": "Favourite",
"openBrowser": "Open in browser",
"screenshot": "Take a screenshot",
"copyBinary": "Copy raw image",
"copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed",
@ -88,8 +86,6 @@
"makeNew": "Save",
"blocks": "Blocks",
"mutes": "Mutes",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} of this account",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.",

View File

@ -13,13 +13,13 @@
"env": "System Preferences",
"setlang": "Languages",
"backup": "Import and export of preferences",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Import",
"export": "Export",
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Themes",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
@ -28,7 +28,7 @@
"nnwarn": "This does not work on Windows Portable ver.",
"nntest": "Notification test",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Minimum width of TweetDeck browser",
"fixwidthwarn": "",
"margin": "Margin between timelines",
@ -37,7 +37,7 @@
"fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
"fontsize": "Font size",
"savefolder": "Folder to save",
"savefolderwarn": "TheDesk uses this value when it tries to save pictures or take screenshots.",
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at the bottom of the window",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Background of 'active' elements",
@ -163,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",
@ -230,7 +230,7 @@
"reply": "Reply to this toot",
"keyselecttop": "Select the top & left(No.1 column) toot",
"reset": "Reset(Danger)",
"resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
"resetconfirm": "Delete all data. You cannot undo. Continue?",
"about": "About TheDesk",
"hp": "Website",
"support": "Support",

View File

@ -1,6 +1,6 @@
{
"draghere": "Zum Hochladen hier her ziehen",
"nowOffline": "OFFLINE: Ihr gesamter Beiträge befinden sich in Entwürfen und du solltest nach einer erneuten Internetverbindung neu laden",
"nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
"reOnline": "Jetzt haben wir wieder Internet. Du solltest neuladen...",
"close": "Schließen",
"webSrc": "Suche im Internet",
@ -65,7 +65,6 @@
"afterFTL": "Globaler-Verlauf nach diesem Tröt",
"favedPeople": "Leute, die es bevorzugt haben",
"btedPeople": "Leute, die es verstärkt haben",
"editHistory": "Verlauf bearbeiten",
"useOtherAcct1": "Anderes Konto verwenden",
"useOtherAcct2": ":unfav und unBT sind deaktiviert.",
"btWithVis": "Boost mit Sichtbarkeit",
@ -74,9 +73,8 @@
"favRegist": "Favoriten",
"openBrowser": "Im Browser öffnen",
"screenshot": "Bildschirmfoto aufnehmen",
"copyBinary": "Kopiere Rohdaten",
"copyURL": "URL dieses Tröts kopieren",
"copy": "Kopieren",
"copy": "Copy",
"embed": "Einbinden",
"toots": "Tröts",
"follow": "Folgen",
@ -88,8 +86,6 @@
"makeNew": "Speichern",
"blocks": "Blockiert",
"mutes": "Stumm geschaltet",
"notfMute": "Auch deren Benachrichtigungen stumm schalten",
"zeroSetToInfinity": "Dauer der Stummschaltung: 0 Min für dauerhaft einstellen",
"block": "Blockieren",
"mute": "Stummschalten",
"domainBlock": "Domänenblockade",
@ -183,7 +179,7 @@
"foundBug": "Ich habe einen Fehler gefunden",
"show": "Zeige",
"directory": "Verzeichnis",
"discover": "Entdecken",
"discover": "Discover",
"active": "Kürzlich aktiv",
"newcomer": "Neu eingetroffen",
"local_only": "Nur lokal",

View File

@ -60,8 +60,8 @@
"lang_postimg_failupload": "Gescheitert",
"lang_postimg_delete": "Klicken, um Beschreibung hinzuzufügen, Rechtsklick zum Löschen",
"lang_postimg_desc": "Beschreibung",
"lang_postimg_leadContext": "Rechtsklick auf das Vorschaubild, um dies zu löschen",
"lang_post_syncDetail": "Medien synchron hochladen",
"lang_postimg_leadContext": "right-click the thumbnail to delete this",
"lang_post_syncDetail": "Upload media synchronously",
"lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
"lang_post_tagTL": "Dieses Tröt enthält keinen Standard-Tag. Er wird in dem lokalen Verlauf nicht angezeigt. Fortfahren?",
"lang_post_tagVis": "Dieser Tröt (nicht 'öffentlicher' Tröt) wird nicht in diesem Tag-Verlauf angezeigt.",
@ -103,7 +103,7 @@
"lang_details_embed": "Eingefügtes HTML wurde entfernt.",
"lang_details_url": "URL dieses Tröts wurde entfernt.",
"lang_details_txt": "Inhalt dieses Tröts wurde entfernt.",
"lang_details_fetch": "Daten des Tröts abrufen…",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Keine Daten",
"lang_filter_errordegree": "Bitte überprüfen Sie den Kontext",
"lang_list_nodata": "Keine Daten",
@ -124,10 +124,9 @@
"lang_tags_tagwarn": "Automatisch {{tag}} anfügen, wenn Tröt ohne {{tag}} ist",
"lang_tl_media": "Medien",
"lang_tl_reconnect": "Mit Streaming API erneut verbinden",
"lang_tl_postmarkers_title": "Verarbeite...",
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Heruntergeladen:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Kopiert: URL dieses Bildes",
"lang_layout_gotop": "Gehen Sie zum Anfang dieser Spalte. Wenn das Symbol rot ist, kann diese Spalte keine Verbindung zur Streaming-API herstellen. Bitte neu laden.",
"lang_layout_thisacct": "{{notf}} dieses Kontos",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "Es dauert 30s bis mehrere Minuten",
"lang_hisdata_notonmisskey": "Misskey kann nicht angefordert werden.",
"lang_hisdata_key": "Dieser Benutzer ist von {{set}} überprüft",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "Dieses Konto wurde verschoben",
"lang_showontl_movebtn": "Auf dem neuen Konto fortfahren",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Folgt dir",
"lang_parse_request": "Anfrage folgen",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Benachrichtigung ",
"lang_showontl_domain": "Domäne ",
"lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
@ -218,7 +214,7 @@
"lang_parse_detail": "Details",
"lang_parse_redraft": "Löschen & Neuentwerfen",
"lang_parse_followed": "Folgt dir",
"lang_parse_moved": "Verschoben nach...",
"lang_parse_moved": "Moved to...",
"lang_parse_clientop": "Aktion dieses Clients",
"lang_parse_clienttxt": " wird",
"lang_parse_clientno": "Nichts unternehmen",
@ -226,7 +222,7 @@
"lang_parse_clientmute": "Stumm",
"lang_parse_mute": " wird stumm gemacht. Kann in den Einstellungen wieder entfernt werden.",
"lang_parse_voted": "Abgestimmt",
"lang_parse_myvote": "(Meine eigene Umfrage)",
"lang_parse_myvote": "(My own poll)",
"lang_parse_vote": "Abstimmen",
"lang_parse_unvoted": "Ergebnis ohne Abstimmung anzeigen",
"lang_parse_endedvote": "Abgelaufen",
@ -292,5 +288,5 @@
"lang_setting_exportwarn": "Nur wichtige Daten werden exportiert. Sie müssen diese Daten sichern.",
"lang_setting_importwarn": "Alle Daten werden gelöscht.",
"lang_setting_noupd": "Keine Updates verfügbar",
"lang_setting_thisisbeta": "Dies ist die Beta-Version. Du musst manuell aktualisieren."
"lang_setting_thisisbeta": "This is beta version. You have to update manually."
}

View File

@ -5,21 +5,21 @@
"no": "Nein",
"none": "Ohne",
"show": "Zeige",
"hide": "Verbergen",
"hide": "Hide",
"default": "Standard",
"change": "Ändern",
"select": "Auswahl",
"exec": "Ausführen",
"exec": "Exec",
"env": "Systemeinstellungen",
"setlang": "Sprachen",
"backup": "Import und Export von Einstellungen",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Importieren",
"export": "Exportieren",
"hardwareAcceleration": "Hardwarebeschleunigung deaktivieren",
"hardwareAccelerationWarn": "Automatischer Neustart",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Designs",
"popup": "Popup-Benachrichtigung(unter Windows)",
"popupwarn": "Bei \"0\" Ausgeschaltet.",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at the bottom of the window",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Background of 'active' elements",
@ -72,7 +72,7 @@
"desc": "Über dieses Design",
"customImport": "Import von eigenen Designs",
"delete": "Löschen",
"preview": "Vorschau",
"preview": "Preview",
"timeline": "Verlaufseinstellungen",
"timemode": "Zeitformat",
"relativetime": "Relatives Format:\"vor 1 Minuten\",\"vor 3 Tagen\"",
@ -163,7 +163,7 @@
"localonly": "Nur lokal",
"zeroWidthEmoji": "Emojis ohne Abstand Einfügen",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Tastaturkürzel Einstellungen",
"iks": "Schnell Einfügen",
"okswarn": "Sie können Buchstaben und Emojis mit 3-Tasten-Kombination einfügen",

View File

@ -65,7 +65,6 @@
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"editHistory": "Edit history",
"useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
@ -74,7 +73,6 @@
"favRegist": "Favourite",
"openBrowser": "Open in browser",
"screenshot": "Take a screenshot",
"copyBinary": "Copy raw image",
"copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed",
@ -88,8 +86,6 @@
"makeNew": "Save",
"blocks": "Blocks",
"mutes": "Mutes",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} of this account",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.",

View File

@ -13,13 +13,13 @@
"env": "System Preferences",
"setlang": "Languages",
"backup": "Import and export of preferences",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Import",
"export": "Export",
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Themes",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
@ -28,7 +28,7 @@
"nnwarn": "This does not work on Windows Portable ver.",
"nntest": "Notification test",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Minimum width of TweetDeck browser",
"fixwidthwarn": "",
"margin": "Margin between timelines",
@ -37,7 +37,7 @@
"fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
"fontsize": "Font size",
"savefolder": "Folder to save",
"savefolderwarn": "TheDesk uses this value when it tries to save pictures or take screenshots.",
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent": "User agent",
"useragentWarn": "Restart when changed",
"frame": "Window frame",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at the bottom of the window",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Background of 'active' elements",
@ -163,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",
@ -230,7 +230,7 @@
"reply": "Reply to this toot",
"keyselecttop": "Select the top & left(No.1 column) toot",
"reset": "Reset(Danger)",
"resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
"resetconfirm": "Delete all data. You cannot undo. Continue?",
"about": "About TheDesk",
"hp": "Website",
"support": "Support",

View File

@ -65,7 +65,6 @@
"afterFTL": "crwdns3174:0crwdne3174:0",
"favedPeople": "crwdns3176:0crwdne3176:0",
"btedPeople": "crwdns3178:0crwdne3178:0",
"editHistory": "crwdns4602:0crwdne4602:0",
"useOtherAcct1": "crwdns3180:0crwdne3180:0",
"useOtherAcct2": "crwdns3182:0crwdne3182:0",
"btWithVis": "crwdns4324:0crwdne4324:0",
@ -74,7 +73,6 @@
"favRegist": "crwdns3188:0crwdne3188:0",
"openBrowser": "crwdns3190:0crwdne3190:0",
"screenshot": "crwdns3192:0crwdne3192:0",
"copyBinary": "crwdns4594:0crwdne4594:0",
"copyURL": "crwdns3194:0crwdne3194:0",
"copy": "crwdns4586:0crwdne4586:0",
"embed": "crwdns3196:0crwdne3196:0",
@ -88,8 +86,6 @@
"makeNew": "crwdns3210:0crwdne3210:0",
"blocks": "crwdns3212:0crwdne3212:0",
"mutes": "crwdns3214:0crwdne3214:0",
"notfMute": "crwdns4591:0crwdne4591:0",
"zeroSetToInfinity": "crwdns4593:0crwdne4593:0",
"block": "crwdns3216:0crwdne3216:0",
"mute": "crwdns3218:0crwdne3218:0",
"domainBlock": "crwdns3220:0crwdne3220:0",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "crwdns3630:0crwdne3630:0",
"lang_tl_postmarkers": "crwdns3632:0crwdne3632:0",
"lang_img_DLDone": "crwdns3634:0crwdne3634:0",
"lang_imgBin_copyDone": "crwdns4596:0crwdne4596:0",
"lang_img_copyDone": "crwdns4380:0crwdne4380:0",
"lang_layout_gotop": "crwdns3636:0crwdne3636:0",
"lang_layout_thisacct": "crwdns3638:0{{notf}}crwdne3638:0",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "crwdns3694:0crwdne3694:0",
"lang_hisdata_notonmisskey": "crwdns3696:0crwdne3696:0",
"lang_hisdata_key": "crwdns3698:0{{set}}crwdne3698:0",
"lang_showontl_limited_title": "crwdns4598:0crwdne4598:0",
"lang_showontl_limited": "crwdns4600:0crwdne4600:0",
"lang_showontl_movetxt": "crwdns3700:0crwdne3700:0",
"lang_showontl_movebtn": "crwdns3702:0crwdne3702:0",
"lang_showontl_botacct": "crwdns3704:0[bot]crwdne3704:0",
"lang_showontl_followed": "crwdns3706:0crwdne3706:0",
"lang_parse_request": "crwdns4445:0crwdne4445:0",
"lang_parse_signup": "crwdns4603:0crwdne4603:0",
"lang_showontl_notf": "crwdns3708:0crwdne3708:0",
"lang_showontl_domain": "crwdns3710:0crwdne3710:0",
"lang_showontl_listwarn": "crwdns3712:0crwdne3712:0",

View File

@ -21,6 +21,5 @@
"misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
"nodata":"No data",
"accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
"haveExported": "Having the exported file of TheDesk, click here to jump setting page",
"redo": "Retry(re-input address)"
"haveExported": "Having the exported file of TheDesk, click here to jump setting page"
}

View File

@ -65,7 +65,6 @@
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"editHistory": "Edit history",
"useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
@ -74,7 +73,6 @@
"favRegist": "Favourite",
"openBrowser": "Open in browser",
"screenshot": "Take a screenshot",
"copyBinary": "Copy raw image",
"copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed",
@ -88,8 +86,6 @@
"makeNew": "Save",
"blocks": "Blocks",
"mutes": "Mutes",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",

View File

@ -50,8 +50,6 @@
"lang_manager_logout": "Logout",
"lang_manager_maxChars": "Max chars of toots",
"lang_manager_refreshAt": "Login with this domain",
"lang_manager_codesetup_title": "Skip code-setup",
"lang_manager_codesetup": "If you failed log-in, please click Cancel.",
"lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
"lang_emoji_get": "Get emojis",
"lang_emoji_custom": "Custom emojis",
@ -129,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} of this account",
@ -166,20 +163,16 @@
"lang_spotify_acct": "Connect TheDesk to Spotify",
"lang_spotify_np": "Done:templete of NowPlaying",
"lang_setting_npprovide": "NowPlaying provider:{{set}}",
"lang_setting_webview_warn": "Please turn WebView on at System Preferences of TheDesk to add TweetDeck as a column",
"lang_hisdata_frcreq": "Required Mastodon 2.4.3 and above",
"lang_hisdata_frcwarn": "Unfollow accounts will be shown.",
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.",

View File

@ -13,13 +13,13 @@
"env": "System Preferences",
"setlang": "Languages",
"backup": "Import and export of preferences",
"backupWarn": "If you get an error when you choose the file, please paste the strings printed when you open the file and click import",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Import",
"export": "Export",
"hardwareAcceleration": "Disable hardware acceleration",
"hardwareAccelerationWarn": "Auto restarted",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Themes",
"popup": "Popup notification",
"popupwarn": "Hide to set \"0\"",
@ -28,7 +28,7 @@
"nnwarn": "This does not work on Windows Portable ver.",
"nntest": "Notification test",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Minimum width of TweetDeck browser",
"fixwidthwarn": "",
"margin": "Margin between timelines",
@ -37,7 +37,7 @@
"fontwarn": "Select your favorite font to 'Select'(On Linux, it may not work.)",
"fontsize": "Font size",
"savefolder": "Folder to save",
"savefolderwarn": "TheDesk uses this value when it tries to save pictures or take screenshots.",
"savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
"useragent":"User agent",
"useragentWarn":"Restart when changed",
"frame": "Window frame",
@ -61,7 +61,7 @@
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom":"Background of menu-bar at the bottom of the window",
"bottom":"Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox":"Background of post-box and menu",
"active": "Background of 'active' elements",
@ -131,7 +131,6 @@
"autocwwarn": "Show dialog whether you make too-long text hidden.",
"defaultcw": "Default warining text",
"cws": "Always CW set",
"cwContinue": "Keep CW enabled",
"defaultvis": "Default visibility",
"public": "Public",
"unlisted": "Unlisted",
@ -164,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",
@ -231,7 +230,7 @@
"reply": "Reply to this toot",
"keyselecttop": "Select the top & left(No.1 column) toot",
"reset": "Reset(Danger)",
"resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
"resetconfirm": "Delete all data. You cannot undo. Continue?",
"about": "About TheDesk",
"hp": "Website",
"support": "Support",

View File

@ -65,7 +65,6 @@
"afterFTL": "Línea temporal federada luego de este toot",
"favedPeople": "Gente que lo marcaron como favorito",
"btedPeople": "Gente que lo retooteó",
"editHistory": "Edit history",
"useOtherAcct1": "Usar otra cuenta",
"useOtherAcct2": ":Dejar de marcar como favorito y deshacer retoot están deshabilitados.",
"btWithVis": "Retoots visibles",
@ -74,7 +73,6 @@
"favRegist": "Marcar como favorito",
"openBrowser": "Abrir en navegador web",
"screenshot": "Tomar captura de pantalla",
"copyBinary": "Copy raw image",
"copyURL": "Copiar dirección web de este toot",
"copy": "Copiar",
"embed": "Insertar",
@ -88,8 +86,6 @@
"makeNew": "Guardar",
"blocks": "Bloqueos",
"mutes": "Silenciados",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Bloquear",
"mute": "Silenciar",
"domainBlock": "Bloqueo de dominio",
@ -183,7 +179,7 @@
"foundBug": "Encontré un error",
"show": "Mostrar",
"directory": "Directorio",
"discover": "Descubrí",
"discover": "Discover",
"active": "Recientemente activo",
"newcomer": "Recién llegados",
"local_only": "Sólo local",

View File

@ -103,7 +103,7 @@
"lang_details_embed": "El código HTML de inserción se copió al portapapeles.",
"lang_details_url": "La dirección web de este toot se copió al portapapeles.",
"lang_details_txt": "El contenido de este toot se copió al portapapeles.",
"lang_details_fetch": "Obteniendo datos del mensaje…",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Sin datos",
"lang_filter_errordegree": "Por favor, comprobá un contexto",
"lang_list_nodata": "Sin datos",
@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Procesando…",
"lang_tl_postmarkers": "Datos de marcadores POST. Por favor, esperá.",
"lang_img_DLDone": "Descargado:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copiado: dirección web de esta imagen",
"lang_layout_gotop": "Ir al comienzo de esta columna. Cuando el ícono está rojo, esta columna no se puede conectar a la API del streaming. En ese caso, por favor, refrescá.",
"lang_layout_thisacct": "{{notf}} de esta cuenta",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "Tomará entre 30 segundos a varios minutos",
"lang_hisdata_notonmisskey": "Misskey no pudo responder.",
"lang_hisdata_key": "Este usuario está verificado por {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "Se mudó esta cuenta",
"lang_showontl_movebtn": "Continuar en la nueva cuenta",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Te sigue",
"lang_parse_request": "Solicitud de seguimiento",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notificación ",
"lang_showontl_domain": "Dominio ",
"lang_showontl_listwarn": "Seguí a este usuario para agregarlo a las listas.",

View File

@ -2,14 +2,14 @@
"list": "Lista de cuentas",
"back": "Atrás",
"add": "Agregar una cuenta",
"addAcct": "Rellena el dominio de la instancia (como mastodon.social)",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Desmarcarlo para omitir código de pegado. (iniciar sesión en Mastodon en Windows o macOS) (Recomendado: pcheck)",
"codesetup": "Configuración de código",
"mainacct": "Cuenta principal",
"selacct": "Seleccionar una cuenta",
"codepastewarn": "Pegar el código y cerrar el navegador web.",
"codepaste": "Código",
"domain": "Instancia",
"domain": "Dominio",
"connect": "Servidores federados",
"toots": "Toots",
"users": "Usuarios",
@ -21,5 +21,5 @@
"misskeylogin": "Leer <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> para iniciar sesión en Misskey.",
"nodata": "Sin datos",
"accessTokenSetup": "Usar el token de acceso para iniciar sesión (haga clic después de completar no el código si no el token de acceso en el casilla: avanzado)",
"haveExported": "Una vez exportado el archivo de TheDesk haz clic aquí para saltar la página de configuración"
"haveExported": "Having the exported file of TheDesk, click here to jump setting page"
}

View File

@ -1,136 +1,132 @@
{
"draghere": "Arrastra aquí para subir",
"nowOffline": "DESCONECTADO: todo su mensaje está como borrador y debería volver a cargar después de volver a conectarse a Internet",
"reOnline": "Ahora estamos en Internet, deberías recargar...",
"close": "Cerrar",
"webSrc": "Buscar en la Web",
"tsSrc": "Buscar en tootsearch",
"showSelectProf": "Mostrar perfil de la cuenta seleccionada",
"closethisbox": "Cerrar esta caja",
"draghere": "Drag here to upload",
"nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
"reOnline": "Now we are in the Internet, you should reload...",
"close": "Close",
"webSrc": "Search on Web",
"tsSrc": "Search on tootsearch",
"showSelectProf": "Show profile of the selecting account",
"closethisbox": "Close this box",
"toot": "Toot",
"post-new": "Publicar nuevo",
"nsfwDes": "Marcar contenido como sensible",
"cwDes": "Ocultar texto con advertencia de contenido",
"selfile": "Adjuntar..",
"post-new": "Post new",
"nsfwDes": "Mark media as sensitive",
"cwDes": "Hide text behind warning",
"selfile": "Attach..",
"insertEmoji": "Emojis",
"schedule": "Toot programado",
"postat": "Publicar el",
"scheduleWarn": "2.7.0~ Intervalo mínimo: 5 minutos (el reloj del servidor podría no ser preciso)",
"clearToot": "Borrar caja de toot",
"replyMode": "Responder",
"no": "Nu",
"yes": "",
"temp": "Adjuntar archivos",
"nothing": "Ninguno",
"stamp": "Sello",
"stampWarn": "Tu cuenta(aa@bb.cc) está en la parte inferior derecha de la imagen cargada",
"vis": "Ajustar privacidad de estado",
"cwtext": "Texto de advertencia",
"selectVis": "Ajustar privacidad de estado",
"schedule": "Scheduled toot",
"postat": "Post at",
"scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
"clearToot": "Clear toot box",
"replyMode": "Reply",
"no": "No",
"yes": "Yes",
"temp": "Attaching files",
"nothing": "None",
"stamp": "Stamp",
"stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
"vis": "Adjust status privacy",
"cwtext": "Warning text",
"selectVis": "Adjust status privacy",
"publicJP": "",
"unlistedJP": "",
"privateJP": "",
"localJP": "Solo local",
"sectoot": "Toot secundario",
"localJP": "Local only",
"sectoot": "Secondary Toot",
"directJP": "",
"emojiWarn": "",
"emojiInsertWarn": "Algunos emojis no se pueden insertar.",
"refreshEmoji": "Actualizar lista de emojis",
"closeThisBox": "Cerrar esta caja",
"showThisEmoji": " se muestran.",
"customEmoji": "Emojis personalizados",
"peopleEmoji": "Emojis de personas",
"natureEmoji": "Emojis de la naturaleza",
"foodEmoji": "Emojis de comida",
"activityEmoji": "Emojis de las actividades",
"placeEmoji": "Emojis de lugares",
"thingsEmoji": "Emojis de herramientas",
"symbolEmoji": "Emojis de símbolos",
"flagsEmoji": "Emojis de banderas",
"draft": "Borrador",
"poll": "Encuesta",
"pollDdisabled": "Encuestas: Deshabilitadas",
"pollProvider": "Proveedor de encuesta",
"polluntil": "Ocultar el recuento de votos hasta que se vote.",
"choice": "Opción",
"pollmulti": "Selección múltiple",
"expires_in": "Caduca en...(seg)",
"contextBefore": "Contexto antes de este toot",
"thisToot": "Este toot",
"contextAfter": "Contexto después de este toot",
"beforeLTL": "TL local antes de este toot",
"beforeUTL": "TL de Usuario antes de este toot",
"afterLTL": "Línea temporal local anterior a este toot)",
"afterUTL": "TL de Usuario antes de este toot",
"afterFTL": "TL Federado después de este toot",
"favedPeople": "Personas que lo marcaron como favorito",
"btedPeople": "Personas que lo retootearon",
"editHistory": "Editar Historial",
"useOtherAcct1": "Usar otra cuenta",
"useOtherAcct2": ":unfav y unBT están deshabilitados.",
"btWithVis": "Retootear con visibilidad",
"reply": "Responder",
"bt": "Retootear",
"favRegist": "Marcar como favorito",
"openBrowser": "Abrir en el navegador",
"screenshot": "Captura de pantalla",
"copyBinary": "Copiar imagen raw",
"copyURL": "Copiar la URL",
"copy": "Copiar",
"embed": "Insertar",
"emojiInsertWarn": "Some emojis are not able to be inserted.",
"refreshEmoji": "Refresh emojis list",
"closeThisBox": "Close this box",
"showThisEmoji": " are shown.",
"customEmoji": "Custom emojis",
"peopleEmoji": "Emojis of people",
"natureEmoji": "Emojis of nature",
"foodEmoji": "Emojis of foods",
"activityEmoji": "Emojis of activities",
"placeEmoji": "Emojis of places",
"thingsEmoji": "Emojis of tools",
"symbolEmoji": "Emojis of symbols",
"flagsEmoji": "Emojis of flags",
"draft": "Draft",
"poll": "Poll",
"pollDdisabled": "Polls: Disabled",
"pollProvider": "Provider of Poll",
"polluntil": "Hide 'votes' count until people vote it.",
"choice": "Choice",
"pollmulti": "Multiple select",
"expires_in": "Expires in...(sec)",
"contextBefore": "Context before this toot",
"thisToot": "This toot",
"contextAfter": "Context after this toot",
"beforeLTL": "Local TL before this toot",
"beforeUTL": "User TL before this toot",
"afterLTL": "Local TL after this toot)",
"afterUTL": "User TL before this toot",
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply",
"bt": "Boost",
"favRegist": "Favourite",
"openBrowser": "Open in browser",
"screenshot": "Take a screenshot",
"copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed",
"toots": "Toots",
"follow": "Seguir",
"follower": "Seguidor",
"utlColumn": "Mostrar como columna",
"timeline": "Línea temporal",
"operateOtherAcct": "Cuenta cruzada",
"list": "Lista",
"makeNew": "Guardar",
"blocks": "Bloqueos",
"mutes": "Silenciados",
"notfMute": "Silenciar también sus notificaciones",
"zeroSetToInfinity": "Duración de silenciado: 0 min para indefinido",
"block": "Bloquear",
"mute": "Silenciar",
"domainBlock": "Bloque de dominio",
"editProf": "Editar perfil",
"change": "Guardar",
"followReq": "Solicitudes de seguimiento",
"likeHimOrHer": "Similares",
"endorse": "Destacado en el perfil",
"openinbrowser": "Abrir en el navegador",
"mainacct": "Establecer una cuenta principal",
"frc": "Sugerencia",
"more": "Más",
"revoverJP": " para ",
"warnUseOtherAcct": "(No se pudo dejar de seguir)",
"follow": "Follow",
"follower": "Follower",
"utlColumn": "Show as a column",
"timeline": "Timeline",
"operateOtherAcct": "Cross-account",
"list": "List",
"makeNew": "Save",
"blocks": "Blocks",
"mutes": "Mutes",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",
"editProf": "Edit profile",
"change": "Save",
"followReq": "Follow requests",
"likeHimOrHer": "Resembling",
"endorse": "Feature on profile",
"openinbrowser": "Open in browser",
"mainacct": "Set it an main account",
"frc": "Suggest",
"more": "More",
"revoverJP": " to ",
"warnUseOtherAcct": "(Unable to unfollow)",
"revoverJPde": "",
"or": "o",
"openProf": "Mostrar perfil",
"warnListRegist": "Seguir para añadir este usuario a una lista.",
"blockDomain": "Añadir instancia bloqueada",
"name": "Nombre mostrado",
"note": "Nota",
"editProfImg": "Cambiar avatar",
"editHeader": "Cambiar imagen de cabecera",
"blocked": "Estás bloqueado. ¿Por qué?",
"or": "or",
"openProf": "Show profile",
"warnListRegist": "Follow to add this user to lists.",
"blockDomain": "Add blocking domain",
"name": "Display name",
"note": "Note",
"editProfImg": "Change avataor",
"editHeader": "Change header image",
"blocked": "You are blocked. Why?",
"likeUserDes": "Get people resembling this user.",
"get": "Obtener",
"get": "Get",
"historyBack": "Atrás",
"empUser": "Destacar a este usuario",
"supportme": "¡Apoyar TheDesk!",
"TheDeskDes": "TheDesk no tiene anuncios, no tienes que pagar para desbloquear características premium. ¡Necesitamos tu apoyo!",
"PatreonSupport": "Donar en Patreon",
"PixivSupport": "Donar en Pixiv FANBOX",
"AWLSupport": "Lista de deseos de Amazon",
"SendAmazonGift1": "Dame Tarjeta de Regalo Amazon:",
"empUser": "Emphasize this user",
"supportme": "Support TheDesk!",
"TheDeskDes": "TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!",
"PatreonSupport": "Support on Patreon",
"PixivSupport": "Support on Pixiv FANBOX",
"AWLSupport": "Amazon Wish List",
"SendAmazonGift1": "Give me Amazon Gift Card:",
"SendAmazonGift2": "",
"monthly": "Mensual",
"once": "Una vez",
"monthly": "Monthly",
"once": "Once",
"local": "Local",
"localMedia": "Local(Media)",
"home": "Inicio",
"fed": "Federado",
"home": "Home",
"fed": "Federated",
"fedMedia": "Federated(Media)",
"dm": "Direct Message",
"integratedTLDes": "Integrated(Local/Home)",
@ -139,59 +135,59 @@
"bookmark": "Bookmarks",
"showThisTL": "Show this TL:",
"webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
"add": "Añadir",
"search": "Buscar",
"sortSet": "Ordenar",
"add": "Add",
"search": "Search",
"sortSet": "Sort",
"selectAcct": "Account(Scroll to show all)",
"listLocale": "Lista",
"filterWord": "Palabras filtradas",
"degree": "Filtrar contextos",
"conver": "Conversaciones",
"prof": "Perfiles",
"option": "Ajustes",
"matchWord": "Palabra completa",
"listLocale": "List",
"filterWord": "Filtering words",
"degree": "Filter contexts",
"conver": "Conversations",
"prof": "Profiles",
"option": "Options",
"matchWord": "Whole word",
"warnMatchWord": "Nice for Latin language",
"except": "Soltar en lugar de ocultar",
"exceptWorn": "Los toots filtrados desaparecerán para siempre, incluso si el filtro es eliminado más tarde",
"avalableBefore": "Vence después de",
"warnAvBefore": "Desmarcado o \"0\" significa \"Nunca\"",
"warnAvBefore2": "Este valor puede contener algún error",
"unlimited": "Nunca",
"days": "día(s)",
"hours": "hora(s)",
"mins": "minuto(s)",
"secs": "segundo(s)",
"except": "Drop instead of hide",
"exceptWorn": "Filtered toots will disappear irreversibly, even if filter is later removed",
"avalableBefore": "Expire after",
"warnAvBefore": "Unset or \"0\" means \"Never\"",
"warnAvBefore2": "This value may contain some error",
"unlimited": "Never",
"days": "day(s)",
"hours": "hour(s)",
"mins": "minute(s)",
"secs": "second(s)",
"warnOnIntegratedTL": "Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
"helloTheDesk": "Internal error: please clear all data(at setting page) <b>All data will be deleted.</b>",
"addColumn": "Añadir una columna",
"sortColumns": "Ordenar",
"acctMan": "Gestor de cuentas",
"filter": "Filtro",
"setting": "Preferencias",
"reverse": "Invertir el diseño del botón de toot",
"f5": "Recargar TL",
"nanoDes": "El Mastodon más pequeño,",
"verTips": "Versión",
"clockTips": "Reloj",
"ramTips": "Estado de RAM",
"changeTips": "Cambiar Consejos",
"helpAndLogs": "Ayuda y registro",
"help": "Ayuda",
"contactwithlog": "Si me notificas errores con este registro, puedo detectar lo que está mal más fácilmente.",
"about": "Acerca de TheDesk",
"hereAddColumns": "<- Añadir TL",
"foundBug": "He encontrado un error",
"show": "Mostrar",
"directory": "Directorio",
"discover": "Descubrir",
"active": "Recientemente activo",
"newcomer": "Recién llegados",
"local_only": "Solo local",
"menu": "Menú",
"demoBottomBtns": "Guía de bienvenida",
"lookAtBottom": "Mira en la parte inferior de esta ventana. Aquí tienes algunos consejos sobre ella.",
"acctManDesc": "Añadir más cuentas y cerrar sesión.",
"settingDesc": "Muchísimos ajustes. ¡No podrás comprobarlo todo!",
"nanoDescPlus": "Cliente en ventana reducida (experimental)",
"menuDesc": "Todos los ajustes diarios de TheDesk y Mastodon como <b>añadir y ordenar columnas</b>, <b>comprobar la lista y los filtros</b>."
"addColumn": "Add a column",
"sortColumns": "Sort",
"acctMan": "Account Manager",
"filter": "Filter",
"setting": "Preferences",
"reverse": "Toot button layout reverse",
"f5": "Reload TL",
"nanoDes": "The smallest Mastodon,",
"verTips": "Version",
"clockTips": "Clock",
"ramTips": "RAM status",
"changeTips": "Change Tips",
"helpAndLogs": "Help & Log",
"help": "Help",
"contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
"about": "About TheDesk",
"hereAddColumns": "<- Add TL",
"foundBug": "I found a bug",
"show": "Show",
"directory": "Directory",
"discover": "Discover",
"active": "Recently active",
"newcomer": "New arrivals",
"local_only": "Local only",
"menu": "Menu",
"demoBottomBtns": "Welcome guide",
"lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
"acctManDesc": "Add more accounts and logout them.",
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}

View File

@ -1,14 +1,14 @@
{
"language": "en",
"lang_toot": "Toot",
"lang_there": "",
"lang_nothing": "Ninguno",
"lang_yesno": "",
"lang_no": "Nu",
"lang_there": "Yes",
"lang_nothing": "None",
"lang_yesno": "Yes",
"lang_no": "No",
"lang_progress": "Wait...",
"lang_edit": "Edit",
"lang_del": "Delete",
"lang_add": "Añadir",
"lang_add": "Add",
"lang_fatalerroroccured": "Error",
"lang_speech": "Google US English",
"lang_lang": "Language",
@ -45,14 +45,14 @@
"lang_manager_confirm": "is about to logout. Continue?",
"lang_manager_mainAcct": "Done:choose main account",
"lang_manager_def": "Default",
"lang_manager_none": "Ninguno",
"lang_manager_none": "None",
"lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
"lang_manager_logout": "Logout",
"lang_manager_maxChars": "Max chars of toots",
"lang_manager_refreshAt": "Login with this domain",
"lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
"lang_emoji_get": "Get emojis",
"lang_emoji_custom": "Emojis personalizados",
"lang_emoji_custom": "Custom emojis",
"lang_defaultemojis_text": "Emojis about {{cat}}",
"lang_emoji_uncat": "Uncategorized",
"lang_postimg_previewdis": "cannot preview",
@ -75,22 +75,22 @@
"lang_post_offline": "Add to the drafts because of offline",
"lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
"lang_status_btWarn": "It will take a miunte to boost a remote toot.",
"lang_status_follow": "Seguir",
"lang_status_follow": "Follow",
"lang_status_unfollow": "Unfollow",
"lang_status_block": "Bloquear",
"lang_status_block": "Block",
"lang_status_unblock": "Unblock",
"lang_status_mute": "Silenciar",
"lang_status_mute": "Mute",
"lang_status_unmute": "Unmute",
"lang_status_redraftTitle": "Delete & redraft",
"lang_status_redraft": "Continue to delete & redraft? You lose statuses of this toot. This fanction may contain some bugs. Images of this toot will be deleted on older than Mastodon 2.4.1.",
"lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
"lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
"lang_status_unendorse": "Not feature on profile",
"lang_status_endorse": "Destacado en el perfil",
"lang_status_endorse": "Feature on profile",
"lang_status_followers": "Followers",
"lang_status_active": "Last status",
"lang_secure_draft": "Add to draft",
"lang_secure_useThis": "Usar esto",
"lang_secure_useThis": "Use this",
"lang_secure_deleteThis": "Delete this",
"lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
"lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
@ -107,7 +107,7 @@
"lang_filter_nodata": "Sin datos",
"lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "Sin datos",
"lang_list_show": "Mostrar",
"lang_list_show": "Show",
"lang_list_users": "Users list",
"lang_list_nouser": "No users in this list.",
"lang_list_add": "Add to the list",
@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} of this account",
@ -169,17 +168,14 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Seguir para añadir este usuario a una lista.",
"lang_showontl_listwarn": "Follow to add this user to lists.",
"lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " replied to you",
@ -188,11 +184,11 @@
"lang_parse_btedsimple": " boosted",
"lang_parse_polled": "'s poll",
"lang_parse_notftime": "Actioned at",
"lang_parse_cwshow": "Mostrar",
"lang_parse_cwshow": "Show",
"lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
"lang_parse_fulltext": "Full size text:",
"lang_parse_autofold": "Auto folded",
"lang_parse_more": "Más",
"lang_parse_more": "More",
"lang_parse_url": "URL Analyzer",
"lang_parse_tagTL": "Timeline of {{tag}}",
"lang_parse_tagtoot": "Toot with {{tag}}",
@ -243,8 +239,8 @@
"lang_misskeyparse_reaction": "Reaction",
"lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
"lang_misskeyparse_listnostr": "No streaming API on List TLs",
"lang_misskeyparse_home": "Inicio",
"lang_misskeyparse_followers": "Seguidor",
"lang_misskeyparse_home": "Home",
"lang_misskeyparse_followers": "Follower",
"lang_misskeyparse_specified": "Specified User",
"lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
"lang_misskeyparse_renoted": " renoted your following post.",

View File

@ -1,25 +1,25 @@
{
"setting": "Preferencias",
"set": "Guardar",
"yes": "",
"no": "Nu",
"none": "Ninguno",
"show": "Mostrar",
"hide": "Ocultar",
"setting": "Preferences",
"set": "Save",
"yes": "Yes",
"no": "No",
"none": "None",
"show": "Show",
"hide": "Hide",
"default": "Default",
"change": "Cambiar",
"select": "Seleccionar",
"exec": "Ejecutar",
"exec": "Exec",
"env": "Preferencias del sistema",
"setlang": "Idiomas",
"backup": "Importación y exportación de la configuración",
"backupWarn": "Si recibe un error al seleccionar el archivo, por favor pegue el texto recibido y haga clic en importar",
"backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
"import": "Importar",
"export": "Exportar",
"hardwareAcceleration": "Deshabilitar la aceleración por hardware",
"hardwareAccelerationWarn": "Reinicio automático",
"webview": "Integración de Webview",
"webviewWarn": "Para usar la Integración de TweetDeck, por favor actívala. Tenga en cuenta que puede reducir el nivel de seguridad.",
"webview": "Webview Integration",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
"theme": "Temas",
"popup": "Notificación emergente (en Windows)",
"popupwarn": "Ocultar para establecer \"0\"",
@ -27,11 +27,11 @@
"nativenotf": "Notificación nativa",
"nnwarn": "Esto no funciona en la versión portable para Windows.",
"nntest": "Prueba de notificación",
"width": "Ancho de columnas",
"widthwarn": "La barra de desplazamiento se mostrará cuando el tamaño de la ventana sea superior a la cantidad de columnas.",
"width": "Width of columns",
"widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
"fixwidth": "Ancho mínimo del navegador TweetDeck",
"fixwidthwarn": "",
"margin": "Margen entre líneas de tiempo",
"margin": "Margin between timelines",
"above": "arriba",
"font": "Fuente",
"fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@ -44,31 +44,31 @@
"frameWarn": "If 'off', the window looks cool.",
"downloadWin": "Versioning(o Windows downloader)",
"absolute": "valor absoluto",
"srcUrl": "Motor de búsqueda",
"srcUrlWarn": "{q} será sustituido en la consulta.",
"srcUrl": "Search engine",
"srcUrlWarn": "{q} will be replaced to query.",
"themeSel": "Seleccionar tema",
"customtheme": "Editar y añadir temas personalizados",
"customthemeDirection": "Esquema de colores",
"advanced": "Opciones avanzadas (6 colores adicionales)",
"advancedWarn": "",
"use": "Usar esto",
"copyFrom": "Copiar desde",
"bg": "Color de fondo",
"subcolor": "Distinguible del fondo",
"text": "Color del texto",
"accent": "Fondo de los retoots",
"use": "Use this",
"copyFrom": "Copy from",
"bg": "Background color",
"subcolor": "Distinguishable from background",
"text": "Text color",
"accent": "Background of boosts",
"modal": "Background of modal window",
"modalFooter": "Fondo del pie de página de la ventana modal",
"thirdColor": "Fondo de botones de etiquetas, etc. (cerca de fondo)",
"forthColor": "Barra de título (mismo esquema que el fondo)",
"bottom": "Fondo de la barra de menús en la parte inferior de la ventana",
"modalFooter": "Background of modal window's footer",
"thirdColor": "Backgroud of tag buttons, etc(near to Background)",
"forthColor": "Title bar(same scheme to Background)",
"bottom": "Background of menu-bar at bottom of window",
"emphasized": "Emphasized toot's background",
"postbox": "Background of post-box and menu",
"active": "Fondo de elementos 'activos'",
"active": "Background of 'active' elements",
"selected": "Background of selected with arrow keys",
"selectedWithShare": "Background of selected with arrow keys(boosted toots)",
"add_new": "Añadir nuevo",
"name": "Nombre",
"add_new": "Add new",
"name": "Name",
"desc": "About this theme",
"customImport": "Import of custom themes",
"delete": "Delete",
@ -108,7 +108,7 @@
"autofoldwarn": "TheDesk does not collapse totes of 5 characters or less. Also, when collapsing, newlines are not shown. TheDesk count only newlines as the number of lines.",
"lines": "lines",
"letters": "letters",
"or": "o",
"or": "or",
"imgheight": "Height of images",
"imgheightwarn": "Option:Set \"full\" to uncrop.",
"ticker": "Enable OpenSticker",
@ -163,7 +163,7 @@
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",
@ -219,8 +219,8 @@
"keyunread": "Make all notifications read",
"keyesc": "Hide toot box",
"keyf5": "Super Reload",
"keyclear": "Borrar caja de toot",
"keyacctman": "Gestor de cuentas",
"keyclear": "Clear toot box",
"keyacctman": "Account Manager",
"keyshowprof": "Show profile of selecting",
"keyrow": "Show next or previous image",
"keyzoom": "Mousewheel:Zoom a image",
@ -230,11 +230,11 @@
"reply": "Reply to this toot",
"keyselecttop": "Select the top & left(No.1 column) toot",
"reset": "Reset(Danger)",
"resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
"about": "Acerca de TheDesk",
"resetconfirm": "Delete all data. You cannot undo. Continue?",
"about": "About TheDesk",
"hp": "Website",
"support": "Support",
"help": "Ayuda",
"help": "Help",
"sushi": "Give me a sushi!",
"checkup": "Check update",
"ossJP": ""

View File

@ -1,19 +1,19 @@
{
"updatehere": "Obtener el último TheDesk",
"download": "Inicio",
"portable": "Version portable",
"installer": "Instalador (Recomendado)",
"updatehere": "Get latest TheDesk",
"download": "Start",
"portable": "Portable ver.",
"installer": "Installer(Recommended)",
"linux": "zip",
"linuxdeb": "deb(Recomendado en ubuntu, Debian)",
"linuxsnap": "instantánea",
"snap": "Consíguelo en Snapcraft",
"sureupd": "¡Podrías perder una experiencia genial!",
"skipupd": "Saltar esta actualización",
"nexttl": "Oculto hasta la próxima carga de TL",
"nextver": "Oculto hasta la próxima versión",
"problem1": "¿Algún problema?",
"problem2": "Por favor, descarga desde <a href='https://thedesk.top'>enlace oficial</a>.",
"continue": "Continuar con la actualización",
"dlnow": "Descargando...",
"checkWhatIsNew": "Novedades"
"linuxdeb": "deb(Recommended on buntu, Debian)",
"linuxsnap": "snap",
"snap": "Get it on Snapcraft",
"sureupd": "You may lose a cool experience!",
"skipupd": "Skip this update",
"nexttl": "Hidden until next TL loading",
"nextver": "Hidden until next version",
"problem1": "Some problems?",
"problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
"continue": "Continue updating",
"dlnow": "Downloading...",
"checkWhatIsNew": "What is new?"
}

View File

@ -65,7 +65,6 @@
"afterFTL": "Federated TL after this toot",
"favedPeople": "People who favourited it",
"btedPeople": "People who boosted it",
"editHistory": "Edit history",
"useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
@ -74,7 +73,6 @@
"favRegist": "Favourite",
"openBrowser": "Open in browser",
"screenshot": "Take a screenshot",
"copyBinary": "Copy raw image",
"copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed",
@ -88,8 +86,6 @@
"makeNew": "Save",
"blocks": "Blocks",
"mutes": "Mutes",
"notfMute": "Mute their notifications too",
"zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
"block": "Block",
"mute": "Mute",
"domainBlock": "Domain block",

View File

@ -127,7 +127,6 @@
"lang_tl_postmarkers_title": "Process...",
"lang_tl_postmarkers": "POST markers data. Please wait",
"lang_img_DLDone": "Downloaded:",
"lang_imgBin_copyDone": "Copied: raw data of this image",
"lang_img_copyDone": "Copied: URL of this image",
"lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
"lang_layout_thisacct": "{{notf}} of this account",
@ -169,14 +168,11 @@
"lang_hisdata_taketime": "It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey": "Misskey is unable to request.",
"lang_hisdata_key": "This user is proofed by {{set}}",
"lang_showontl_limited_title": "Limited account",
"lang_showontl_limited": "This is limited account by moderator, show anyway?",
"lang_showontl_movetxt": "This account was moved",
"lang_showontl_movebtn": "Continue on the new account",
"lang_showontl_botacct": "[bot]",
"lang_showontl_followed": "Following you",
"lang_parse_request": "Follow request",
"lang_parse_signup": "Newface",
"lang_showontl_notf": "Notification ",
"lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.",

Some files were not shown because too many files have changed in this diff Show More