Compare commits

..

98 Commits

Author SHA1 Message Date
Cutls
695d812ecb Update README.md 2020-07-04 18:25:49 +09:00
cutls
ef6db98da5 revert like 2020-07-04 18:20:35 +09:00
cutls
cd38819a7a add maxim 2020-07-04 18:03:04 +09:00
cutls
f207ed274b TheDesk 21.0.4 (Mayu) 2020-07-04 11:38:51 +09:00
cutls
c3691783de Merge branch 'master' of github.com:cutls/TheDesk 2020-07-04 11:32:25 +09:00
Cutls
7171831b14 Merge pull request #274 from cutls/dependabot/npm_and_yarn/app/chokidar-3.4.0
Bump chokidar from 3.3.1 to 3.4.0 in /app
2020-07-04 11:32:04 +09:00
dependabot-preview[bot]
fa14921421 Bump chokidar from 3.3.1 to 3.4.0 in /app
Bumps [chokidar](https://github.com/paulmillr/chokidar) from 3.3.1 to 3.4.0.
- [Release notes](https://github.com/paulmillr/chokidar/releases)
- [Commits](https://github.com/paulmillr/chokidar/compare/3.3.1...3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-04 02:31:27 +00:00
Cutls
475a80acdd New Crowdin translations (#278)
* New translations index.json (Greek)

* New translations setting.json (Czech)

* New translations index.json (Danish)

* New translations setting.json (Danish)

* New translations index.json (German)

* New translations setting.json (German)

* New translations index.json (Finnish)

* New translations setting.json (Finnish)

* New translations index.json (Hebrew)

* New translations setting.json (Hebrew)

* New translations index.json (Hungarian)

* New translations index.json (Romanian)

* New translations index.json (Czech)

* New translations setting.json (Greek)

* New translations setting.json (Catalan)

* New translations index.json (Afrikaans)

* New translations setting.json (Romanian)

* New translations index.json (French)

* New translations setting.json (French)

* New translations index.json (Spanish)

* New translations setting.json (Spanish)

* New translations setting.json (Bulgarian)

* New translations index.json (Catalan)

* New translations index.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations index.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations index.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations index.json (Chinese Simplified)

* New translations setting.json (Turkish)

* New translations setting.json (Ukrainian)

* New translations index.json (Ukrainian)

* New translations index.json (Turkish)

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Spanish, Argentina)

* New translations index.json (Vietnamese)

* New translations setting.json (Vietnamese)

* New translations index.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese, Brazilian)

* New translations index.json (Spanish, Argentina)

* New translations index.json (English)

* New translations setting.json (Swedish)

* New translations index.json (Polish)

* New translations setting.json (Hungarian)

* New translations index.json (Italian)

* New translations setting.json (Italian)

* New translations index.json (Dutch)

* New translations setting.json (Dutch)

* New translations index.json (Norwegian)

* New translations setting.json (Norwegian)

* New translations index.json (Swedish)

* New translations setting.json (Polish)

* New translations index.json (Portuguese)

* New translations setting.json (Portuguese)

* New translations index.json (Russian)

* New translations setting.json (Russian)

* New translations index.json (Serbian (Cyrillic))

* New translations setting.json (Serbian (Cyrillic))

* New translations setting.json (English)

* New translations index.json (Afrikaans)

* New translations index.json (Romanian)

* New translations index.json (Bulgarian)

* New translations index.json (Arabic)

* New translations index.json (Spanish)

* New translations index.json (French)

* New translations index.json (Ukrainian)

* New translations index.json (Turkish)

* New translations index.json (Swedish)

* New translations index.json (Serbian (Cyrillic))

* New translations index.json (Russian)

* New translations index.json (Portuguese, Brazilian)

* New translations index.json (English)

* New translations index.json (Spanish, Argentina)

* New translations index.json (Chinese Simplified)

* New translations index.json (Vietnamese)

* New translations index.json (Chinese Traditional)

* New translations index.json (Portuguese)

* New translations index.json (Greek)

* New translations index.json (German)

* New translations index.json (Danish)

* New translations index.json (Finnish)

* New translations index.json (Czech)

* New translations index.json (Catalan)

* New translations index.json (Polish)

* New translations index.json (Norwegian)

* New translations index.json (Dutch)

* New translations index.json (Italian)

* New translations index.json (Hungarian)

* New translations index.json (Hebrew)

* New translations main.json (Catalan)

* New translations main.json (Czech)

* New translations main.json (Bulgarian)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Spanish)

* New translations main.json (Romanian)

* New translations main.json (French)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Chinese Simplified)

* New translations main.json (Ukrainian)

* New translations main.json (Turkish)

* New translations main.json (Swedish)

* New translations main.json (English)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Vietnamese)

* New translations main.json (Chinese Traditional)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Italian)

* New translations main.json (Finnish)

* New translations main.json (Greek)

* New translations main.json (Russian)

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Dutch)

* New translations main.json (Swedish)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Russian)

* New translations main.json (Turkish)

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Vietnamese)

* New translations main.json (English)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Ukrainian)

* New translations main.json (Dutch)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Spanish)

* New translations main.json (French)

* New translations main.json (Romanian)

* New translations main.json (Czech)

* New translations main.json (Finnish)

* New translations main.json (Italian)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (German)

* New translations main.json (Danish)

* New translations main.json (Swedish)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Russian)

* New translations main.json (Turkish)

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Vietnamese)

* New translations main.json (English)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Ukrainian)

* New translations main.json (Dutch)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Spanish)

* New translations main.json (French)

* New translations main.json (Romanian)

* New translations main.json (Czech)

* New translations main.json (Finnish)

* New translations main.json (Italian)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (German)

* New translations main.json (Danish)

* New translations acct.json (Romanian)

* New translations acct.json (Danish)

* New translations acct.json (German)

* New translations acct.json (Greek)

* New translations acct.json (Finnish)

* New translations acct.json (Hebrew)

* New translations acct.json (Czech)

* New translations acct.json (Afrikaans)

* New translations acct.json (French)

* New translations acct.json (Spanish)

* New translations acct.json (Bulgarian)

* New translations acct.json (Arabic)

* New translations acct.json (Catalan)

* New translations acct.json (Chinese Simplified)

* New translations acct.json (Chinese Traditional)

* New translations acct.json (Ukrainian)

* New translations acct.json (Turkish)

* New translations acct.json (Spanish, Argentina)

* New translations acct.json (English)

* New translations acct.json (Vietnamese)

* New translations acct.json (Portuguese, Brazilian)

* New translations acct.json (Dutch)

* New translations acct.json (Hungarian)

* New translations acct.json (Italian)

* New translations acct.json (Norwegian)

* New translations acct.json (Polish)

* New translations acct.json (Swedish)

* New translations acct.json (Serbian (Cyrillic))

* New translations acct.json (Russian)

* New translations acct.json (Portuguese)

* New translations index.json (German)
2020-07-04 11:31:09 +09:00
Cutls
9826c3f33e Merge pull request #279 from cutls/dependabot/npm_and_yarn/app/jquery-3.5.1
Bump jquery from 3.5.0 to 3.5.1 in /app
2020-07-04 11:30:50 +09:00
Cutls
ecee949547 Merge pull request #281 from cutls/dependabot/npm_and_yarn/app/electron-rebuild-1.11.0
Bump electron-rebuild from 1.10.1 to 1.11.0 in /app
2020-07-04 11:30:36 +09:00
Cutls
95eea7051f Merge branch 'master' into dependabot/npm_and_yarn/app/electron-rebuild-1.11.0 2020-07-04 11:30:21 +09:00
Cutls
74e3ea41a7 Merge pull request #293 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.7.0
Bump electron-builder from 22.5.1 to 22.7.0 in /app
2020-07-04 11:29:46 +09:00
dependabot-preview[bot]
dc27db920a Bump electron-builder from 22.5.1 to 22.7.0 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.5.1 to 22.7.0.
- [Release notes](https://github.com/electron-userland/electron-builder/releases)
- [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/electron-userland/electron-builder/compare/v22.5.1...v22.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-04 02:28:57 +00:00
dependabot-preview[bot]
b2724fe362 Bump jquery from 3.5.0 to 3.5.1 in /app
Bumps [jquery](https://github.com/jquery/jquery) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.5.0...3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-04 02:28:47 +00:00
Cutls
5d43a5b159 Merge pull request #304 from cutls/dependabot/npm_and_yarn/app/electron-dl-3.0.1
Bump electron-dl from 3.0.0 to 3.0.1 in /app
2020-07-04 11:28:34 +09:00
Cutls
7435f3ddfd Merge branch 'master' into dependabot/npm_and_yarn/app/electron-dl-3.0.1 2020-07-04 11:28:18 +09:00
Cutls
94b6de6d3f Merge pull request #309 from cutls/dependabot/npm_and_yarn/app/fortawesome/fontawesome-free-5.13.1
Bump @fortawesome/fontawesome-free from 5.13.0 to 5.13.1 in /app
2020-07-04 11:27:36 +09:00
Cutls
1eb49e9a26 Merge pull request #311 from cutls/dependabot/npm_and_yarn/app/sweetalert2-9.15.2
Bump sweetalert2 from 9.10.12 to 9.15.2 in /app
2020-07-04 11:27:23 +09:00
Cutls
0893aa4ee1 Merge pull request #313 from cutls/dependabot/npm_and_yarn/app/jimp-0.14.0
Bump jimp from 0.10.3 to 0.14.0 in /app
2020-07-04 11:27:10 +09:00
cutls
ccdd9fba88 Introduce Electron 9.0.5 2020-07-04 11:26:46 +09:00
dependabot-preview[bot]
01dc5ff700 Bump electron-rebuild from 1.10.1 to 1.11.0 in /app
Bumps [electron-rebuild](https://github.com/electron/electron-rebuild) from 1.10.1 to 1.11.0.
- [Release notes](https://github.com/electron/electron-rebuild/releases)
- [Changelog](https://github.com/electron/electron-rebuild/blob/master/.releaserc.json)
- [Commits](https://github.com/electron/electron-rebuild/compare/v1.10.1...v1.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-04 02:12:00 +00:00
Cutls
346e8319df Merge pull request #310 from cutls/dependabot/npm_and_yarn/app/electron-9.0.5
Bump electron from 8.2.3 to 9.0.5 in /app
2020-07-04 11:10:08 +09:00
Cutls
5ca7046d5c Merge pull request #312 from heguro/fix-quote-muted
Fix quote_muted
2020-06-30 14:19:11 +09:00
dependabot-preview[bot]
f39e851211 Bump jimp from 0.10.3 to 0.14.0 in /app
Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.10.3 to 0.14.0.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.10.3...v0.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-29 20:15:35 +00:00
heguro
3747020876 Fix quote_muted 2020-06-26 14:22:30 +09:00
dependabot-preview[bot]
5ed5a9ade3 Bump sweetalert2 from 9.10.12 to 9.15.2 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.10.12 to 9.15.2.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.10.12...v9.15.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-24 03:48:09 +00:00
dependabot-preview[bot]
04f157353f Bump electron from 8.2.3 to 9.0.5 in /app
Bumps [electron](https://github.com/electron/electron) from 8.2.3 to 9.0.5.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v8.2.3...v9.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 05:46:03 +00:00
dependabot-preview[bot]
a1bbcc9be2 Bump @fortawesome/fontawesome-free from 5.13.0 to 5.13.1 in /app
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.13.0 to 5.13.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.13.0...5.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-19 20:18:38 +00:00
cutls
1266ef44ee Beta: fedibird expires_at 2020-06-16 15:08:27 +09:00
dependabot-preview[bot]
0da36709d5 Bump electron-dl from 3.0.0 to 3.0.1 in /app
Bumps [electron-dl](https://github.com/sindresorhus/electron-dl) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/electron-dl/releases)
- [Commits](https://github.com/sindresorhus/electron-dl/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-16 02:57:33 +00:00
cutls
2b5637f388 netlify 2020-06-16 11:36:03 +09:00
cutls
6d478906a0 width mistake 2020-06-16 11:22:58 +09:00
cutls
e436aed6c5 TheDesk 21.0.3 (Mayu) 2020-06-16 11:06:22 +09:00
cutls
25867690f3 re-challenge 2020-06-16 11:00:12 +09:00
cutls
b5efbebadb TheDesk 21.0.2 (Mayu) 2020-06-16 10:42:10 +09:00
cutls
e93f860c0c directly import setting 2020-06-13 01:59:05 +09:00
cutls
df04ebca4c quote_muted param 2020-06-13 01:46:26 +09:00
cutls
d2aaf2c2cf timeline delete bug 2020-06-13 01:40:32 +09:00
cutls
8386cd675c votebutton-fixed, and <pre> fixed 2020-06-13 01:33:30 +09:00
cutls
ad7b3cf485 follow request 2020-06-12 22:13:06 +09:00
cutls
f9f2aeab23 font change error 2020-06-12 21:06:12 +09:00
cutls
ea735d279f font-change bug 2020-06-12 20:58:10 +09:00
cutls
fa616d56fd Merge branch 'master' of github.com:cutls/TheDesk 2020-06-10 12:09:32 +09:00
cutls
907e55e6d7 column deleting 2020-06-10 12:09:17 +09:00
Cutls
874be5bca8 Merge pull request #292 from heguro/fix-could-not-see-column-list
Fix: cannot sort column if using some kind of TL
2020-05-24 16:07:14 +09:00
heguro
f49907e5e5 Fix: cannot sort column when using some kind of TL 2020-05-24 05:45:15 +09:00
cutls
da197340ec Flexible font-size 2020-05-23 13:54:51 +09:00
cutls
cf6e5b5dd5 Improve: font-size-change 2020-05-15 12:47:01 +09:00
cutls
917cd322fc bug of emoji 2020-05-15 11:15:01 +09:00
cutls
bc616ba118 TheDesk 21.0.1 (Mayu) 2020-05-11 19:03:55 +09:00
cutls
ea26648619 delete user matching 2020-05-11 18:59:28 +09:00
cutls
c2f1aec8b6 Fix: cannot show when dled imga 2020-05-11 18:42:52 +09:00
cutls
c005b546ba Fix: cannot upload 2020-05-11 18:42:43 +09:00
cutls
783ceec8de typo 2020-05-10 22:02:51 +09:00
cutls
b1ccfa85ba TheDesk 21.0.0(Mayu) 2020-05-10 21:59:25 +09:00
cutls
7e6d03fd53 fix: utl loading 2020-05-10 21:52:01 +09:00
cutls
dd0e1279c4 icon, en-splash, add remote-only pub 2020-05-10 19:39:49 +09:00
cutls
1b3e676b30 Add splash screen 2020-05-10 17:32:49 +09:00
cutls
a4582bb18a splash animation 2020-05-10 13:26:07 +09:00
cutls
25e99725d2 Add: show utl as a column 2020-05-07 00:31:11 +09:00
cutls
da011cd302 pwa compat 2020-05-06 18:09:00 +09:00
cutls
53010751ee pwa compat 2020-05-06 18:06:05 +09:00
cutls
19401b61cb del asterte-compat 2020-05-06 18:03:33 +09:00
cutls
82271f1c17 platform compat 2020-05-06 18:02:14 +09:00
cutls
a74d0ecf8d Bug wo mitsuketa 2020-05-05 23:37:58 +09:00
cutls
7ee4205f8a Add: Last.fm 2020-05-05 23:36:31 +09:00
cutls
9aef043344 cors 2020-05-03 22:46:55 +09:00
cutls
4dbc673719 fix 2020-05-03 22:32:41 +09:00
cutls
d44cecf21f show 2020-05-03 22:27:11 +09:00
cutls
3c0ea8f40d test 2020-05-03 22:23:59 +09:00
cutls
06b806532e test fin 2020-05-03 22:20:28 +09:00
cutls
1983864294 mv 2020-05-03 22:16:36 +09:00
cutls
c523a274e1 headers 2020-05-03 22:14:39 +09:00
cutls
03563eb1f2 mv 2020-05-03 22:11:23 +09:00
cutls
2f14d18126 toml 2020-05-03 22:06:41 +09:00
cutls
d1309a82ec np 2020-05-03 22:05:55 +09:00
cutls
2a2607eb4b follow request 2020-05-03 22:05:45 +09:00
cutls
e9b5221f05 TheDesk 20.3.3 2020-05-03 00:30:41 +09:00
cutls
bb71a28375 Add filesize 2020-05-02 23:32:46 +09:00
cutls
af3e87b0e3 Merge branch 'master' of github.com:cutls/TheDesk 2020-04-29 15:08:57 +09:00
cutls
4728a59c33 Accessibility (Screen Reader Optimized mode) 2020-04-29 15:08:42 +09:00
Cutls
f9a9c13dc5 Merge pull request #272 from cutls/dependabot/npm_and_yarn/app/electron-8.2.3
Bump electron from 8.0.0 to 8.2.3 in /app
2020-04-27 17:48:21 +09:00
Cutls
1fa6abccf7 Merge branch 'master' into dependabot/npm_and_yarn/app/electron-8.2.3 2020-04-27 17:48:12 +09:00
dependabot-preview[bot]
9aa68b8ee6 Bump electron from 8.0.0 to 8.2.3 in /app
Bumps [electron](https://github.com/electron/electron) from 8.0.0 to 8.2.3.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v8.0.0...v8.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 08:47:46 +00:00
Cutls
f90cfe221f Merge pull request #273 from cutls/dependabot/npm_and_yarn/app/jimp-0.10.3
Bump jimp from 0.10.1 to 0.10.3 in /app
2020-04-27 17:47:40 +09:00
Cutls
b70a5d0053 Merge branch 'master' into dependabot/npm_and_yarn/app/jimp-0.10.3 2020-04-27 17:47:27 +09:00
Cutls
9c4ba4da80 Merge pull request #271 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.5.1
Bump electron-builder from 22.4.1 to 22.5.1 in /app
2020-04-27 17:46:36 +09:00
Cutls
591dc1ba3c Merge pull request #270 from cutls/dependabot/npm_and_yarn/app/sweetalert2-9.10.12
Bump sweetalert2 from 9.10.9 to 9.10.12 in /app
2020-04-27 17:46:18 +09:00
Cutls
841afc5a33 Merge pull request #267 from cutls/dependabot/npm_and_yarn/app/jquery-3.5.0
Bump jquery from 3.4.1 to 3.5.0 in /app
2020-04-27 17:46:01 +09:00
Cutls
3a2e3c7895 New Crowdin translations (#263)
* New translations setting.json (Russian)

* New translations setting.json (Portuguese)

* New translations setting.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Polish)

* New translations setting.json (Norwegian)

* New translations setting.json (Italian)

* New translations setting.json (Serbian (Cyrillic))

* New translations setting.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations setting.json (Swedish)

* New translations setting.json (Spanish, Argentina)

* New translations setting.json (Spanish)

* New translations setting.json (Hungarian)

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations setting.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations setting.json (Czech)

* New translations setting.json (Hebrew)

* New translations setting.json (Greek)

* New translations setting.json (German)

* New translations setting.json (French)

* New translations setting.json (Finnish)

* New translations setting.json (Dutch)

* New translations setting.json (Danish)

* New translations setting.json (English)

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Portuguese)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Italian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Catalan)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (German)

* New translations main.json (Danish)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations acct.json (Serbian (Cyrillic))

* New translations main.json (Russian)

* New translations acct.json (Russian)

* New translations main.json (Romanian)

* New translations acct.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations acct.json (Portuguese, Brazilian)

* New translations main.json (Portuguese)

* New translations main.json (Serbian (Cyrillic))

* New translations acct.json (Portuguese)

* New translations main.json (Polish)

* New translations acct.json (Polish)

* New translations main.json (Norwegian)

* New translations acct.json (Norwegian)

* New translations main.json (Italian)

* New translations acct.json (Italian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations acct.json (English)

* New translations main.json (Vietnamese)

* New translations acct.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations acct.json (Ukrainian)

* New translations acct.json (Spanish)

* New translations acct.json (Turkish)

* New translations main.json (Swedish)

* New translations acct.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations acct.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations acct.json (Afrikaans)

* New translations main.json (Catalan)

* New translations main.json (Czech)

* New translations acct.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations acct.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations acct.json (Chinese Simplified)

* New translations acct.json (Danish)

* New translations acct.json (Catalan)

* New translations main.json (Bulgarian)

* New translations acct.json (Bulgarian)

* New translations main.json (Arabic)

* New translations acct.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Hungarian)

* New translations acct.json (Hungarian)

* New translations main.json (Hebrew)

* New translations acct.json (Hebrew)

* New translations main.json (Greek)

* New translations acct.json (Greek)

* New translations main.json (German)

* New translations acct.json (German)

* New translations main.json (Danish)

* New translations main.json (French)

* New translations acct.json (French)

* New translations main.json (Finnish)

* New translations acct.json (Finnish)

* New translations main.json (Dutch)

* New translations acct.json (Dutch)

* New translations index.json (Italian)

* New translations index.json (Hungarian)

* New translations index.json (Hebrew)

* New translations index.json (Finnish)

* New translations index.json (Romanian)

* New translations index.json (Russian)

* New translations index.json (Portuguese)

* New translations index.json (Polish)

* New translations index.json (Dutch)

* New translations index.json (Norwegian)

* New translations index.json (Greek)

* New translations index.json (Spanish)

* New translations index.json (Arabic)

* New translations index.json (Afrikaans)

* New translations index.json (French)

* New translations index.json (German)

* New translations index.json (Bulgarian)

* New translations index.json (Danish)

* New translations index.json (Czech)

* New translations index.json (Catalan)

* New translations index.json (Vietnamese)

* New translations index.json (Chinese Traditional)

* New translations index.json (Portuguese, Brazilian)

* New translations index.json (English)

* New translations index.json (Spanish, Argentina)

* New translations index.json (Serbian (Cyrillic))

* New translations index.json (Swedish)

* New translations index.json (Chinese Simplified)

* New translations index.json (Turkish)

* New translations index.json (Ukrainian)
2020-04-27 17:45:32 +09:00
cutls
5e035dc239 tag add all/none/any 2020-04-26 17:55:03 +09:00
cutls
2761cc23b0 css of announcement 2020-04-26 16:34:58 +09:00
cutls
cf00fefa6b Accessibility 2020-04-21 23:56:04 +09:00
cutls
039799083d depend 2020-04-21 22:18:40 +09:00
dependabot-preview[bot]
f6f53f9729 Bump jimp from 0.10.1 to 0.10.3 in /app
Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.10.1 to 0.10.3.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.10.1...v0.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-20 21:05:16 +00:00
dependabot-preview[bot]
34c189b3ed Bump electron-builder from 22.4.1 to 22.5.1 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.4.1 to 22.5.1.
- [Release notes](https://github.com/electron-userland/electron-builder/releases)
- [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/electron-userland/electron-builder/commits/v22.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-16 20:14:21 +00:00
dependabot-preview[bot]
4a704bc257 Bump sweetalert2 from 9.10.9 to 9.10.12 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.10.9 to 9.10.12.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.10.9...v9.10.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-14 20:16:52 +00:00
dependabot-preview[bot]
d0734ed5fe Bump jquery from 3.4.1 to 3.5.0 in /app
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-10 20:16:32 +00:00
198 changed files with 3600 additions and 2467 deletions

View File

@@ -28,7 +28,6 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg) * [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico) * [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns) * [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
@@ -166,4 +165,3 @@ Please write issues to improve TheDesk affinity with Pleroma.
## Vulnerabilities when `npm i`??? ## Vulnerabilities when `npm i`???
No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion. No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion.

View File

@@ -1,135 +1,139 @@
<!doctype html> <!DOCTYPE html>
<html lang="ja"> <html lang="ja">
<head>
<title>TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport" />
<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" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet" />
<meta charset="utf-8" />
<style>
body {
font-family: 'Open Sans';
-webkit-app-region: drag;
cursor: move;
padding: 5px;
padding-top: 15px;
}
<head> a,
<title>TheDesk</title> button {
<meta content="width=device-width,initial-scale=1.0" name="viewport"> -webkit-app-region: no-drag;
<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">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
<meta charset="utf-8">
<style>
body {
font-family: 'Open Sans';
-webkit-app-region: drag;
cursor: move;
padding: 5px;
padding-top: 15px;
}
a, .container {
button { width: 100%;
-webkit-app-region: no-drag; display: grid;
} grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
grid-template-areas: 'name1 data1' 'name2 data2' 'name3 data3' 'name4 data4' 'name5 data5' 'name6 data6';
text-align: left;
margin: 5px;
}
.container { .area-name1 {
width: 100%; grid-area: name1;
display: grid; }
grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5''name6 data6';
text-align: left;
margin: 5px;
}
.area-name1 { .area-data1 {
grid-area: name1; grid-area: data1;
} }
.area-data1 { .area-name2 {
grid-area: data1; grid-area: name2;
} }
.area-name2 { .area-data2 {
grid-area: name2; grid-area: data2;
} }
.area-data2 { .area-name3 {
grid-area: data2; grid-area: name3;
} }
.area-name3 { .area-data3 {
grid-area: name3; grid-area: data3;
} }
.area-data3 { .area-name4 {
grid-area: data3; grid-area: name4;
} }
.area-name4 { .area-data4 {
grid-area: name4; grid-area: data4;
} }
.area-data4 { .area-name5 {
grid-area: data4; grid-area: name5;
} }
.area-name5 { .area-data5 {
grid-area: name5; grid-area: data5;
} }
.area-data5 { .area-name6 {
grid-area: data5; grid-area: name6;
} }
.area-name6 { .area-data6 {
grid-area: name6; grid-area: data6;
} }
</style>
</head>
.area-data6 { <body class="center" style="overflow: hidden;">
grid-area: data6; <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
} <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
</style> <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
</head> <img src="./img/desk.svg" style="max-width: 62%;" />
<h5>TheDesk</h5>
<body class="center " style="overflow:hidden"> <div class="container">
<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script> <div class="area-name1">Display version</div>
<script type="text/javascript" src="./js/platform/first-not-view.js"></script> <div class="area-data1" id="now"></div>
<script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script> <div class="area-name2">Internal version</div>
<img src="./img/desk.svg" style="max-width:62%;"> <div class="area-data2" id="ver"></div>
<h5>TheDesk</h5> <div class="area-name3">Commit(7chars)</div>
<div class="container"> <div class="area-data3" id="hash"></div>
<div class="area-name1">Display version</div> <div class="area-name4">Chromium</div>
<div class="area-data1" id="now"></div> <div class="area-data4" id="chrome"></div>
<div class="area-name2">Internal version</div> <div class="area-name5">Electron</div>
<div class="area-data2" id="ver"></div> <div class="area-data5" id="electron"></div>
<div class="area-name3">Commit(7chars)</div> <div class="area-name6">Node.js</div>
<div class="area-data3" id="hash"></div> <div class="area-data6" id="node"></div>
<div class="area-name4">Chromium</div> </div>
<div class="area-data4" id="chrome"></div> <div class="cp">
<div class="area-name5">Electron</div> Copyright &copy; TheDesk 2018<br />
<div class="area-data5" id="electron"></div> Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br />
<div class="area-name6">Node.js</div> Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a
<div class="area-data6" id="node"></div> href="https://pl.kpherox.dev/kPherox"
</div> target="_blank"
<div class="cp">Copyright &copy; TheDesk 2018<br> >kPherox</a
Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br> >
Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a and all users
href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox" <img draggable="false" style="width: 0.8rem; top: 1px; margin-left: 1px; position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png" />
target="_blank">kPherox</a> and all users <br /><a href="https://thedesk.top" target="_blank">Web site</a>
<img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️" </div>
title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png"> <button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
<br><a href="https://thedesk.top" target="_blank">Web site</a></div> <script type="text/javascript" src="./js/ui/theme.js"></script>
<button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i <script>
class="material-icons left">close</i>Close</button> var about = JSON.parse(localStorage.getItem('about'))
<script type="text/javascript" src="./js/ui/theme.js"></script> $('#now').text(localStorage.getItem('ver'))
<script> $('#node').text(about[0])
var about = JSON.parse(localStorage.getItem("about")); $('#chrome').text(about[1])
$("#now").text(localStorage.getItem("ver")); $('#electron').text(about[2])
$("#node").text(about[0]); if (location.search) {
$("#chrome").text(about[1]); var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
$("#electron").text(about[2]); var ver = m[1]
if (location.search) { $('#ver').text(ver)
var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/); }
var ver = m[1]; $('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
$("#ver").text(ver); $(document).on('click', 'a', (e) => {
} var url = $(e.target).attr('href')
$("#hash").html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>'); postMessage(['openUrl', url], '*')
$(document).on('click', 'a', e => { return false
var url = $(e.target).attr('href'); })
postMessage(["openUrl", url], "*") </script>
return false; </body>
}); </html>
</script>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@@ -48,6 +48,12 @@ html {
.first .hide-first { .first .hide-first {
display: none; display: none;
} }
.hide-second {
display: none;
}
.first .hide-second {
display: inline;
}
#compt { #compt {
margin-top: 20px; margin-top: 20px;

View File

@@ -5,11 +5,15 @@ body {
overflow: hidden; overflow: hidden;
user-select: none; user-select: none;
cursor: default; cursor: default;
font-size: 13px;
height: 100vh; height: 100vh;
color: var(--color); color: var(--color);
} }
.titlebar, .menubar-menu-container, .action-menu-item { html {
font-size: 13px;
}
.titlebar,
.menubar-menu-container,
.action-menu-item {
background-color: var(--notfbox) !important; background-color: var(--notfbox) !important;
filter: brightness(110%) !important; filter: brightness(110%) !important;
color: var(--color) !important; color: var(--color) !important;
@@ -17,15 +21,27 @@ body {
.action-menu-item:hover { .action-menu-item:hover {
filter: brightness(80%) !important; filter: brightness(80%) !important;
} }
.btn { .btn, .btn-flat {
margin: 5px; font-size: 1.1rem;
margin: 0.4rem;
text-transform: none; text-transform: none;
height: 2.76rem;
line-height: 2.76rem;
} }
.markdown { .markdown {
display: none; display: none;
} }
help { .accessMark {
display: none; font-size: 12px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
background-color: var(--emphasized);
padding-left: 5px;
padding-right: 5px;
}
.accessibility .scr {
display: none !important;
} }
.show-help { .show-help {
display: inline; display: inline;
@@ -78,7 +94,7 @@ option {
} }
.badge { .badge {
min-width: 0 !important; min-width: 0 !important;
margin-left: 5px !important; margin-left: 0.4rem !important;
} }
.unvisible { .unvisible {
opacity: 0; opacity: 0;
@@ -152,16 +168,17 @@ pre {
display: block; display: block;
border-left: 5px solid; border-left: 5px solid;
border-color: #079903; border-color: #079903;
padding-left: 10px; padding-left: 0.75rem;
margin-top: 5px; margin-top: 0.75rem;
margin-bottom: 5px; margin-bottom: 0.75rem;
margin-left: 5px; margin-left: 0.75rem;
background-color: #000; background-color: #000;
padding: 1em 1em 1em; padding: 1em 1em 1em;
position: relative; position: relative;
border-top-left-radius: 10px; border-top-left-radius: 0.75rem;
border-bottom-right-radius: 10px; border-bottom-right-radius: 0.75rem;
border-bottom-left-radius: 10px; border-bottom-left-radius: 0.75rem;
white-space: normal;
} }
blockquote, blockquote,
.quote p { .quote p {
@@ -173,9 +190,9 @@ blockquote,
background-color: #ddd; background-color: #ddd;
padding: 1em 1em 1em; padding: 1em 1em 1em;
position: relative; position: relative;
border-top-left-radius: 10px; border-top-left-radius: 0.75rem;
border-bottom-right-radius: 10px; border-bottom-right-radius: 0.75rem;
border-bottom-left-radius: 10px; border-bottom-left-radius: 0.5rem;
} }
blockquote:before, blockquote:before,
.quote:before { .quote:before {
@@ -193,9 +210,9 @@ blockquote:before,
background-color: #fff; background-color: #fff;
padding: 1em 1em 1em; padding: 1em 1em 1em;
position: relative; position: relative;
border-top-left-radius: 10px; border-top-left-radius: 0.75rem;
border-bottom-right-radius: 10px; border-bottom-right-radius: 0.75rem;
border-bottom-left-radius: 10px; border-bottom-left-radius: 0.75rem;
border-left: 5px solid #0096fa; border-left: 5px solid #0096fa;
} }
.pixiv-post :before { .pixiv-post :before {
@@ -212,7 +229,7 @@ blockquote:before,
display: none; display: none;
position: fixed; position: fixed;
width: 100vw; width: 100vw;
height: calc(100vh - 40px); height: calc(100vh - 3rem);
background-color: var(--bg); background-color: var(--bg);
color: var(--color); color: var(--color);
z-index: 99999; z-index: 99999;
@@ -307,7 +324,7 @@ blockquote:before,
} }
.font { .font {
font-size: 1.5rem; font-size: 1.5rem;
margin-bottom: 5px; margin-bottom: 0.4rem;
} }
.font:hover { .font:hover {
background-color: #999; background-color: #999;
@@ -328,9 +345,9 @@ blockquote:before,
width: 540px; width: 540px;
top: calc(50% - 150px); top: calc(50% - 150px);
left: calc(50% - 250px); left: calc(50% - 250px);
padding: 5px; padding: 0.4rem;
border: thin solid gray; border: thin solid gray;
border-radius: 5px; border-radius: 0.4rem;
overflow: hidden; overflow: hidden;
} }
#menu-wrapper { #menu-wrapper {
@@ -340,30 +357,31 @@ blockquote:before,
overflow: hidden; overflow: hidden;
} }
#left-menu { #left-menu {
width: 230px; width: 17.7rem;
} }
#left-menu div { #left-menu a {
padding-left: 5px; padding-left: 0.4rem;
width: 100%; width: 100%;
height: 50px; height: 3rem;
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
color: var(--color);
} }
#left-menu div:hover { #left-menu a:hover {
background-color: var(--beforehover); background-color: var(--beforehover);
} }
#left-menu span { #left-menu span {
margin-left: 5px; margin-left: 0.4rem;
} }
#left-menu div.active { #left-menu a.active {
background-color: var(--emphasized); background-color: var(--emphasized);
} }
#right-menu { #right-menu {
width: 100%; width: 100%;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
padding: 5px; padding: 0.4rem;
} }
#tltype { #tltype {
display: flex; display: flex;
@@ -373,12 +391,13 @@ blockquote:before,
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
width: 170px; width: 13rem;
height: 40px; height: 3.1rem;
cursor: pointer; cursor: pointer;
color: var(--color);
} }
#tltype .type span { #tltype .type span {
width: calc(100% - 30px); width: calc(100% - 2.3rem);
} }
#tltype .type:hover { #tltype .type:hover {
background-color: var(--beforehover); background-color: var(--beforehover);
@@ -387,28 +406,28 @@ blockquote:before,
background-color: var(--emphasized); background-color: var(--emphasized);
} }
#tltype i { #tltype i {
font-size: 30px; font-size: 2.3rem;
} }
#tltype i.sub-icon { #tltype i.sub-icon {
font-size: 20px; font-size: 1.53rem;
position: absolute; position: absolute;
color: var(--beforehover); color: var(--beforehover);
left: 10px; left: 0.9rem;
bottom: 5px; bottom: 0.4rem;
background-color: #fff; background-color: #fff;
} }
.drag-bar { .drag-bar {
cursor: move; cursor: move;
text-align: center; text-align: center;
width: calc(100% + 10px); width: calc(100% + 0.8rem);
border-radius: 5px; border-radius: 5px;
background-color: var(--box); background-color: var(--box);
filter: brightness(80%); filter: brightness(80%);
margin-left: -5px; margin-left: -0.4rem;
margin-right: -5px; margin-right: -0.4rem;
margin-top: -5px; margin-top: -0.4rem;
font-size: 16px; font-size: 1.3rem;
padding: 4px; padding: 0.3rem;
} }
#something-wrong { #something-wrong {
flex-direction: column; flex-direction: column;
@@ -425,10 +444,10 @@ blockquote:before,
width: 100vw; width: 100vw;
background-color: var(--box); background-color: var(--box);
z-index: 9999; z-index: 9999;
padding: 10px; padding: 0.8rem;
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;
grid-template-rows: 1fr 36px; grid-template-rows: 1fr 2.7rem;
grid-template-areas: 'note middle right' 'note close close'; grid-template-areas: 'note middle right' 'note close close';
} }
#support-btm-en, #support-btm-en,
@@ -445,7 +464,7 @@ blockquote:before,
grid-area: close; grid-area: close;
} }
.select-wrapper .dropdown-content { .select-wrapper .dropdown-content {
width: 250px !important; width: 19.2rem !important;
} }
input, input,
textarea { textarea {
@@ -461,7 +480,7 @@ textarea {
color: var(--color) !important; color: var(--color) !important;
} }
#src-contents svg { #src-contents svg {
margin-right: 5px; margin-right: 0.4rem;
} }
.contributor { .contributor {
cursor: pointer; cursor: pointer;
@@ -471,11 +490,11 @@ textarea {
} }
.tagComp { .tagComp {
display: grid; display: grid;
grid-template-columns: 60px 80px 1fr; grid-template-columns: 4.6rem 6.15rem 1fr;
grid-template-rows: 1fr 1fr; grid-template-rows: 1fr 1fr;
grid-template-areas: 'svg toot user' 'svg toot tag' 'svg toots tag'; grid-template-areas: 'svg toot user' 'svg toot tag' 'svg toots tag';
border-top: dotted 0.5px var(--gray); border-top: dotted 0.5px var(--gray);
padding: 5px; padding: 0.4rem;
} }
.tagCompSvg { .tagCompSvg {
grid-area: svg; grid-area: svg;
@@ -493,7 +512,7 @@ textarea {
} }
.tagCompTag { .tagCompTag {
grid-area: tag; grid-area: tag;
padding-top: 10px; padding-top: 0.4rem;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
@@ -504,15 +523,22 @@ textarea {
#pageSrc { #pageSrc {
position: absolute; position: absolute;
top: 0; top: 0;
left: calc(50vw - 150px); left: calc(50vw - 11.53rem);
width: 300px; width: 23rem;
max-width: 100%; max-width: 100%;
background-color: var(--box); background-color: var(--box);
z-index: 501; z-index: 501;
padding: 5px; padding: 0.4rem;
} }
#pageSrcInput { #pageSrcInput {
width: 160px; width: 12.3rem;
}
.voice {
clip: rect(1px, 1px, 1px, 1px);
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
} }
@media (max-width: 500px) { @media (max-width: 500px) {
@@ -543,23 +569,20 @@ textarea {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 300;
src: local('Open Sans Light'), local('OpenSans-Light'), src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.ttf') format('truetype');
url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F,
U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
} }
@font-face { @font-face {
font-family: 'Material Icons'; font-family: 'Material Icons';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
format('woff2');
} }
.material-icons { .material-icons {
font-family: 'Material Icons'; font-family: 'Material Icons';
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
font-size: 24px; font-size: 1.84rem;
line-height: 1; line-height: 1;
letter-spacing: normal; letter-spacing: normal;
text-transform: none; text-transform: none;
@@ -570,3 +593,16 @@ textarea {
-webkit-font-feature-settings: 'liga'; -webkit-font-feature-settings: 'liga';
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
.pwaView .pwa,
.pwaView .mac,
.pwaView .win {
display: none;
}
.win32 .mac,
.linux .mac {
display: none;
}
.linux .win,
.darwin .win {
display: none;
}

View File

@@ -1,144 +1,148 @@
/*トゥートボックス向けCSS*/ /*トゥートボックス向けCSS*/
#post-box { #post-box {
display: none; display: none;
position: fixed; position: fixed;
left: calc(50vw - 150px); left: calc(50vw - 150px);
top: 50vh; top: 50vh;
background-color: var(--postbox); background-color: var(--postbox);
border: thin solid gray; border: thin solid gray;
z-index: 501; z-index: 501;
max-width: 100%; max-width: 100%;
padding: 5px; padding: 0.4rem;
border-radius: 5px; border-radius: 0.4rem;
overflow: hidden; overflow: hidden;
} }
textarea { textarea {
min-height: 100px !important; min-height: 7.7rem !important;
font-family: inherit; font-family: inherit;
} }
#post-box .ui-resizable-s, #post-box .ui-resizable-se{ #post-box .ui-resizable-s,
display: none !important; #post-box .ui-resizable-se {
display: none !important;
} }
.cancel { .cancel {
font-size: 0.5rem; font-size: 0.5rem;
color: gray; color: gray;
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: 2px; right: 2px;
top: 4px; top: 4px;
} }
.more-show { .more-show {
display: none; display: none;
} }
#drag { #drag {
width: 100%; width: 100%;
height: 100px; height: 100px;
} }
#post-btn { #post-btn {
display: none; display: none;
} }
#vis { #vis {
text-transform: capitalize; text-transform: capitalize;
} }
#cw-text { #cw-text {
display: none; display: none;
} }
#sch-box { #sch-box {
display: none; display: none;
} }
#sch-box input { #sch-box input {
width: auto; width: auto;
} }
.picker__close, .picker__close,
.picker__today, .picker__today,
.picker__clear { .picker__clear {
color: #26a69a !important; color: #26a69a !important;
} }
.cw { .cw {
display: none; display: none;
} }
.sensitive { .sensitive {
filter: blur(50px); filter: blur(50px);
} }
#emoji { #emoji {
} }
#suggest { #suggest {
max-height: 300px; max-height: 23rem;
overflow-y: scroll; overflow-y: scroll;
} }
#emoji-list { #emoji-list {
width: 100%; width: 100%;
height: 200px; height: 15.4rem;
overflow-y: scroll; overflow-y: scroll;
} }
#preview-field { #preview-field {
display: none; display: none;
} }
.preview-img { .preview-img {
width: 50px; width: 4rem;
max-height: 100px; max-height: 7.6rem;
} }
.pi-wrap { .pi-wrap {
display: inline-block; display: inline-block;
width: 50px; width: 3.8rem;
max-height: 100px; max-height: 7.7rem;
} }
#default-emoji a { #default-emoji a {
color: var(--color); color: var(--color);
margin-right: 2px; margin-right: 0.15rem;
} }
.character-counter { .character-counter {
position: relative; position: relative;
top: -25px; top: -1.9rem;
} }
.trendtag { .trendtag {
overflow-y: scroll; overflow-y: scroll;
max-height: 100px; max-height: 7.7rem;
} }
#toot-btn-field { #toot-btn-field {
display: flex; display: flex;
} }
#toot-post-btn { #toot-post-btn {
width: calc(100% - 10px); width: calc(100% - 0.7rem);
padding: 0; padding: 0;
margin-top: 10px; margin-top: 0.7rem;
height: 2.7rem;
} }
#toot-sec-btn { #toot-sec-btn {
width: 30px; width: 2.3rem;
padding: 0; padding: 0;
margin-top: 10px; margin-top: 0.7rem;
} }
#left-side { #left-side {
float: left; float: left;
overflow-x: hidden; overflow-x: hidden;
height: calc(100% - 32px); height: calc(100% - 2.5rem);
} }
#right-side { #right-side {
display: none; display: none;
float: left; float: left;
width: 300px; width: 23rem;
padding: 5px; padding: 0.4rem;
overflow-x: hidden; overflow-x: hidden;
height: calc(100% - 32px); height: calc(100% - 2.5rem);
} }
#posttgl,#toot-post-btn { #posttgl,
background-color: var(--accentbtn); #toot-post-btn {
background-color: var(--accentbtn);
color: var(--color);
} }
/*mini*/ /*mini*/
.mini-post .mize { .mini-post .mize {
display: none !important; display: none !important;
} }
.mini-post #textarea { .mini-post #textarea {
padding: 0; padding: 0;
} }
.mini-post #post-box { .mini-post #post-box {
width: 200px; width: 15.4rem;
min-width: 100px; min-width: 7.7rem;
} }
.mini-post #toot-field { .mini-post #toot-field {
padding: 0; padding: 0;
} }
.mini-post #toot-btn-field { .mini-post #toot-btn-field {
padding: 0; padding: 0;
} }

View File

@@ -3,29 +3,29 @@
cursor: move; cursor: move;
user-select: none; user-select: none;
background-color: var(--modalfooter); background-color: var(--modalfooter);
margin: 5px; margin: 0.4rem;
border-radius: 5px; border-radius: 0.4rem;
color: var(--color); color: var(--color);
padding: 3px; padding: 3px;
display: grid; display: grid;
grid-template-columns: 43px 1fr 60px; grid-template-columns: 3.3rem 1fr 4.6rem;
grid-template-areas: "sorticon sorttitle sorttitle" "sorticon sortacct sortaction"; grid-template-areas: "sorticon sorttitle sorttitle" "sorticon sortacct sortaction";
} }
.sorticon { .sorticon {
grid-area: sorticon; grid-area: sorticon;
} }
.sorticon i { .sorticon i {
font-size: 43px; font-size: 3.3rem;
} }
.sorttitle { .sorttitle {
margin-left: 5px; margin-left: 0.4rem;
grid-area: sorttitle; grid-area: sorttitle;
} }
.sortacct { .sortacct {
margin-left: 5px; margin-left: 0.4rem;
grid-area: sortacct; grid-area: sortacct;
} }
.sortaction { .sortaction {
margin-left: 5px; margin-left: 0.4rem;
grid-area: sortaction; grid-area: sortaction;
} }

View File

@@ -1,7 +1,7 @@
/*TL CSS(ただしBBCode pulse:master.css/spin:font-awesome*/ /*TL CSS(ただしBBCode pulse:master.css/spin:font-awesome*/
#main { #main {
width: 100vw; width: 100vw;
height: calc(100vh - 40px); height: calc(100% - 3rem);
} }
#timeline-container { #timeline-container {
overflow-x: scroll; overflow-x: scroll;
@@ -11,18 +11,19 @@
} }
#bottom { #bottom {
position: absolute; position: absolute;
overflow: hidden;
bottom: 0; bottom: 0;
width: 100vw; width: 100vw;
height: 40px; height: 3rem;
padding: 3px; padding: 0.23rem;
padding-right: 0; padding-right: 0;
padding-left: 40px; padding-left: 3rem;
background-color: var(--sidebar); background-color: var(--sidebar);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
z-index: 500; z-index: 500;
box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2); box-shadow: 0.77rem 0 0.77rem, 0.77rem rgba(0, 0, 0, 0.2);
} }
#demobottom { #demobottom {
width: 500px; width: 500px;
@@ -30,24 +31,24 @@
} }
#bottom.reverse { #bottom.reverse {
padding-left: 0; padding-left: 0;
padding-right: 40px; padding-right: 3rem;
} }
.reverse { .reverse {
flex-direction: row-reverse; flex-direction: row-reverse;
} }
#bottom #dambox { #bottom #dambox {
width: 300px; width: 23rem;
margin-right: 10px; margin-right: 0.76rem;
} }
#bottom.reverse #dambox { #bottom.reverse #dambox {
margin-right: 0; margin-right: 0;
} }
#bottom .trendtag { #bottom .trendtag {
height: 40px; height: 3rem;
} }
#bottom #group, #bottom #group,
#demogroup { #demogroup {
margin-right: 40px; margin-right: 3rem;
} }
#bottom .leftside { #bottom .leftside {
display: flex; display: flex;
@@ -57,41 +58,41 @@
align-items: center; align-items: center;
} }
#bottom #tips img { #bottom #tips img {
vertical-align: -3px; vertical-align: -0.23rem;
} }
#bottom a, #bottom a,
#demogroup a { #demogroup a {
color: var(--color); color: var(--color);
} }
#bottom i { #bottom i {
font-size: 30px; font-size: 2.3rem;
} }
.exc-icons { .exc-icons {
font-size: 20px; font-size: 1.53rem;
} }
.exc-chb { .exc-chb {
padding-left: 24px !important; padding-left: 1.84rem !important;
} }
.btnsgroup { .btnsgroup {
border: 1px solid; border: 1px solid;
padding-top: 1px; padding-top: 1px;
padding-left: 5px; padding-left: 0.4rem;
padding-right: 5px; padding-right: 0.4rem;
margin-right: 15px; margin-right: 1.15rem;
border-radius: 5px; border-radius: 0.4rem;
height: 35px; height: 2.7rem;
} }
.bgReport { .bgReport {
height: 34px; height: 2.61rem;
padding-top: 0.45rem; padding-top: 0.45rem;
text-decoration: underline; text-decoration: underline;
padding-left: 5px; padding-left: 0.4rem;
padding-right: 5px; padding-right: 0.4rem;
} }
#spot-box { #spot-box {
display: grid; display: grid;
grid-template-columns: 40px 30px 2.5fr 1fr 60px; grid-template-columns: 3rem 2.3rem 2.5fr 1fr 4.6rem;
grid-template-rows: 22px 20px; grid-template-rows: 1.7rem 1.5rem;
grid-template-areas: 'cover name name artist refresh' 'cover progress progress progress time'; grid-template-areas: 'cover name name artist refresh' 'cover progress progress progress time';
} }
#spot-refresh { #spot-refresh {
@@ -105,14 +106,14 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
line-height: 25px; line-height: 1.92rem;
} }
#spot-artist { #spot-artist {
grid-area: artist; grid-area: artist;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
line-height: 25px; line-height: 1.92rem;
} }
#spot-img { #spot-img {
width: 90%; width: 90%;
@@ -126,7 +127,7 @@
} }
.btnsgroup .grouptitle { .btnsgroup .grouptitle {
font-family: Open Sans; font-family: Open Sans;
font-size: 15px; font-size: 1.1rem;
} }
@media screen and (max-width: 890px) { @media screen and (max-width: 890px) {
.btnsgroup .grouptitle { .btnsgroup .grouptitle {
@@ -140,7 +141,7 @@
iframe, iframe,
.cvo video { .cvo video {
max-width: 100%; max-width: 100%;
max-height: 300px; max-height: 23rem;
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
.mobile #timeline-container { .mobile #timeline-container {
@@ -156,12 +157,12 @@ iframe,
} }
.box { .box {
overflow: hidden; overflow: hidden;
min-width: 300px; min-width: 23rem;
flex: 1; flex: 1;
border-top: none; border-top: none;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: -10px; margin-bottom: -0.75rem;
} }
.img_FTL { .img_FTL {
display: none; display: none;
@@ -215,16 +216,16 @@ iframe,
} }
.emoji, .emoji,
.emoji-img { .emoji-img {
width: 15px; width: 1.153rem;
} }
.area-toot .emoji, .area-toot .emoji,
.area-toot .emoji-img { .area-toot .emoji-img {
width: 20px; width: 1.538rem;
vertical-align: middle; vertical-align: middle;
margin: -1px 0; margin: -1px 0;
} }
.bigemoji { .bigemoji {
width: 100px !important; width: 7.7rem !important;
height: auto !important; height: auto !important;
position: relative; position: relative;
z-index: 9999; z-index: 9999;
@@ -253,13 +254,13 @@ iframe,
} }
.cvo { .cvo {
user-select: text; user-select: text;
padding-left: 5px; padding-left: 0.4rem;
border-bottom: 0.5px solid; border-bottom: 0.5px solid;
padding-right: 2px; padding-right: 0.15rem;
word-break: break-word; word-break: break-word;
width: 100%; width: 100%;
display: grid; display: grid;
grid-template-columns: 43px 2fr 1fr; grid-template-columns: 3.3rem 2fr 1fr;
grid-template-rows: auto 1.6rem 1fr auto 2.5rem; grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space toot toot' 'space additional additional' 'vis actions side'; grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space toot toot' 'space additional additional' 'vis actions side';
} }
@@ -285,21 +286,21 @@ iframe,
} }
.area-notice { .area-notice {
margin: 2px; margin: 0.15rem;
grid-area: notice; grid-area: notice;
} }
.area-icon { .area-icon {
width: 40px; width: 3rem;
margin: 2px; margin: 0.15rem;
grid-area: icon; grid-area: icon;
} }
.area-display_name { .area-display_name {
user-select: text; user-select: text;
height: 1.5em; height: 1.5em;
margin: 2px; margin: 0.15rem;
margin-left: 5px; margin-left: 0.4rem;
overflow: hidden; overflow: hidden;
grid-area: display_name; grid-area: display_name;
white-space: nowrap; white-space: nowrap;
@@ -310,7 +311,7 @@ iframe,
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.flex-name { .flex-name {
max-width: calc(100% - 60px); max-width: calc(100% - 4.6rem);
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
@@ -318,9 +319,9 @@ iframe,
.area-toot { .area-toot {
cursor: text; cursor: text;
user-select: auto; user-select: auto;
margin-top: 5px; margin-top: 0.4rem;
margin-bottom: 5px; margin-bottom: 0.4rem;
margin-left: 5px; margin-left: 0.4rem;
grid-area: toot; grid-area: toot;
} }
@@ -353,7 +354,7 @@ iframe,
.area-actions { .area-actions {
padding: 0; padding: 0;
margin: 0; margin: 0;
top: -5px; top: -0.4rem;
position: relative; position: relative;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
@@ -361,28 +362,28 @@ iframe,
grid-area: actions; grid-area: actions;
} }
.area-vis { .area-vis {
margin: 2px; margin: 0.4rem;
grid-area: vis; grid-area: vis;
text-align: center; text-align: center;
} }
.area-side { .area-side {
display: flex; display: flex;
top: -5px; top: -0.4rem;
position: relative; position: relative;
justify-content: flex-end; justify-content: flex-end;
margin: 2px; margin: 0.15rem;
grid-area: side; grid-area: side;
} }
.cusr { .cusr {
user-select: text; user-select: text;
padding-left: 5px; padding-left: 0.4rem;
border-bottom: 0.5px solid; border-bottom: 0.5px solid;
padding-right: 2px; padding-right: 0.15rem;
word-break: break-word; word-break: break-word;
width: 100%; width: 100%;
display: grid; display: grid;
grid-template-columns: 43px 2fr 1fr; grid-template-columns: 3.3rem 2fr 1fr;
grid-template-rows: auto 1.6rem 2fr auto; grid-template-rows: auto 1.6rem 2fr auto;
grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions'; grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
} }
@@ -391,12 +392,12 @@ iframe,
grid-area: status; grid-area: status;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 5px; margin-bottom: 0.75rem;
} }
.cusr .cbadge { .cusr .cbadge {
margin-top: 6px; margin-top: 0.46rem;
margin-left: 6px; margin-left: 0.46rem;
} }
.quote-inline { .quote-inline {
@@ -404,16 +405,16 @@ iframe,
} }
.quote-renote { .quote-renote {
display: grid; display: grid;
grid-template-columns: 43px 2fr 25px; grid-template-columns: 3.3rem 2fr 1.92rem;
grid-template-areas: 'ricon ruser rdet' 'ricon rtext rdet'; grid-template-areas: 'ricon ruser rdet' 'ricon rtext rdet';
border: 1px solid; border: 1px solid;
margin-top: 3px; margin-top: 0.23rem;
padding: 1px; padding: 1px;
border-radius: 3px; border-radius: 0.23rem;
} }
.renote-icon { .renote-icon {
grid-area: ricon; grid-area: ricon;
padding: 5px; padding: 0.4rem;
} }
.renote-details { .renote-details {
grid-area: rdet; grid-area: rdet;
@@ -432,17 +433,17 @@ iframe,
color: var(--color); color: var(--color);
} }
.area-side i { .area-side i {
margin-left: 10px; margin-left: 0.75rem;
} }
.viabadge { .viabadge {
margin-top: 10px; margin-top: 0.75rem;
} }
.action i { .action i {
font-size: 1.2rem; font-size: 1.2rem;
margin-right: 2px; margin-right: 0.15rem;
} }
.action .fa-quote-right { .action .fa-quote-right {
margin-top: 2px; margin-top: 0.15rem;
} }
.actct { .actct {
color: var(--beforehover); color: var(--beforehover);
@@ -461,24 +462,24 @@ iframe,
position: fixed; position: fixed;
background-color: var(--box); background-color: var(--box);
z-index: 9999; z-index: 9999;
border-radius: 5px; border-radius: 0.4rem;
padding: 5px; padding: 0.4rem;
} }
.contextMenu.bottom:before { .contextMenu.bottom:before {
content: ''; content: '';
position: absolute; position: absolute;
top: 100%; top: 100%;
right: 27px; right: 2rem;
border: 15px solid transparent; border: 1.2rem solid transparent;
border-top: 15px solid var(--box); border-top: 1.2rem solid var(--box);
} }
.contextMenu.top:before { .contextMenu.top:before {
content: ''; content: '';
position: absolute; position: absolute;
top: -30px; top: -2.3rem;
right: 27px; right: 2rem;
border: 15px solid transparent; border: 1.5rem solid transparent;
border-bottom: 15px solid var(--box); border-bottom: 1.5rem solid var(--box);
} }
.contextMenu .btn-flat { .contextMenu .btn-flat {
text-transform: none !important; text-transform: none !important;
@@ -501,26 +502,26 @@ iframe,
} }
.toot img:not(.emoji-img) { .toot img:not(.emoji-img) {
max-width: 100%; max-width: 100%;
max-height: 300px; max-height: 23rem;
} }
.cbadge { .cbadge {
display: inline-block; display: inline-block;
min-width: 10px; min-width: 0.76rem;
max-width: 100px; max-width: 7.7rem;
padding: 3px 7px; padding: 0.23rem 0.5rem;
font-size: 0.8em; font-size: 0.8em;
margin-right: 5px; margin-right: 0.4rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: middle;
background-color: #777; background-color: #777;
border-radius: 10px; border-radius: 0.75rem;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
height: calc(0.8em + 8px); height: calc(0.8em + 0.6rem);
user-select: none; user-select: none;
} }
.cbadge-hover { .cbadge-hover {
@@ -534,10 +535,10 @@ iframe,
p { p {
margin: 0; margin: 0;
margin-bottom: 0px; margin-bottom: 0px;
line-height: 20px; line-height: 1.53rem;
} }
p:not(:last-child) { p:not(:last-child) {
margin-bottom: 10px; margin-bottom: 0.76rem;
} }
.shared { .shared {
background-color: var(--shared); background-color: var(--shared);
@@ -553,14 +554,14 @@ p:not(:last-child) {
background-color: var(--notfbox); background-color: var(--notfbox);
filter: brightness(110%); filter: brightness(110%);
position: relative; position: relative;
margin-right: 10px; margin-right: 0.7rem;
width: 100%; width: 100%;
min-height: 60px; min-height: 4.6rem;
z-index: 500; z-index: 500;
padding: 5px; padding: 0.4rem;
display: grid; display: grid;
grid-template-columns: 40px 60px 1fr 24px; grid-template-columns: 3rem 5rem 1fr 1.8rem;
grid-template-rows: 30px 30px; grid-template-rows: 2.3rem 2.3rem;
grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box'; grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
} }
.emp { .emp {
@@ -604,8 +605,8 @@ p:not(:last-child) {
} }
#tools { #tools {
position: fixed; position: fixed;
top: 10px; top: 0.76rem;
right: 10px; right: 0.76rem;
float: right; float: right;
} }
.setting { .setting {
@@ -618,14 +619,14 @@ p:not(:last-child) {
} }
.notf-box { .notf-box {
position: fixed; position: fixed;
right: 70px; right: 5.4rem;
background-color: var(--box); background-color: var(--box);
border: thin solid gray; border: thin solid gray;
z-index: 501; z-index: 501;
width: 400px; width: 30rem;
padding: 5px; padding: 0.4rem;
min-height: 100px; min-height: 7.7rem;
max-height: 500px; max-height: 38.4rem;
} }
.column-hide { .column-hide {
display: none; display: none;
@@ -633,17 +634,21 @@ p:not(:last-child) {
height: 0; height: 0;
} }
.prof-img { .prof-img {
border-radius: 3px; border-radius: 0.23rem;
width: 3rem;
}
.prof-img-sml {
width: 1.5rem;
} }
.notf-icon { .notf-icon {
position: relative; position: relative;
top: -20px; top: -1.53rem;
width: 20px; width: 1.5rem;
left: 20px; left: 1.5rem;
} }
.notf-indv-box { .notf-indv-box {
width: 100%; width: 100%;
max-height: 400px; max-height: 30.7rem;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
border: thin solid gray; border: thin solid gray;
@@ -676,44 +681,44 @@ p:not(:last-child) {
.vote { .vote {
width: 100%; width: 100%;
border: 1px solid; border: 1px solid;
margin-top: 3px; margin-top: 0.23rem;
padding: 1px; padding: 1px;
border-radius: 3px; border-radius: 0.23rem;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.fa-2x > .emoji-img { .fa-2x > .emoji-img {
width: 36px !important; width: 2.3rem !important;
height: 36px !important; height: 2.3rem !important;
} }
.fa-3x > .emoji-img { .fa-3x > .emoji-img {
width: 54px !important; width: 4.15rem !important;
height: 54px !important; height: 4.15rem !important;
} }
.fa-4x > .emoji-img { .fa-4x > .emoji-img {
width: 72px !important; width: 4.6rem !important;
height: 72px !important; height: 4.6rem !important;
} }
.fa-5x > .emoji-img { .fa-5x > .emoji-img {
width: 90px !important; width: 6.9rem !important;
height: 90px !important; height: 6.9rem !important;
} }
#lists-user { #lists-user {
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
max-height: 200px; max-height: 15.4rem;
} }
.votebtn { .votebtn {
border: 1px solid; border: 1px solid;
color: var(--bg); color: var(--bg);
background-color: var(--beforehover); background-color: var(--beforehover);
cursor: pointer; cursor: pointer;
width: 50px; width: 3.8rem;
padding: 2px; height: 1.7rem;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
margin-top: 5px; margin-top: 0.38rem;
border-radius: 10px; border-radius: 0.75rem;
transition-duration: 0.5s; transition-duration: 0.5s;
} }
.votebtn:hover { .votebtn:hover {
@@ -722,8 +727,8 @@ p:not(:last-child) {
.leadPoll { .leadPoll {
position: absolute; position: absolute;
background-color: var(--box); background-color: var(--box);
height: 20px; height: 1.5rem;
border-radius: 3px; border-radius: 0.23rem;
} }
.lpAnime { .lpAnime {
animation-duration: 1s; animation-duration: 1s;
@@ -740,7 +745,7 @@ p:not(:last-child) {
width: 1.2rem !important; width: 1.2rem !important;
position: relative; position: relative;
top: -1px; top: -1px;
margin-left: 5px !important; margin-left: 0.38rem !important;
} }
.jump { .jump {
display: inline-block; display: inline-block;
@@ -765,6 +770,9 @@ p:not(:last-child) {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.fav_ct, .rt_ct, .rep_ct {
font-size: 1.1rem;
}
.shared.selectedToot { .shared.selectedToot {
background-color: var(--selectedWithShare); background-color: var(--selectedWithShare);
} }
@@ -778,18 +786,18 @@ audio {
white-space: normal; white-space: normal;
} }
.cw_btn { .cw_btn {
margin: 3px; margin: 0.23rem;
background-color: var(--emphasized); background-color: var(--emphasized);
color: var(--color); color: var(--color);
padding-left: 3px; padding-left: 0.23rem;
padding-right: 3px; padding-right: 0.23rem;
border-radius: 3px; border-radius: 0.23rem;
border: 1px solid var(--color); border: 1px solid var(--color);
user-select: none; user-select: none;
} }
.vis-data { .vis-data {
font-size: 1rem !important; font-size: 1rem !important;
margin: 5px; margin: 0.4rem;
user-select: none; user-select: none;
} }
@keyframes jump { @keyframes jump {
@@ -863,29 +871,29 @@ audio {
display: none !important; display: none !important;
} }
.announcement { .announcement {
padding: 5px; padding: 0.38rem;
border-bottom: 1px solid; border-bottom: 1px solid;
} }
.announReaction { .announReaction {
width: 35px; width: 2.7rem;
height: 1.7rem; height: 1.7rem;
font-size: 1.1rem; font-size: 1.1rem;
margin: 3px; margin: 0.23rem;
cursor: pointer; cursor: pointer;
border: solid 1px; border: solid 1px;
padding-left: 2px; padding-left: 0.15rem;
background-color: var(--notfbox); background-color: var(--notfbox);
border-radius: 2px; border-radius: 0.15rem;
} }
.announReaction img { .announReaction img {
position: relative; position: relative;
top: 3px; top: 0.23rem;
} }
.announReaction.reactioned { .announReaction.reactioned {
background-color: var(--emphasized); background-color: var(--emphasized);
} }
.announReaction.add { .announReaction.add {
width: 19px; width: 1.46rem;
} }
.reactionsPack { .reactionsPack {
display: flex; display: flex;

View File

@@ -1,7 +1,7 @@
/*アイコンをクリックした時とかにでてくるユーザーデータ*/ /*アイコンをクリックした時とかにでてくるユーザーデータ*/
#his-data { #his-data {
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: url("../../loading.svg"); background-image: url("../img/loading.svg");
overflow-y: hidden; overflow-y: hidden;
} }
#his-data .btn .material-icons{ #his-data .btn .material-icons{
@@ -16,31 +16,27 @@
} }
#his-prof { #his-prof {
float: left; float: left;
width: 100px; width: 7.7rem;
margin-right: 5px; margin-right: 0.4rem;
} }
.his-float { .his-float {
overflow-y: scroll; overflow-y: scroll;
padding: 5px; padding: 0.4rem;
} }
#his-float-data { #his-float-data {
height: 100%; height: 100%;
overflow-y: hidden; overflow-y: hidden;
} }
#his-leftside { #his-leftside {
width: 500px; width: 38.4rem;
} }
#his-float-timeline { #his-float-timeline {
max-width: 775px; max-width: 59.6rem;
height: 100%; height: 100%;
overflow-y: hidden; overflow-y: hidden;
} }
#his-basic-prof { #his-basic-prof {
min-height: 130px; min-height: 10rem;
}
#his-matching-list {
overflow-y: scroll;
overflow-x: hidden;
} }
#his-field { #his-field {
vertical-align: baseline; vertical-align: baseline;
@@ -55,14 +51,14 @@
padding: 0; padding: 0;
background-color: #757575; background-color: #757575;
text-align: center; text-align: center;
padding: 5px; padding: 0.4rem;
margin-bottom: 1px; margin-bottom: 1px;
width: 30%; width: 30%;
} }
.his-field-content { .his-field-content {
height: 1.5rem; height: 1.5rem;
padding: 0; padding: 0;
padding-left: 5px; padding-left: 0.4rem;
} }
.his-var-content a span.ellipsis:after { .his-var-content a span.ellipsis:after {
content: "..."; content: "...";
@@ -76,13 +72,13 @@
display: inline !important; display: inline !important;
} }
#his-data-show { #his-data-show {
margin: 20px; margin: 1.5rem;
margin-left: 50px; margin-left: 3.8rem;
margin-right: 50px; margin-right: 3.8rem;
background-color: var(--his-data); background-color: var(--his-data);
height: calc(100% - 20px); height: calc(100% - 1.5rem);
margin-bottom: 0; margin-bottom: 0;
padding: 5px; padding: 0.4rem;
} }
#his-data-wrap { #his-data-wrap {
display: flex; display: flex;
@@ -90,39 +86,39 @@
.his-var-content { .his-var-content {
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
height: calc(100% - 45px); height: calc(100% - 3.4rem);
} }
#my-data-nav .btn { #my-data-nav .btn {
width: 140px; width: 10.7rem;
} }
.active-back { .active-back {
background-color: var(--active); background-color: var(--active);
} }
#his-name .emojione, #his-name .emojione,
#his-name .emoji-img { #his-name .emoji-img {
width: 20px; width: 1.538rem;
} }
#his-plus-action .btn { #his-plus-action .btn {
padding-right: 5px; padding-right: 0.4rem;
padding-left: 5px; padding-left: 0.4rem;
} }
.tabs { .tabs {
display: flex; display: flex;
} }
.tabs .tab a { .tabs .tab a {
padding: 8px 12px; padding: 0.6rem 0.9rem;
} }
#his-des { #his-des {
max-height: 250px; max-height: 17.7rem;
overflow-y: scroll; overflow-y: scroll;
} }
#his-sign-action { #his-sign-action {
border: 1px solid; border: 1px solid;
border-radius: 5px; border-radius: 0.4rem;
display: flex; display: flex;
align-items: center; align-items: center;
padding-left: 10px; padding-left: 0.75rem;
padding-right: 10px; padding-right: 0.75rem;
flex-wrap: wrap; flex-wrap: wrap;
} }
#his-sign-action .btn { #his-sign-action .btn {
@@ -133,7 +129,7 @@
cursor: pointer; cursor: pointer;
} }
#his-table{ #his-table{
max-height: 150px; max-height: 11.538rem;
overflow-y: scroll; overflow-y: scroll;
} }
#his-float-blocked { #his-float-blocked {

Binary file not shown.

View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g id="TheDesk">
<g id="back">
<g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
<rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:rgba(255,255,255,0);">
<animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
</rect>
</g>
<rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:rgba(255,255,255,0);">
<animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
</rect>
<g transform="matrix(1.08582,0,0,1,-142.973,0)">
<rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:rgba(255,255,255,0);">
<animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
</rect>
</g>
</g>
<g transform="matrix(1,0,0,0.998821,0,4.65666)" id="gray">
<rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
</g>
<g transform="matrix(0.999978,-5.55112e-17,-2.20005e-08,0.996112,-1237.17,972.039)" id="orange">
<rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);" r="3117.62">
<animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,-583.55" to="-60,1915.71,-583.55" dur="0.5s" repeatCount="1" fill="freeze" />
</rect>
</g>
<g transform="matrix(0.999978,5.55112e-17,-5.55112e-17,0.999978,-1236.96,-1164.58)" id="blue">
<rect x="1915.5" y="1775.41" width="450" height="3105.58" style="fill:rgb(54,76,159);" r="3117.62">
<animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,4881" to="60,1915.71,4881" dur="0.5s" repeatCount="1" fill="freeze" />
</rect>
</g>
<path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgba(0,0,0,0);">
<animate attributeName="fill" begin="0.6s" dur="0.5s" fill="freeze" values="rgba(0,0,0,0);rgba(0,0,0,1)" repeatCount="1" />
</path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -1,39 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
TheDesk icon, Cutls P. <svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. <g id="TheDesk">
--> <g>
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:white;"/>
viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve"> </g>
<style type="text/css"> <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:white;"/>
.st0{display:none;} <g transform="matrix(1.08582,0,0,1,-142.973,0)">
.st1{fill:#FFFFFF;} <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:white;"/>
.st2{fill:#545251;stroke:#040000;stroke-miterlimit:10;} </g>
.st3{fill:#F0842E;} </g>
.st4{fill:#364C9F;} <g transform="matrix(1,0,0,0.998821,0,4.65666)">
.st5{fill:#FFFFFF;stroke:#040000;stroke-miterlimit:10;} <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#040000;} </g>
.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;} <g transform="matrix(0.5,-0.866,0.862652,0.498067,224.046,2340.41)">
</style> <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);"/>
<g id="レイヤー_1" class="st0"> </g>
</g> <g transform="matrix(0.5,0.866,-0.866,0.5,3757.17,-299.625)">
<g id="レイヤー_2"> <rect x="1915.5" y="1555.41" width="450" height="3105.58" style="fill:rgb(54,76,159);"/>
<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 "/> </g>
<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/> <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgb(4,0,0);"/>
<rect x="0" y="0" width="4096" height="4096" style="fill:none;"/>
<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/> </g>
<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
<path class="st5" d="M714.5,2953.5"/>
<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
<rect class="st7" width="4096" height="4096"/>
<path class="st1" d="M-58,1122"/>
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@@ -1,3 +1,4 @@
//@ts-check
//このソフトについて //このソフトについて
function about() { function about() {
postMessage(["sendSinmpleIpc", "about"], "*") postMessage(["sendSinmpleIpc", "about"], "*")

View File

@@ -115,6 +115,13 @@ $(function($) {
return false return false
} }
} }
//Ctrl+K:メニュー開閉
if (event.metaKey || event.ctrlKey) {
if (e.keyCode === 75) {
menu()
return false
}
}
//Ctrl+Space:読み込み //Ctrl+Space:読み込み
if (event.metaKey || event.ctrlKey) { if (event.metaKey || event.ctrlKey) {
if (e.keyCode === 32) { if (e.keyCode === 32) {

View File

@@ -1,8 +1,9 @@
//バージョンチェッカー //バージョンチェッカー
function verck(ver, jp) { function verck(ver, jp) {
console.log('%c Welcome😊', 'color: red;font-size:200%;') console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
$('body').addClass(localStorage.getItem('platform'))
var date = new Date() var date = new Date()
var show = false var showVer = false
if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) { if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
//ちょっと削除とリンク解析の都合上アレ(s) //ちょっと削除とリンク解析の都合上アレ(s)
//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)" //対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
@@ -15,10 +16,10 @@ function verck(ver, jp) {
} }
} }
//ちょっと削除とリンク解析の都合上アレ(e) //ちょっと削除とリンク解析の都合上アレ(e)
show = true showVer = true
console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;') console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
$(document).ready(function() { $(document).ready(function() {
if (localStorage.getItem('winstore')) { if (localStorage.getItem('winstore') && !pwa) {
$('#releasenote').modal('open') $('#releasenote').modal('open')
} }
verp = ver.replace('(', '') verp = ver.replace('(', '')
@@ -37,8 +38,8 @@ function verck(ver, jp) {
}) })
} }
localStorage.setItem('ver', ver) localStorage.setItem('ver', ver)
if (!show) { if (!showVer) {
console.log(show) console.log(showVer)
if ( if (
date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') || date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
!localStorage.getItem('showSupportMe') !localStorage.getItem('showSupportMe')
@@ -68,7 +69,7 @@ function verck(ver, jp) {
} }
var platform = localStorage.getItem('platform') var platform = localStorage.getItem('platform')
console.log('Your platform:' + platform) console.log('Your platform:' + platform)
if (!localStorage.getItem('winstore')) { if (!localStorage.getItem('winstore') && !pwa) {
$('#start').css('display', 'flex') $('#start').css('display', 'flex')
} }
if ( if (
@@ -142,9 +143,10 @@ function verck(ver, jp) {
if (!localStorage.getItem('last-notice-id')) { if (!localStorage.getItem('last-notice-id')) {
localStorage.setItem('last-notice-id', 0) localStorage.setItem('last-notice-id', 0)
} }
var start = 'https://thedesk.top/notice?since_id=' + localStorage.getItem('last-notice-id') var start = 'https://thedesk.top/notice/index.php?since_id=' + localStorage.getItem('last-notice-id')
fetch(start, { fetch(start, {
method: 'GET' method: 'GET',
cors: true
}) })
.then(function(response) { .then(function(response) {
if (!response.ok) { if (!response.ok) {
@@ -172,7 +174,7 @@ function verck(ver, jp) {
} else { } else {
if (obj.type == 'textv2') { if (obj.type == 'textv2') {
if (~obj.languages.indexOf(lang.language)) { if (~obj.languages.indexOf(lang.language)) {
var show = true var showVer = true
if (obj.toot != '') { if (obj.toot != '') {
var toot = var toot =
'<button class="btn-flat toast-action" onclick="detEx(\'' + '<button class="btn-flat toast-action" onclick="detEx(\'' +
@@ -183,25 +185,25 @@ function verck(ver, jp) {
} }
if (obj.ver != '') { if (obj.ver != '') {
if (obj.ver == ver) { if (obj.ver == ver) {
show = true showVer = true
} else { } else {
show = false showVer = false
} }
} }
if (obj.domain != '') { if (obj.domain != '') {
var multi = localStorage.getItem('multi') var multi = localStorage.getItem('multi')
if (multi) { if (multi) {
show = false showVer = false
var accts = JSON.parse(multi) var accts = JSON.parse(multi)
Object.keys(accts).forEach(function(key) { Object.keys(accts).forEach(function(key) {
var acct = accts[key] var acct = accts[key]
if (acct.domain == obj.domain) { if (acct.domain == obj.domain) {
show = true showVer = true
} }
}) })
} }
} }
if (show) { if (showVer) {
M.toast({ M.toast({
html: html:
escapeHTML(obj.text) + escapeHTML(obj.text) +
@@ -231,7 +233,7 @@ function infowebsocket() {
if (obj.type == 'textv2') { if (obj.type == 'textv2') {
if (~obj.languages.indexOf(lang.language)) { if (~obj.languages.indexOf(lang.language)) {
localStorage.setItem('last-notice-id', obj.id) localStorage.setItem('last-notice-id', obj.id)
var show = true var showVer = true
if (obj.toot != '') { if (obj.toot != '') {
var toot = var toot =
'<button class="btn-flat toast-action" onclick="detEx(\'' + '<button class="btn-flat toast-action" onclick="detEx(\'' +
@@ -242,25 +244,25 @@ function infowebsocket() {
} }
if (obj.ver != '') { if (obj.ver != '') {
if (obj.ver == ver) { if (obj.ver == ver) {
show = true showVer = true
} else { } else {
show = false showVer = false
} }
} }
if (obj.domain != '') { if (obj.domain != '') {
var multi = localStorage.getItem('multi') var multi = localStorage.getItem('multi')
if (multi) { if (multi) {
show = false showVer = false
var accts = JSON.parse(multi) var accts = JSON.parse(multi)
Object.keys(accts).forEach(function(key) { Object.keys(accts).forEach(function(key) {
var acct = accts[key] var acct = accts[key]
if (acct.domain == obj.domain) { if (acct.domain == obj.domain) {
show = true showVer = true
} }
}) })
} }
} }
if (show) { if (showVer) {
console.log(obj.text) console.log(obj.text)
console.log(escapeHTML(obj.text)) console.log(escapeHTML(obj.text))
M.toast({ M.toast({
@@ -323,6 +325,7 @@ function closeSupport() {
) )
} }
function storeDialog(platform, ver) { function storeDialog(platform, ver) {
if($('body').hasClass('accessibility')) return false
if (platform == 'win32') { if (platform == 'win32') {
var mes = lang.lang_version_platform var mes = lang.lang_version_platform
} else if (platform == 'linux') { } else if (platform == 'linux') {
@@ -350,7 +353,8 @@ function storeDialog(platform, ver) {
localStorage.setItem('winstore', 'localinstall') localStorage.setItem('winstore', 'localinstall')
} }
localStorage.setItem('ver', ver) localStorage.setItem('ver', ver)
show = true showVer = true
if(pwa) return false
console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;') console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
$(document).ready(function() { $(document).ready(function() {
$('#releasenote').modal('open') $('#releasenote').modal('open')
@@ -371,9 +375,10 @@ function storeDialog(platform, ver) {
}) })
} else { } else {
localStorage.setItem('ver', ver) localStorage.setItem('ver', ver)
show = true showVer = true
console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;') console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
$(document).ready(function() { $(document).ready(function() {
if(pwa) return false
$('#releasenote').modal('open') $('#releasenote').modal('open')
verp = ver.replace('(', '') verp = ver.replace('(', '')
verp = verp.replace('.', '-') verp = verp.replace('.', '-')

View File

@@ -590,9 +590,10 @@ function enc(ver) {
} }
//インスタンスティッカー //インスタンスティッカー
function ticker() { function ticker() {
var start = 'https://toot.app/toot/' var start = 'https://toot.app/toot/index.php'
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
cors: true,
headers: { headers: {
'content-type': 'application/json' 'content-type': 'application/json'
} }

View File

@@ -252,11 +252,31 @@ function multiDel(target) {
var newdom = oldcol.domain var newdom = oldcol.domain
} }
var type = oldcol.type var type = oldcol.type
var data = null
if(oldcol.data) {
data = oldcol.data
}
var background = null
if(oldcol.background) {
background = oldcol.background
}
var text = null
if(oldcol.text) {
text = oldcol.text
}
var left_fold = false
if(oldcol.left_fold) {
left_fold = true
}
//消した垢のコラムじゃないときコピー //消した垢のコラムじゃないときコピー
if (target != oldcol.domain) { if (target != oldcol.domain) {
var add = { var add = {
domain: newdom, domain: newdom,
type: type type: type,
data: data,
background: background,
text: text,
left_fold: left_fold
} }
newcols.push(add) newcols.push(add)
} }

View File

@@ -140,6 +140,7 @@ function nano() {
postMessage(['nano', null], '*') postMessage(['nano', null], '*')
} }
onmessage = function(e) { onmessage = function(e) {
console.log(e)
if (e.data[0] == 'details') { if (e.data[0] == 'details') {
details(e.data[1][0], e.data[1][1]) details(e.data[1][0], e.data[1][1])
} else if (e.data[0] == 'udg') { } else if (e.data[0] == 'udg') {
@@ -149,10 +150,10 @@ onmessage = function(e) {
} else if (e.data[0] == 'post') { } else if (e.data[0] == 'post') {
post('pass') post('pass')
} else if (e.data[0] == 'toastSaved') { } else if (e.data[0] == 'toastSaved') {
var show = `${lang.lang_img_DLDone}${ var showTxt = `${lang.lang_img_DLDone}${
e.data[1][0] e.data[1][0]
}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>` }<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
M.toast({ html: show, displayLength: 5000 }) M.toast({ html: showTxt, displayLength: 5000 })
} else if (e.data[0] == 'parseColumn') { } else if (e.data[0] == 'parseColumn') {
parseColumn(e.data[1]) parseColumn(e.data[1])
} else if (e.data[0] == 'exportSettingsCore') { } else if (e.data[0] == 'exportSettingsCore') {
@@ -186,6 +187,10 @@ onmessage = function(e) {
asRead() asRead()
} else if (e.data[0] == 'asReadEnd') { } else if (e.data[0] == 'asReadEnd') {
asReadEnd() asReadEnd()
} else if (e.data[0] == 'accessibility') {
console.log('atrue')
$('body').addClass('accessibility')
$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
} else if (e.data[0] == 'logData') { } else if (e.data[0] == 'logData') {
$('#logs').val(e.data[1]) $('#logs').val(e.data[1])
var obj = document.getElementById('logs') var obj = document.getElementById('logs')

View File

@@ -1,4 +1,3 @@
document.title = 'TheDesk'
$.strip_tags = function(str, allowed) { $.strip_tags = function(str, allowed) {
if (!str) { if (!str) {
return '' return ''

View File

@@ -4,6 +4,8 @@ var ipc = electron.ipcRenderer
//title bar //title bar
const customTitlebar = require('custom-electron-titlebar') const customTitlebar = require('custom-electron-titlebar')
window.addEventListener('DOMContentLoaded', () => { window.addEventListener('DOMContentLoaded', () => {
document.title = 'TheDesk'
ipc.send('acsCheck', '')
ipc.send('frameCheck', '') ipc.send('frameCheck', '')
ipc.on('frame', function(event, args) { ipc.on('frame', function(event, args) {
const file = location.href.substr(-10) const file = location.href.substr(-10)
@@ -47,7 +49,7 @@ onmessage = function(e) {
} else if (e.data[0] == 'generalDL') { } else if (e.data[0] == 'generalDL') {
ipc.send('general-dl', e.data[1]) ipc.send('general-dl', e.data[1])
} else if (e.data[0] == 'openFinder') { } else if (e.data[0] == 'openFinder') {
ipc.send('open-finder', e.data[1]) ipc.send('openFinder', e.data[1])
} else if (e.data[0] == 'columnDel') { } else if (e.data[0] == 'columnDel') {
ipc.send('column-del', e.data[1]) ipc.send('column-del', e.data[1])
} else if (e.data[0] == 'lang') { } else if (e.data[0] == 'lang') {
@@ -154,12 +156,12 @@ ipc.on('resizeJudgement', function(event, b64) {
var width = element.naturalWidth var width = element.naturalWidth
var height = element.naturalHeight var height = element.naturalHeight
if (width > resize || height > resize) { if (width > resize || height > resize) {
ipc.send('resize-image', [b64, resize]) ipc.send('resize-image', [b64[0], resize])
} else { } else {
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*') postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
} }
} }
element.src = b64 element.src = 'data:image/png;base64,' + b64[0]
} else { } else {
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*') postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
} }
@@ -169,7 +171,7 @@ ipc.on('general-dl-prog', function(event, arg) {
console.log('Progress: ' + 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, '\\\\') + '\\\\.' var argC = arg.replace(/\\/g, '\\\\')
console.log('saved') console.log('saved')
postMessage(['toastSaved', [arg, argC]], '*') postMessage(['toastSaved', [arg, argC]], '*')
}) })
@@ -230,12 +232,16 @@ ipc.on('prog', function(event, arg) {
ipc.on('mess', function(event, arg) { ipc.on('mess', function(event, arg) {
postMessage(['updateMess', arg], '*') postMessage(['updateMess', arg], '*')
}) })
//misc
ipc.on('asRead', function(event, arg) { ipc.on('asRead', function(event, arg) {
postMessage(['asRead', ''], '*') postMessage(['asRead', ''], '*')
}) })
ipc.on('asReadEnd', function(event, arg) { ipc.on('asReadEnd', function(event, arg) {
postMessage(['asReadEnd', ''], '*') postMessage(['asReadEnd', ''], '*')
}) })
ipc.on('accessibility', function(event, arg) {
postMessage(['accessibility', 'true'], '*')
})
var webviewDom = document.getElementById('webview') var webviewDom = document.getElementById('webview')
if (webviewDom) { if (webviewDom) {
webviewDom.addEventListener('new-window', function(e) { webviewDom.addEventListener('new-window', function(e) {

View File

@@ -122,6 +122,10 @@ function post(mode, postvis) {
console.log('This toot will be posted at:' + scheduled) console.log('This toot will be posted at:' + scheduled)
schedule() schedule()
toot.scheduled_at = scheduled toot.scheduled_at = scheduled
if($('#sch-box').hasClass('expire')) {
toot.scheduled_at = null
toot.expires_at = scheduled
}
} else { } else {
var scheduled = '' var scheduled = ''
} }
@@ -195,6 +199,20 @@ function post(mode, postvis) {
} }
} }
} }
function expPostMode() {
$('#sch-box').toggleClass('expire')
if($('#sch-box').hasClass('expire')) {
Swal.fire({
type: 'info',
title: 'Expiring toot On'
})
} else {
Swal.fire({
type: 'info',
title: 'Expireing toot Off'
})
}
}
function misskeyPost() { function misskeyPost() {
var str = $('#textarea').val() var str = $('#textarea').val()
var acct_id = $('#post-acct-sel').val() var acct_id = $('#post-acct-sel').val()

View File

@@ -160,8 +160,14 @@ function bkm(id, acct_id, tlid) {
//フォロー //フォロー
async function follow(acct_id, resolve) { async function follow(acct_id, resolve) {
if($('#his-data').hasClass('locked')) {
locked = true
} else {
locked = false
}
if (!acct_id && acct_id != 'selector') { if (!acct_id && acct_id != 'selector') {
var acct_id = $('#his-data').attr('use-acct') var acct_id = $('#his-data').attr('use-acct')
} else if (acct_id == 'selector') { } else if (acct_id == 'selector') {
var acct_id = $('#user-acct-sel').val() var acct_id = $('#user-acct-sel').val()
} }
@@ -172,6 +178,7 @@ async function follow(acct_id, resolve) {
var flag = 'follow' var flag = 'follow'
var flagm = 'create' var flagm = 'create'
} }
var id = $('#his-data').attr('user-id') var id = $('#his-data').attr('user-id')
if (resolve == 'selector') { if (resolve == 'selector') {
var fullacct = $('#his-acct').attr('fullname') var fullacct = $('#his-acct').attr('fullname')
@@ -205,7 +212,11 @@ async function follow(acct_id, resolve) {
$('#his-follow-btn-text').text(lang.lang_status_follow) $('#his-follow-btn-text').text(lang.lang_status_follow)
} else { } else {
$('#his-data').addClass('following') $('#his-data').addClass('following')
$('#his-follow-btn-text').text(lang.lang_status_unfollow) if(locked) {
$('#his-follow-btn-text').text(lang.lang_status_requesting)
} else {
$('#his-follow-btn-text').text(lang.lang_status_unfollow)
}
} }
} }
} }

View File

@@ -3,7 +3,7 @@
function dirMenu() { function dirMenu() {
$("#dir-contents").html(""); $("#dir-contents").html("");
directory(); directory();
$("#left-menu div").removeClass("active"); $("#left-menu a").removeClass("active");
$("#dirMenu").addClass("active"); $("#dirMenu").addClass("active");
$(".menu-content").addClass("hide"); $(".menu-content").addClass("hide");
$("#dir-box").removeClass("hide"); $("#dir-box").removeClass("hide");

View File

@@ -14,6 +14,46 @@ function mediaToggle(tlid) {
$('#timeline_' + tlid).addClass('media-filter') $('#timeline_' + tlid).addClass('media-filter')
} }
} }
/* Remote only */
function remoteOnly(tlid, type) {
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
if (obj[tlid].data) {
if (obj[tlid].data.remote) {
obj[tlid].data.remote = false
var json = JSON.stringify(obj)
localStorage.setItem('column', json)
$('#sta-remote-' + tlid).text('Off')
$('#sta-remote-' + tlid).css('color', '#009688')
} else {
obj[tlid].data.remote = true
var json = JSON.stringify(obj)
localStorage.setItem('column', json)
$('#sta-remote-' + tlid).text('On')
$('#sta-remote-' + tlid).css('color', 'red')
}
} else {
obj[tlid].data = {}
obj[tlid].data.remote = true
var json = JSON.stringify(obj)
localStorage.setItem('column', json)
$('#sta-remote-' + tlid).text('On')
$('#sta-remote-' + tlid).css('color', 'red')
}
columnReload(tlid, type)
}
function remoteOnlyCk(tlid) {
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
if (obj[tlid].data) {
if (obj[tlid].data.remote) {
$('#sta-remote-' + tlid).text('On')
$('#sta-remote-' + tlid).css('color', 'red')
return true
}
}
return false
}
//各TL上方のBT[BTOnly/BTExc/Off] //各TL上方のBT[BTOnly/BTExc/Off]
function ebtToggle(tlid) { function ebtToggle(tlid) {
var ebt = localStorage.getItem('ebt_' + tlid) var ebt = localStorage.getItem('ebt_' + tlid)
@@ -101,7 +141,7 @@ function delreset(tlid) {
} }
/*ワードフィルター機能*/ /*ワードフィルター機能*/
function filterMenu() { function filterMenu() {
$('#left-menu div').removeClass('active') $('#left-menu a').removeClass('active')
$('#filterMenu').addClass('active') $('#filterMenu').addClass('active')
$('.menu-content').addClass('hide') $('.menu-content').addClass('hide')
$('#filter-box').removeClass('hide') $('#filter-box').removeClass('hide')
@@ -117,26 +157,26 @@ function filter() {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
if (json) { if (json) {
var filters = '' var filters = ''
Object.keys(json).forEach(function(key) { Object.keys(json).forEach(function (key) {
var filterword = json[key] var filterword = json[key]
var context = filterword.context.join(',') var context = filterword.context.join(',')
filters = filters =
@@ -180,6 +220,9 @@ function makeNewFilter() {
if ($('#conv_filter:checked').val()) { if ($('#conv_filter:checked').val()) {
cont.push('thread') cont.push('thread')
} }
if ($('#prof_filter:checked').val()) {
cont.push('profiles')
}
if (!cont.length) { if (!cont.length) {
$('#filtered-words').html('Error:' + lang.lang_filter_errordegree) $('#filtered-words').html('Error:' + lang.lang_filter_errordegree)
} }
@@ -188,10 +231,7 @@ function makeNewFilter() {
if (!who) { if (!who) {
who = false who = false
} }
var time = var time = $('#days_filter').val() * 24 * 60 * 60 + $('#hours_filter').val() * 60 * 60 + $('#mins_filter').val() * 60
$('#days_filter').val() * 24 * 60 * 60 +
$('#hours_filter').val() * 60 * 60 +
$('#mins_filter').val() * 60
var domain = localStorage.getItem('domain_' + acct_id) var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at') var at = localStorage.getItem('acct_' + acct_id + '_at')
if ($('#filter-edit-id').val()) { if ($('#filter-edit-id').val()) {
@@ -213,10 +253,10 @@ function makeNewFilter() {
context: cont, context: cont,
irreversible: exc, irreversible: exc,
whole_word: who, whole_word: who,
expires_in: time expires_in: time,
}) })
) )
httpreq.onreadystatechange = function() { httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@@ -229,6 +269,7 @@ function makeNewFilter() {
$('#local_filter').prop('checked', false) $('#local_filter').prop('checked', false)
$('#notf_filter').prop('checked', false) $('#notf_filter').prop('checked', false)
$('#conv_filter').prop('checked', false) $('#conv_filter').prop('checked', false)
$('#prof_filter').prop('checked', false)
$('#except_filter').prop('checked', false) $('#except_filter').prop('checked', false)
$('#wholeword_filter').prop('checked', false) $('#wholeword_filter').prop('checked', false)
$('#days_filter').val('0') $('#days_filter').val('0')
@@ -259,29 +300,29 @@ function filterEdit(id, acct_id) {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
if (json) { if (json) {
var now = new Date() var now = new Date()
now = now.getTime() now = now.getTime()
var now = Math.floor(now / 1000) var now = Math.floor(now / 1000)
$('#filter-add-word').val(json.phrase) $('#filter-add-word').val(json.phrase)
Object.keys(json.context).forEach(function(key) { Object.keys(json.context).forEach(function (key) {
var context = json.context[key] var context = json.context[key]
$('[value=' + context + ']').prop('checked', true) $('[value=' + context + ']').prop('checked', true)
}) })
@@ -311,7 +352,7 @@ function filterDel(id, acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function() { httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@@ -331,23 +372,23 @@ function getFilter(acct_id) {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
localStorage.setItem('filter_' + acct_id, JSON.stringify(json)) localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
}) })
} else { } else {
@@ -366,13 +407,13 @@ function getFilterType(json, type) {
type = 'notifi' type = 'notifi'
} }
var mutedfilters = [] var mutedfilters = []
Object.keys(json).forEach(function(key) { Object.keys(json).forEach(function (key) {
var filterword = json[key] var filterword = json[key]
var phrases = filterword.phrase var phrases = filterword.phrase
var arr = filterword.context var arr = filterword.context
if (arr.join(',').indexOf(type) !== -1) { if (arr.join(',').indexOf(type) !== -1) {
mutedfilters.push(phrases) mutedfilters.push(phrases)
} else if (type == 'mix'){ } else if (type == 'mix') {
if (arr.indexOf('home') !== -1 || arr.indexOf('public') !== -1) { if (arr.indexOf('home') !== -1 || arr.indexOf('public') !== -1) {
mutedfilters.push(phrases) mutedfilters.push(phrases)
} }
@@ -396,23 +437,23 @@ function filterUpdate(acct_id) {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
localStorage.setItem('filter_' + acct_id, JSON.stringify(json)) localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
filterUpdateInternal(json, 'home') filterUpdateInternal(json, 'home')
filterUpdateInternal(json, 'local') filterUpdateInternal(json, 'local')
@@ -428,13 +469,11 @@ function filterUpdateInternal(json, type) {
home = home.concat(wordmute) home = home.concat(wordmute)
} }
if (home) { if (home) {
$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function(i, elem) { $('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function (i, elem) {
var id = $(elem).attr('toot-id') var id = $(elem).attr('toot-id')
$('[toot-id=' + id + ']').removeClass('hide') $('[toot-id=' + id + ']').removeClass('hide')
var text = $(elem) var text = $(elem).find('.toot').html()
.find('.toot') Object.keys(home).forEach(function (key8) {
.html()
Object.keys(home).forEach(function(key8) {
var word = home[key8] var word = home[key8]
var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g') var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
if ($.strip_tags(text).match(regExp)) { if ($.strip_tags(text).match(regExp)) {

View File

@@ -1,5 +1,5 @@
function listMenu() { function listMenu() {
$('#left-menu div').removeClass('active') $('#left-menu a').removeClass('active')
$('#listMenu').addClass('active') $('#listMenu').addClass('active')
$('.menu-content').addClass('hide') $('.menu-content').addClass('hide')
$('#list-box').removeClass('hide') $('#list-box').removeClass('hide')

View File

@@ -239,8 +239,10 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
localStorage.setItem('lastnotf_' + acct_id, obj.id) localStorage.setItem('lastnotf_' + acct_id, obj.id)
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) { if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
//markers show中はダメ //markers show中はダメ
if (obj.type != 'follow') { if (obj.type != 'follow' && obj.type != 'follow_request') {
templete = parse([obj], 'notf', acct_id, 'notf', popup) templete = parse([obj], 'notf', acct_id, 'notf', popup)
} else if (obj.type == 'follow_request') {
templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
} else { } else {
templete = userparse([obj], obj.type, acct_id, 'notf', popup) templete = userparse([obj], obj.type, acct_id, 'notf', popup)
} }

View File

@@ -241,7 +241,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
noticeavatar = toot.account.avatar_static noticeavatar = toot.account.avatar_static
} }
noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg"> noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}"> <img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}" alt="">
</a>` </a>`
if (toot.type == 'mention') { if (toot.type == 'mention') {
var what = lang.lang_parse_mentioned var what = lang.lang_parse_mentioned
@@ -268,15 +268,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} else { } else {
var notfFilHide = '' var notfFilHide = ''
} }
var noticetext = `<i class="fas fa-filter pointer big-text ${notfFilHide}" var noticetext = `<span onclick="notfFilter('${toot.account.id}','${tlid}');" class=" pointer big-text ${notfFilHide}"><i class="fas fa-filter"
onclick="notfFilter('${toot.account.id}','${tlid}');" title="${lang.lang_parse_notffilter}"> title="${lang.lang_parse_notffilter}">
</i> </i><span class="voice">${lang.lang_parse_notffilter}</span></span>
<span class="cbadge cbadge-hover" title="${date(toot.created_at, 'absolute')}(${ <span class="cbadge cbadge-hover" title="${date(toot.created_at, 'absolute')}(${
lang.lang_parse_notftime lang.lang_parse_notftime
})"> })" aria-hidden="true"><i class="far fa-clock"></i>
<i class="far fa-clock"></i>
${date(toot.created_at, datetype)} ${date(toot.created_at, datetype)}
</span> </span>
<span class="voice">${date(toot.created_at, 'absolute')}(${lang.lang_parse_notftime})</span>
<i class="big-text fas ${icon}"></i> <i class="big-text fas ${icon}"></i>
<a onclick="udg('${toot.account.id}','${acct_id}')" class="pointer grey-text"> <a onclick="udg('${toot.account.id}','${acct_id}')" class="pointer grey-text">
${dis_name}(@${toot.account.acct}) ${dis_name}(@${toot.account.acct})
@@ -393,8 +393,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} else { } else {
noticeavatar = toot.account.avatar_static noticeavatar = toot.account.avatar_static
} }
noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg"> noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg" aria-hidden="true">
<img draggable="false" src="${noticeavatar}" width="20" class="prof-img" <img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img"
user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'"> user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'">
</a>` </a>`
var rebtxt = lang.lang_parse_btedsimple var rebtxt = lang.lang_parse_btedsimple
@@ -518,7 +518,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var spoil = escapeHTML(toot.spoiler_text) var spoil = escapeHTML(toot.spoiler_text)
var spoiler = 'cw cw_hide' var spoiler = 'cw cw_hide'
var api_spoil = 'gray' var api_spoil = 'gray'
var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>` var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}<span class="voice">${lang.lang_parse_cwshow_acc}</span></a><br>`
} else { } else {
if (content) { if (content) {
var ct1 = content.split('</p>').length + content.split('<br />').length - 2 var ct1 = content.split('</p>').length + content.split('<br />').length - 2
@@ -576,7 +576,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} }
if (urls) { if (urls) {
var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer"> var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer" aria-hidden="true">
${lang.lang_parse_url} ${lang.lang_parse_url}
</a><br>` </a><br>`
} else { } else {
@@ -621,7 +621,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
viewer + viewer +
`<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}'-image-${key2}" `<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}'-image-${key2}"
data-url="${url}" data-type="video" class="img-parsed"> data-url="${url}" data-type="video" class="img-parsed">
<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true"> <video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true" alt="attached media">
</a></span>` </a></span>`
} else { } else {
if (media.type == 'unknown') { if (media.type == 'unknown') {
@@ -634,7 +634,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
viewer + viewer +
'<audio src="' + '<audio src="' +
url + url +
'" class="pointer" style="width:100%;" controls></span>' '" class="pointer" style="width:100%;" controls alt="attached media"></span>'
} else { } else {
if (media.description) { if (media.description) {
var desc = media.description var desc = media.description
@@ -652,7 +652,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
id="${id}-image-${key2}" data-url="${url}" data-original="${remote_url}" data-type="${media.type}" id="${id}-image-${key2}" data-url="${url}" data-original="${remote_url}" data-type="${media.type}"
class="img-parsed img-link" style="width:calc(${cwdt}% - 1px); height:${imh};"> class="img-parsed img-link" style="width:calc(${cwdt}% - 1px); height:${imh};">
<img draggable="false" src="${purl}" class="${sense} toot-img pointer" <img draggable="false" src="${purl}" class="${sense} toot-img pointer"
onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}"> onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}" alt="${escapeHTML(desc)}">
${nsfwmes} ${nsfwmes}
</a>` </a>`
} }
@@ -683,7 +683,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
if (toot.account.acct != mention.acct) { if (toot.account.acct != mention.acct) {
mentions = mentions =
mentions + mentions +
`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer">@${mention.acct}</a> ` `<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer" aria-hidden="true">@${mention.acct}</a> `
to_mention.push(mention.acct) to_mention.push(mention.acct)
} }
} }
@@ -724,7 +724,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
)} )}
">Pin</a>${featured}</span> ` ">Pin</a>${featured}</span> `
}) })
tags = '<div style="float:right">' + tags + '</div>' tags = '<div style="float:right" aria-hidden="true">' + tags + '</div>'
} }
//リプ数 //リプ数
if (toot.replies_count || toot.replies_count === 0) { if (toot.replies_count || toot.replies_count === 0) {
@@ -739,29 +739,29 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var vis = '' var vis = ''
var visen = toot.visibility var visen = toot.visibility
if (visen == 'public') { if (visen == 'public') {
var vis = `<i class="text-darken-3 material-icons gray sml vis-data pointer" var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons gray sml vis-data pointer"
title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')"> title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
public public
</i>` </i><span class="voice">${lang.lang_parse_public} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
var can_rt = '' var can_rt = ''
} else if (visen == 'unlisted') { } else if (visen == 'unlisted') {
var vis = `<i class="text-darken-3 material-icons blue-text sml vis-data pointer" var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons blue-text sml vis-data pointer"
title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')"> title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
lock_open lock_open
</i>` </i><span class="voice">${lang.lang_parse_unlisted} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
var can_rt = '' var can_rt = ''
} else if (visen == 'private') { } else if (visen == 'private') {
var vis = `<i class="text-darken-3 material-icons orange-text sml vis-data pointer" var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons orange-text sml vis-data pointer"
title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')"> title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
lock lock
</i>` </i><span class="voice">${lang.lang_parse_private} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
var can_rt = 'unvisible' var can_rt = 'unvisible'
} else if (visen == 'direct') { } else if (visen == 'direct') {
var vis = `<i class="text-darken-3 material-icons red-text sml vis-data pointer" var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons red-text sml vis-data pointer"
title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')"> title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
mail mail
</i>` </i><span class="voice">${lang.lang_parse_direct} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
var can_rt = 'unvisible' var can_rt = 'unvisible'
} }
if (toot.account.acct == localStorage.getItem('user_' + acct_id)) { if (toot.account.acct == localStorage.getItem('user_' + acct_id)) {
@@ -904,7 +904,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var trans = `<div class=""> var trans = `<div class="">
<a onclick="trans('${toot.language}','${lang.language}', $(this))" <a onclick="trans('${toot.language}','${lang.language}', $(this))"
class="waves-effect waves-dark btn-flat actct" style="padding:0"> class="waves-effect waves-dark btn-flat actct" style="padding:0">
<i class="material-icons">g_translate</i>${lang.lang_parse_trans} <i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
</a> </a>
</div>` </div>`
} else { } else {
@@ -929,7 +929,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
for (var i = 0; i < tickerdata.length; i++) { for (var i = 0; i < tickerdata.length; i++) {
var value = tickerdata[i] var value = tickerdata[i]
if (value.domain == thisdomain) { if (value.domain == thisdomain) {
var tickerdom = `<div style="user-select:none;cursor:default;background:linear-gradient(90deg, ${ var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
value.bg value.bg
}, transparent 96%) !important; color:${ }, transparent 96%) !important; color:${
value.text value.text
@@ -950,7 +950,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
if (!quoteUser) { if (!quoteUser) {
quoteUser = toot.quote.account.acct quoteUser = toot.quote.account.acct
} }
poll = if(!toot.quote.quote_muted) {
poll =
poll + poll +
`<div class="quote-renote"> `<div class="quote-renote">
<div class="renote-icon"> <div class="renote-icon">
@@ -974,6 +975,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
</a> </a>
</div> </div>
</div>` </div>`
} else {
poll =
poll +
`<span class="gray sml">${lang.lang_parse_hidden}</span>`
}
} }
//menuは何個 //menuは何個
var menuct = 2 var menuct = 2
@@ -1007,7 +1014,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
<div class="area-icon grid"> <div class="area-icon grid">
<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg"> <a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
<img draggable="false" src="${avatar}" width="40" class="prof-img" <img draggable="false" src="${avatar}" width="40" class="prof-img"
user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'"/> user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'" alt="" />
</a> </a>
${noticeavatar} ${noticeavatar}
</div> </div>
@@ -1021,7 +1028,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
<div class="flex-time"> <div class="flex-time">
<span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy('${toot.url}');" <span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy('${toot.url}');"
title="${date(toot.created_at, 'absolute')}(${lang.lang_parse_clickcopyurl})"> title="${date(toot.created_at, 'absolute')}(${lang.lang_parse_clickcopyurl})">
<i class="far fa-clock"></i>${date(toot.created_at, datetype)} <i class="far fa-clock"></i><span class="voice">posted at </span>${date(toot.created_at, datetype)}
</span> </span>
</div> </div>
</div> </div>
@@ -1056,6 +1063,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
class="waves-effect waves-dark btn-flat actct rep-btn" class="waves-effect waves-dark btn-flat actct rep-btn"
data-men="${to_mention}" data-visen="${visen}" style="padding:0" title="${lang.lang_parse_replyto}"> data-men="${to_mention}" data-visen="${visen}" style="padding:0" title="${lang.lang_parse_replyto}">
<i class="fas fa-share"></i> <i class="fas fa-share"></i>
<span class="voice">${lang.lang_parse_replyto} </span>
<span class="rep_ct">${replyct}</span> <span class="rep_ct">${replyct}</span>
</a> </a>
</div> </div>
@@ -1065,6 +1073,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn" }','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
style="padding:0" title="${lang.lang_parse_bt}"> style="padding:0" title="${lang.lang_parse_bt}">
<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i> <i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
<span class="voice">${lang.lang_parse_bt} </span>
<span class="rt_ct">${toot.reblogs_count}</span> <span class="rt_ct">${toot.reblogs_count}</span>
</a> </a>
</div> </div>
@@ -1072,6 +1081,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
<a onclick="qt('${toot.id}','${acct_id}','${toot.account.acct}','${toot.url}')" <a onclick="qt('${toot.id}','${acct_id}','${toot.account.acct}','${toot.url}')"
class="waves-effect waves-dark btn-flat actct" style="padding:0" title="${lang.lang_parse_quote}"> class="waves-effect waves-dark btn-flat actct" style="padding:0" title="${lang.lang_parse_quote}">
<i class="text-darken-3 fas fa-quote-right"></i> <i class="text-darken-3 fas fa-quote-right"></i>
<span class="voice">${lang.lang_parse_quote} </span>
</a> </a>
</div> </div>
<div class="action ${disp['bkm']} ${noauth} ${bkmClass}"> <div class="action ${disp['bkm']} ${noauth} ${bkmClass}">
@@ -1079,6 +1089,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0" class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0"
title="${lang.lang_parse_bookmark}"> title="${lang.lang_parse_bookmark}">
<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i> <i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
<span class="voice">${lang.lang_parse_bookmark} </span>
</a> </a>
</div> </div>
<div class="action ${disp['fav']} ${noauth}"> <div class="action ${disp['fav']} ${noauth}">
@@ -1087,6 +1098,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
title="${lang.lang_parse_fav}"> title="${lang.lang_parse_fav}">
<i class="fas text-darken-3 fa-star${if_fav} fav_${uniqueid}"></i> <i class="fas text-darken-3 fa-star${if_fav} fav_${uniqueid}"></i>
<span class="fav_ct">${toot.favourites_count}</span> <span class="fav_ct">${toot.favourites_count}</span>
<span class="voice">${lang.lang_parse_fav} </span>
</a> </a>
</div> </div>
</div> </div>
@@ -1094,14 +1106,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
<div class="action ${noauth}"> <div class="action ${noauth}">
<a onclick="toggleAction($(this), ${menuct * 39 + 6})" <a onclick="toggleAction($(this), ${menuct * 39 + 6})"
class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0"> class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0">
<i class="text-darken-3 material-icons act-icon">expand_more</i> <i class="text-darken-3 material-icons act-icon" aria-hidden="true">expand_more</i>
<span class="voice">Other actions</span>
</a> </a>
</div> </div>
<div class="action ${noauth}"> <div class="action ${noauth}">
<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')" <a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0" class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0"
title="${lang.lang_parse_detail}"> title="${lang.lang_parse_detail}">
<i class="text-darken-3 material-icons">menu_open</i></a> <i class="text-darken-3 material-icons" aria-hidden="true">menu_open</i></a>
<span class="voice">${lang.lang_parse_detail}</span>
</div> </div>
</div> </div>
<div class="contextMenu hide z-depth-4"> <div class="contextMenu hide z-depth-4">
@@ -1131,7 +1145,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
<div class="${if_mine}"> <div class="${if_mine}">
<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" <button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
style="padding:0"> style="padding:0">
<i class="material-icons">redo</i>${lang.lang_parse_redraft} <i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
</button> </button>
</div> </div>
${trans} ${trans}
@@ -1185,10 +1199,10 @@ function userparse(obj, auth, acct_id, tlid, popup) {
var locked = '' var locked = ''
} }
if (auth == 'request') { if (auth == 'request') {
var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept"> var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept" aria-hidden="true">
person_add person_add
</i>  </i>
<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject"> <i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject" aria-hidden="true">
person_add_disabled person_add_disabled
</i>` </i>`
} else { } else {
@@ -1279,7 +1293,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
} }
var latest = date(toot.last_status_at, 'relative') var latest = date(toot.last_status_at, 'relative')
if (toot.last_status_at) { if (toot.last_status_at) {
var latesthtml = `<div class="cbadge" style="width:100px;">Last:${latest}</div>` var latesthtml = `<div class="cbadge" style="width:100px;">Last <span class="voice">toot</span>: ${latest}</div>`
} else { } else {
var latesthtml = '' var latesthtml = ''
} }
@@ -1296,6 +1310,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
class="prof-img" class="prof-img"
user="${toot.acct}" user="${toot.acct}"
onerror="this.src='../../img/loading.svg'" onerror="this.src='../../img/loading.svg'"
alt=""
/> />
</a></div> </a></div>
<div class="area-display_name"> <div class="area-display_name">

View File

@@ -3,7 +3,7 @@
function searchMenu() { function searchMenu() {
$('#src-contents').html('') $('#src-contents').html('')
trend() trend()
$('#left-menu div').removeClass('active') $('#left-menu a').removeClass('active')
$('#searchMenu').addClass('active') $('#searchMenu').addClass('active')
$('.menu-content').addClass('hide') $('.menu-content').addClass('hide')
$('#src-box').removeClass('hide') $('#src-box').removeClass('hide')

View File

@@ -198,3 +198,28 @@ function tagFeature(name, acct_id) {
M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 }) M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
}) })
} }
//タグのフィルタ
function addTag(id) {
var columns = JSON.parse(localStorage.getItem('column'))
var column = columns[id]
if(!column.data.name) {
var name = column.data
} else {
var name = column.data.name
}
var col = localStorage.getItem('column')
var o = JSON.parse(col)
var obj = o[id]
obj.data = {
'name': name,
'all': $(`#all_tm-${id}`).val(),
'any': $(`#any_tm-${id}`).val(),
'none': $(`#none_tm-${id}`).val(),
}
o[id] = obj
var json = JSON.stringify(o)
console.log(json)
localStorage.setItem('column',json)
columnReload(id, 'tag')
}

View File

@@ -10,10 +10,18 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
if (tlid == 'add') { if (tlid == 'add') {
console.log('add new column') console.log('add new column')
var newtab = $('.box').length var newtab = $('.box').length
if (type == 'tag') {
data = {
name: data,
any: [],
all: [],
none: [],
}
}
var add = { var add = {
domain: acct_id, domain: acct_id,
type: type, type: type,
data: data data: data,
} }
var multi = localStorage.getItem('column') var multi = localStorage.getItem('column')
var obj = JSON.parse(multi) var obj = JSON.parse(multi)
@@ -35,7 +43,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
if (type == 'mix' && localStorage.getItem('mode_' + domain) != 'misskey') { if (type == 'mix' && localStorage.getItem('mode_' + domain) != 'misskey') {
//Integratedなら飛ばす //Integratedなら飛ばす
$('#notice_' + tlid).text( $('#notice_' + tlid).text(
'Integrated TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')' 'Integrated TL(' +
localStorage.getItem('user_' + acct_id) +
'@' +
domain +
')'
) )
$('#notice_icon_' + tlid).text('merge_type') $('#notice_icon_' + tlid).text('merge_type')
mixtl(acct_id, tlid, 'integrated', delc, voice) mixtl(acct_id, tlid, 'integrated', delc, voice)
@@ -43,7 +55,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
} else if (type == 'plus') { } else if (type == 'plus') {
//Local+なら飛ばす //Local+なら飛ばす
$('#notice_' + tlid).text( $('#notice_' + tlid).text(
'Local+ TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')' 'Local+ TL(' +
localStorage.getItem('user_' + acct_id) +
'@' +
domain +
')'
) )
$('#notice_icon_' + tlid).text('people_outline') $('#notice_icon_' + tlid).text('people_outline')
mixtl(acct_id, tlid, 'plus', delc, voice) mixtl(acct_id, tlid, 'plus', delc, voice)
@@ -52,7 +68,12 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
//通知なら飛ばす //通知なら飛ばす
notf(acct_id, tlid, 'direct') notf(acct_id, tlid, 'direct')
$('#notice_' + tlid).text( $('#notice_' + tlid).text(
cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')' cap(type, data, acct_id) +
'(' +
localStorage.getItem('user_' + acct_id) +
'@' +
domain +
')'
) )
$('#notice_icon_' + tlid).text('notifications') $('#notice_icon_' + tlid).text('notifications')
return return
@@ -60,13 +81,31 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
//ブックマークなら飛ばす //ブックマークなら飛ばす
getBookmark(acct_id, tlid) getBookmark(acct_id, tlid)
$('#notice_' + tlid).text( $('#notice_' + tlid).text(
cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')' cap(type, data, acct_id) +
'(' +
localStorage.getItem('user_' + acct_id) +
'@' +
domain +
')'
) )
$('#notice_icon_' + tlid).text('bookmark') $('#notice_icon_' + tlid).text('bookmark')
return return
} else if (type == 'utl') {
//UTLなら飛ばす
getUtl(acct_id, tlid, data, false)
$('#notice_' + tlid).text(
cap(type, data, acct_id) +
'(' +
localStorage.getItem('user_' + acct_id) +
'@' +
domain +
')'
)
$('#notice_icon_' + tlid).text('person')
return
} else if (type == 'home') { } else if (type == 'home') {
//ホームならお知らせ「も」取りに行く //ホームならお知らせ「も」取りに行く
announ(acct_id, tlid); announ(acct_id, tlid)
} }
localStorage.setItem('now', type) localStorage.setItem('now', type)
todo(cap(type) + ' TL Loading...') todo(cap(type) + ' TL Loading...')
@@ -74,14 +113,19 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
if (type != 'noauth') { if (type != 'noauth') {
var hdr = { var hdr = {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} }
$('#notice_' + tlid).text( $('#notice_' + tlid).text(
cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')' cap(type, data, acct_id) +
'(' +
localStorage.getItem('user_' + acct_id) +
'@' +
domain +
')'
) )
} else { } else {
var hdr = { var hdr = {
'content-type': 'application/json' 'content-type': 'application/json',
} }
domain = acct_id domain = acct_id
$('#notice_' + tlid).text('Glance TL(' + domain + ')') $('#notice_' + tlid).text('Glance TL(' + domain + ')')
@@ -110,11 +154,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
var i = { var i = {
method: method, method: method,
headers: hdr, headers: hdr,
body: JSON.stringify(req) body: JSON.stringify(req),
} }
} else { } else {
var misskey = false var misskey = false
var url = com(type, data) var url = com(type, data, tlid)
if (type == 'tag') { if (type == 'tag') {
var tag = localStorage.getItem('tag-range') var tag = localStorage.getItem('tag-range')
if (tag == 'local') { if (tag == 'local') {
@@ -129,26 +173,26 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
var method = 'GET' var method = 'GET'
var i = { var i = {
method: method, method: method,
headers: hdr headers: hdr,
} }
} }
console.log(['Try to get timeline of ' + tlid, start]) console.log(['Try to get timeline of ' + tlid, start])
fetch(start, i) fetch(start, i)
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
console.log(['Result of getting timeline of ' + tlid, json]) console.log(['Result of getting timeline of ' + tlid, json])
$('#landing_' + tlid).hide() $('#landing_' + tlid).hide()
var mute = getFilterTypeByAcct(acct_id, type) var mute = getFilterTypeByAcct(acct_id, type)
@@ -190,8 +234,13 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
if (localStorage.getItem('mode_' + domain) == 'misskey') { if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true var misskey = true
var key = localStorage.getItem('misskey_wss_' + acct_id) var key = localStorage.getItem('misskey_wss_' + acct_id)
var send = '{"type":"connect","body":{"channel":"' + typePs(type) + '","id":"' + tlid + '"}}' var send =
var mskyset = setInterval(function() { '{"type":"connect","body":{"channel":"' +
typePs(type) +
'","id":"' +
tlid +
'"}}'
var mskyset = setInterval(function () {
if (misskeywsstate[key]) { if (misskeywsstate[key]) {
misskeyws[key].send(send) misskeyws[key].send(send)
clearInterval(mskyset) clearInterval(mskyset)
@@ -207,14 +256,25 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
if (type == 'home') { if (type == 'home') {
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
} else if (type == 'pub') { } else if (type == 'pub') {
var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at var add = ''
if(remoteOnlyCk(tlid)){
add = '&remote=true'
}
var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at + add
} else if (type == 'pub-media') { } else if (type == 'pub-media') {
var start = wss + '/api/v1/streaming/?stream=public:media&access_token=' + at var add = ''
if(remoteOnlyCk(tlid)){
add = '&remote=true'
}var start =
wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add
} else if (type == 'local') { } else if (type == 'local') {
var start = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at var start =
wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
} else if (type == 'local-media') { } else if (type == 'local-media') {
var start = var start =
wss + '/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' + at wss +
'/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' +
at
} else if (type == 'tag') { } else if (type == 'tag') {
if (type == 'tag') { if (type == 'tag') {
var tag = localStorage.getItem('tag-range') var tag = localStorage.getItem('tag-range')
@@ -222,28 +282,38 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
data = data + '&local=true' data = data + '&local=true'
} }
} }
var start = wss + '/api/v1/streaming/?stream=hashtag&tag=' + data + '&access_token=' + at var start =
wss +
'/api/v1/streaming/?stream=hashtag&tag=' +
data +
'&access_token=' +
at
} else if (type == 'noauth') { } else if (type == 'noauth') {
var start = 'wss://' + acct_id + '/api/v1/streaming/?stream=public:local' var start = 'wss://' + acct_id + '/api/v1/streaming/?stream=public:local'
} else if (type == 'list') { } else if (type == 'list') {
var start = wss + '/api/v1/streaming/?stream=list&list=' + data + '&access_token=' + at var start =
wss +
'/api/v1/streaming/?stream=list&list=' +
data +
'&access_token=' +
at
} else if (type == 'dm') { } else if (type == 'dm') {
var start = wss + '/api/v1/streaming/?stream=direct&access_token=' + at var start = wss + '/api/v1/streaming/?stream=direct&access_token=' + at
} }
var wsid = websocket.length var wsid = websocket.length
localStorage.setItem('wss_' + tlid, wsid) localStorage.setItem('wss_' + tlid, wsid)
websocket[wsid] = new WebSocket(start) websocket[wsid] = new WebSocket(start)
websocket[wsid].onopen = function(mess) { websocket[wsid].onopen = function (mess) {
console.table({ console.table({
tlid: tlid, tlid: tlid,
type: 'Connect Streaming API' + type, type: 'Connect Streaming API' + type,
domain: domain, domain: domain,
message: [mess] message: [mess],
}) })
errorct = 0 errorct = 0
$('#notice_icon_' + tlid).removeClass('red-text') $('#notice_icon_' + tlid).removeClass('red-text')
} }
websocket[wsid].onmessage = function(mess) { websocket[wsid].onmessage = function (mess) {
console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)]) console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)])
if (misskey) { if (misskey) {
if (JSON.parse(mess.data).type == 'note') { if (JSON.parse(mess.data).type == 'note') {
@@ -254,7 +324,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
websocketNotf[acct_id].send( websocketNotf[acct_id].send(
JSON.stringify({ JSON.stringify({
type: 'capture', type: 'capture',
id: obj.id id: obj.id,
}) })
) )
var templete = misskeyParse([obj], type, acct_id, tlid, '', mute) var templete = misskeyParse([obj], type, acct_id, tlid, '', mute)
@@ -273,26 +343,40 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
if (typeA == 'delete') { if (typeA == 'delete') {
var obj = JSON.parse(mess.data).payload var obj = JSON.parse(mess.data).payload
if (delc == 'true') { if (delc == 'true') {
$('#timeline_' + tlid + ' [unique-id=' + JSON.parse(mess.data).payload + ']').addClass( $(
'emphasized' '#timeline_' +
) tlid +
$('#timeline_' + tlid + ' [unique-id=' + JSON.parse(mess.data).payload + ']').addClass( ' [unique-id=' +
'by_delcatch' JSON.parse(mess.data).payload +
) ']'
).addClass('emphasized')
$(
'#timeline_' +
tlid +
' [unique-id=' +
JSON.parse(mess.data).payload +
']'
).addClass('by_delcatch')
} else { } else {
$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide() $('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove() $('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
} }
} else if (typeA == 'update' || typeA == 'conversation') { } else if (typeA == 'update' || typeA == 'conversation') {
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) { if (
!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')
) {
//markers show中はダメ //markers show中はダメ
var obj = JSON.parse(JSON.parse(mess.data).payload) var obj = JSON.parse(JSON.parse(mess.data).payload)
if ($('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1) { if (
$('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1
) {
if (voice) { if (voice) {
say(obj.content) say(obj.content)
} }
var templete = parse([obj], type, acct_id, tlid, '', mute, type) var templete = parse([obj], type, acct_id, tlid, '', mute, type)
if ($('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0) { if (
$('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0
) {
$('#timeline_' + tlid).prepend(templete) $('#timeline_' + tlid).prepend(templete)
} else { } else {
var pool = localStorage.getItem('pool_' + tlid) var pool = localStorage.getItem('pool_' + tlid)
@@ -319,7 +403,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
} }
} }
} }
websocket[wsid].onerror = function(error) { websocket[wsid].onerror = function (error) {
console.error('Error closing') console.error('Error closing')
console.error(error) console.error(error)
if (mode == 'error') { if (mode == 'error') {
@@ -334,7 +418,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
} }
return false return false
} }
websocket[wsid].onclose = function() { websocket[wsid].onclose = function () {
console.warn('Closing ' + tlid) console.warn('Closing ' + tlid)
if (mode == 'error') { if (mode == 'error') {
$('#notice_icon_' + tlid).addClass('red-text') $('#notice_icon_' + tlid).addClass('red-text')
@@ -376,13 +460,17 @@ function moreload(type, tlid) {
if (sid && !moreloading) { if (sid && !moreloading) {
if ( if (
type == 'mix' && type == 'mix' &&
localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey' localStorage.getItem(
'mode_' + localStorage.getItem('domain_' + acct_id)
) != 'misskey'
) { ) {
mixmore(tlid, 'integrated') mixmore(tlid, 'integrated')
return return
} else if ( } else if (
type == 'plus' && type == 'plus' &&
localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey' localStorage.getItem(
'mode_' + localStorage.getItem('domain_' + acct_id)
) != 'misskey'
) { ) {
mixmore(tlid, 'plus') mixmore(tlid, 'plus')
return return
@@ -396,6 +484,10 @@ function moreload(type, tlid) {
} else if (type == 'bookmark') { } else if (type == 'bookmark') {
getBookmark(acct_id, tlid, true) getBookmark(acct_id, tlid, true)
return return
} else if (type == 'utl') {
var data = obj[tlid].data
getUtl(acct_id, tlid, data, true)
return
} }
moreloading = true moreloading = true
localStorage.setItem('now', type) localStorage.setItem('now', type)
@@ -404,19 +496,19 @@ function moreload(type, tlid) {
var at = localStorage.getItem('acct_' + acct_id + '_at') var at = localStorage.getItem('acct_' + acct_id + '_at')
var hdr = { var hdr = {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} }
var domain = localStorage.getItem('domain_' + acct_id) var domain = localStorage.getItem('domain_' + acct_id)
} else { } else {
var hdr = { var hdr = {
'content-type': 'application/json' 'content-type': 'application/json',
} }
domain = acct_id domain = acct_id
} }
if (localStorage.getItem('mode_' + domain) == 'misskey') { if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true var misskey = true
hdr = { hdr = {
'content-type': 'application/json' 'content-type': 'application/json',
} }
var url = misskeycom(type, data) var url = misskeycom(type, data)
var start = 'https://' + domain + '/api/notes/' + url var start = 'https://' + domain + '/api/notes/' + url
@@ -439,35 +531,42 @@ function moreload(type, tlid) {
var i = { var i = {
method: method, method: method,
headers: hdr, headers: hdr,
body: JSON.stringify(req) body: JSON.stringify(req),
} }
} else { } else {
var misskey = false var misskey = false
var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'max_id=' + sid var start =
'https://' +
domain +
'/api/v1/timelines/' +
com(type, data, tlid) +
'max_id=' +
sid
if (type == 'dm') { if (type == 'dm') {
var start = 'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid var start =
'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
} }
var method = 'GET' var method = 'GET'
var i = { var i = {
method: method, method: method,
headers: hdr headers: hdr,
} }
} }
fetch(start, i) fetch(start, i)
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
var mute = getFilterTypeByAcct(acct_id, type) var mute = getFilterTypeByAcct(acct_id, type)
if (misskey) { if (misskey) {
var templete = misskeyParse(json, '', acct_id, tlid, '', mute) var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -508,12 +607,16 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
if (sid && !moreloading) { if (sid && !moreloading) {
if ( if (
type == 'mix' && type == 'mix' &&
localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey' localStorage.getItem(
'mode_' + localStorage.getItem('domain_' + acct_id)
) != 'misskey'
) { ) {
return return
} else if ( } else if (
type == 'plus' && type == 'plus' &&
localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey' localStorage.getItem(
'mode_' + localStorage.getItem('domain_' + acct_id)
) != 'misskey'
) { ) {
return return
} else if (type == 'notf') { } else if (type == 'notf') {
@@ -526,19 +629,19 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
var at = localStorage.getItem('acct_' + acct_id + '_at') var at = localStorage.getItem('acct_' + acct_id + '_at')
var hdr = { var hdr = {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} }
var domain = localStorage.getItem('domain_' + acct_id) var domain = localStorage.getItem('domain_' + acct_id)
} else { } else {
var hdr = { var hdr = {
'content-type': 'application/json' 'content-type': 'application/json',
} }
domain = acct_id domain = acct_id
} }
if (localStorage.getItem('mode_' + domain) == 'misskey') { if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true var misskey = true
hdr = { hdr = {
'content-type': 'application/json' 'content-type': 'application/json',
} }
var url = misskeycom(type, data) var url = misskeycom(type, data)
var start = 'https://' + domain + '/api/notes/' + url var start = 'https://' + domain + '/api/notes/' + url
@@ -561,36 +664,43 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
var i = { var i = {
method: method, method: method,
headers: hdr, headers: hdr,
body: JSON.stringify(req) body: JSON.stringify(req),
} }
} else { } else {
var misskey = false var misskey = false
var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'since_id=' + sid var start =
'https://' +
domain +
'/api/v1/timelines/' +
com(type, data, tlid) +
'since_id=' +
sid
if (type == 'dm') { if (type == 'dm') {
var start = 'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid var start =
'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
} }
var method = 'GET' var method = 'GET'
var i = { var i = {
method: method, method: method,
headers: hdr headers: hdr,
} }
} }
fetch(start, i) fetch(start, i)
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
console.log(['Result diff of TL' + tlid, json]) console.log(['Result diff of TL' + tlid, json])
if (misskey) { if (misskey) {
var templete = misskeyParse(json, '', acct_id, tlid, '', mute) var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -612,7 +722,7 @@ function reloadTL(type, data, acct_id, key, delc, voice) {
//WebSocket切断 //WebSocket切断
function tlCloser() { function tlCloser() {
Object.keys(websocket).forEach(function(tlid) { Object.keys(websocket).forEach(function (tlid) {
if (websocketOld[tlid]) { if (websocketOld[tlid]) {
websocketOld[tlid].close() websocketOld[tlid].close()
console.log('%c Close Streaming API: Old' + tlid, 'color:blue') console.log('%c Close Streaming API: Old' + tlid, 'color:blue')
@@ -624,27 +734,30 @@ function tlCloser() {
} }
}) })
websocket = [] websocket = []
Object.keys(wsHome).forEach(function(tlid) { Object.keys(wsHome).forEach(function (tlid) {
if (wsHome[tlid]) { if (wsHome[tlid]) {
wsHome[tlid].close() wsHome[tlid].close()
console.log('%c Close Streaming API:Integrated Home' + tlid, 'color:blue') console.log('%c Close Streaming API:Integrated Home' + tlid, 'color:blue')
} }
}) })
wsHome = [] wsHome = []
Object.keys(wsLocal).forEach(function(tlid) { Object.keys(wsLocal).forEach(function (tlid) {
if (wsLocal[tlid]) { if (wsLocal[tlid]) {
wsLocal[tlid].close() wsLocal[tlid].close()
console.log('%c Close Streaming API:Integrated Local' + tlid, 'color:blue') console.log(
'%c Close Streaming API:Integrated Local' + tlid,
'color:blue'
)
} }
}) })
wsLocal = [] wsLocal = []
Object.keys(websocketNotf).forEach(function(tlid) { Object.keys(websocketNotf).forEach(function (tlid) {
if (websocketNotf[tlid]) { if (websocketNotf[tlid]) {
websocketNotf[tlid].close() websocketNotf[tlid].close()
console.log('%c Close Streaming API:Notf' + tlid, 'color:blue') console.log('%c Close Streaming API:Notf' + tlid, 'color:blue')
} }
}) })
Object.keys(misskeyws).forEach(function(tlid) { Object.keys(misskeyws).forEach(function (tlid) {
if (misskeyws[tlid]) { if (misskeyws[tlid]) {
misskeyws[tlid].close() misskeyws[tlid].close()
console.log('%c Close Streaming API:Misskey' + tlid, 'color:blue') console.log('%c Close Streaming API:Misskey' + tlid, 'color:blue')
@@ -674,7 +787,11 @@ function cap(type, data, acct_id) {
} }
} else if (type == 'local-media') { } else if (type == 'local-media') {
if (localStorage.getItem('local_' + acct_id) && !locale) { if (localStorage.getItem('local_' + acct_id) && !locale) {
var response = localStorage.getItem('local_' + acct_id) + '(' + lang.lang_tl_media + ')' var response =
localStorage.getItem('local_' + acct_id) +
'(' +
lang.lang_tl_media +
')'
} else { } else {
var response = 'Local TL(Media)' var response = 'Local TL(Media)'
} }
@@ -686,12 +803,22 @@ function cap(type, data, acct_id) {
} }
} else if (type == 'pub-media') { } else if (type == 'pub-media') {
if (localStorage.getItem('public_' + acct_id) && !locale) { if (localStorage.getItem('public_' + acct_id) && !locale) {
var response = localStorage.getItem('public_' + acct_id) + '(' + lang.lang_tl_media + ')' var response =
localStorage.getItem('public_' + acct_id) +
'(' +
lang.lang_tl_media +
')'
} else { } else {
var response = 'Federated TL(Media)' var response = 'Federated TL(Media)'
} }
} else if (type == 'tag') { } else if (type == 'tag') {
var response = '#' + escapeHTML(data) if (data) {
if (data.name) {
var response = '#' + escapeHTML(data.name)
} else {
var response = '#' + escapeHTML(data)
}
}
} else if (type == 'list') { } else if (type == 'list') {
var ltitle = localStorage.getItem('list_' + data + '_' + acct_id) var ltitle = localStorage.getItem('list_' + data + '_' + acct_id)
var response = 'List(' + ltitle + ')' var response = 'List(' + ltitle + ')'
@@ -706,7 +833,11 @@ function cap(type, data, acct_id) {
} else if (type == 'dm') { } else if (type == 'dm') {
var response = 'DM' var response = 'DM'
} else if (type == 'mix') { } else if (type == 'mix') {
if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) == 'misskey') { if (
localStorage.getItem(
'mode_' + localStorage.getItem('domain_' + acct_id)
) == 'misskey'
) {
var response = 'Social TL' var response = 'Social TL'
} else { } else {
var response = 'Integrated' var response = 'Integrated'
@@ -719,12 +850,14 @@ function cap(type, data, acct_id) {
var response = 'tootsearch(' + escapeHTML(data) + ')' var response = 'tootsearch(' + escapeHTML(data) + ')'
} else if (type == 'bookmark') { } else if (type == 'bookmark') {
var response = 'Bookmarks' var response = 'Bookmarks'
} else if (type == 'utl') {
var response = 'User TL(' + escapeHTML(data.acct) + ')'
} }
return response return response
} }
//TLのURL //TLのURL
function com(type, data) { function com(type, data, tlid) {
if (type == 'home') { if (type == 'home') {
return 'home?' return 'home?'
} else if (type == 'local' || type == 'noauth') { } else if (type == 'local' || type == 'noauth') {
@@ -732,11 +865,33 @@ function com(type, data) {
} else if (type == 'local-media') { } else if (type == 'local-media') {
return 'public?local=true&only_media=true&' return 'public?local=true&only_media=true&'
} else if (type == 'pub') { } else if (type == 'pub') {
return 'public?' var add = ''
if(remoteOnlyCk(tlid)){
add = 'remote=true&'
}
return 'public?' + add
} else if (type == 'pub-media') { } else if (type == 'pub-media') {
return 'public?only_media=true&' var add = ''
if(remoteOnlyCk(tlid)){
add = 'remote=true&'
}
return 'public?only_media=true&' + add
} else if (type == 'tag') { } else if (type == 'tag') {
return 'tag/' + data + '?' if (data.name) {
var name = data.name
var all = data.all
var any = data.any
var none = data.none
} else {
var name = data
var all = ''
var any = ''
var none = ''
}
return `tag/${name}?${buildQuery('all', all)}${buildQuery(
'any',
any
)}${buildQuery('none', none)}`.slice(0, -1)
} else if (type == 'list') { } else if (type == 'list') {
return 'list/' + data + '?' return 'list/' + data + '?'
} else if (type == 'dm') { } else if (type == 'dm') {
@@ -897,37 +1052,50 @@ function getMarker(tlid, type, acct_id) {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing) $('#unread_' + tlid).attr(
'title',
lang.lang_layout_unread + ':' + lang.lang_nothing
)
$('#unread_' + tlid).attr('data-id', '') $('#unread_' + tlid).attr('data-id', '')
return false return false
}) })
.then(function(json) { .then(function (json) {
if (json) { if (json) {
if (json[add]) { if (json[add]) {
json = json[add] json = json[add]
$('#unread_' + tlid).attr( $('#unread_' + tlid).attr(
'title', 'title',
lang.lang_layout_unread + ':' + json.updated_at + ' v' + json.version lang.lang_layout_unread +
':' +
json.updated_at +
' v' +
json.version
) )
$('#unread_' + tlid).attr('data-id', json.last_read_id) $('#unread_' + tlid).attr('data-id', json.last_read_id)
} else { } else {
$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing) $('#unread_' + tlid).attr(
'title',
lang.lang_layout_unread + ':' + lang.lang_nothing
)
$('#unread_' + tlid).attr('data-id', '') $('#unread_' + tlid).attr('data-id', '')
} }
} else { } else {
$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing) $('#unread_' + tlid).attr(
'title',
lang.lang_layout_unread + ':' + lang.lang_nothing
)
$('#unread_' + tlid).attr('data-id', '') $('#unread_' + tlid).attr('data-id', '')
} }
}) })
@@ -951,23 +1119,23 @@ function showUnread(tlid, type, acct_id) {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
if (!json || !json.length) { if (!json || !json.length) {
columnReload(tlid, type) columnReload(tlid, type)
} }
@@ -1007,23 +1175,23 @@ function ueload(tlid) {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
if (!json) { if (!json) {
columnReload(tlid, type) columnReload(tlid, type)
} }
@@ -1062,15 +1230,15 @@ function asRead(callback) {
var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('unique-id') var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('unique-id')
var poster = { var poster = {
home: { home: {
last_read_id: id last_read_id: id,
} },
} }
} else { } else {
var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('data-notf') var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('data-notf')
var poster = { var poster = {
notifications: { notifications: {
last_read_id: id last_read_id: id,
} },
} }
} }
@@ -1083,7 +1251,7 @@ function asRead(callback) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send(JSON.stringify(poster)) httpreq.send(JSON.stringify(poster))
httpreq.onreadystatechange = function() { httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@@ -1117,8 +1285,8 @@ function asReadEnd() {
onBeforeOpen: () => { onBeforeOpen: () => {
Swal.showLoading() Swal.showLoading()
}, },
onClose: () => {} onClose: () => {},
}).then(result => {}) }).then((result) => {})
} else { } else {
postMessage(['asReadComp', ''], '*') postMessage(['asReadComp', ''], '*')
} }
@@ -1144,7 +1312,7 @@ function getBookmark(acct_id, tlid, more) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function() { httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@@ -1159,7 +1327,52 @@ function getBookmark(acct_id, tlid, more) {
} }
} }
var templete = parse(json, 'bookmark', acct_id, tlid, -1, null) var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>' templete =
templete +
'<div class="hide notif-marker" data-maxid="' +
max_id +
'"></div>'
if (more) {
$('#timeline_' + tlid).append(templete)
} else {
$('#timeline_' + tlid).html(templete)
}
$('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
moreloading = false
todc()
}
}
}
function getUtl(acct_id, tlid, data, more) {
moreloading = true
if (more) {
var sid = $('#timeline_' + tlid + ' .cvo')
.last()
.attr('unique-id')
var ad = '?max_id=' + sid
} else {
var ad = ''
}
var at = localStorage.getItem('acct_' + acct_id + '_at')
var domain = localStorage.getItem('domain_' + acct_id)
var start = "https://" + domain + "/api/v1/accounts/" + data.id + "/statuses" + ad
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) {
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
templete =
templete
if (more) { if (more) {
$('#timeline_' + tlid).append(templete) $('#timeline_' + tlid).append(templete)
} else { } else {
@@ -1183,7 +1396,7 @@ function announ(acct_id, tlid) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function() { httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@@ -1198,7 +1411,7 @@ function announ(acct_id, tlid) {
} }
ct++ ct++
} }
if(ct > 0) { if (ct > 0) {
$('.notf-announ_' + acct_id + '_ct').text(ct) $('.notf-announ_' + acct_id + '_ct').text(ct)
} }
} else { } else {
@@ -1210,4 +1423,14 @@ function announ(acct_id, tlid) {
todc() todc()
} }
} }
} }
//buildQuery
function buildQuery(name, data) {
if(!data || data == '') return ''
var arr = data.split(',')
var str = ''
for (var i = 0; i < arr.length; i++) {
str = str + `${name}[]=${arr[i]}&`
}
return str
}

View File

@@ -8,13 +8,13 @@ var websocketNotf = []
//カラム追加ボックストグル //カラム追加ボックストグル
function addColumnMenu() { function addColumnMenu() {
$('#left-menu div').removeClass('active') $('#left-menu a').removeClass('active')
$('#addColumnMenu').addClass('active') $('#addColumnMenu').addClass('active')
$('.menu-content').addClass('hide') $('.menu-content').addClass('hide')
$('#add-box').removeClass('hide') $('#add-box').removeClass('hide')
addselCk() addselCk()
} }
$('.type').click(function() { $('.type').click(function () {
$('.type').removeClass('active') $('.type').removeClass('active')
$(this).addClass('active') $(this).addClass('active')
$('#type-sel').val($(this).attr('data-type')) $('#type-sel').val($(this).attr('data-type'))
@@ -44,7 +44,7 @@ function parseColumn(target, dontclose) {
var obj = JSON.parse(multi) var obj = JSON.parse(multi)
var templete var templete
Object.keys(obj).forEach(function(key) { Object.keys(obj).forEach(function (key) {
var acct = obj[key] var acct = obj[key]
localStorage.setItem('name_' + key, acct.name) localStorage.setItem('name_' + key, acct.name)
@@ -76,8 +76,8 @@ function parseColumn(target, dontclose) {
var obj = [ var obj = [
{ {
domain: 0, domain: 0,
type: 'local' type: 'local',
} },
] ]
var json = JSON.stringify(obj) var json = JSON.stringify(obj)
localStorage.setItem('column', json) localStorage.setItem('column', json)
@@ -122,10 +122,7 @@ function parseColumn(target, dontclose) {
var if_notf = '' var if_notf = ''
} }
if (localStorage.getItem('notification_' + acct.domain)) { if (localStorage.getItem('notification_' + acct.domain)) {
var unique_notf = lang.lang_layout_thisacct.replace( var unique_notf = lang.lang_layout_thisacct.replace('{{notf}}', localStorage.getItem('notification_' + acct.domain))
'{{notf}}',
localStorage.getItem('notification_' + acct.domain)
)
} else { } else {
if (lang.language == 'ja') { if (lang.language == 'ja') {
var notflocale = '通知' var notflocale = '通知'
@@ -191,17 +188,7 @@ function parseColumn(target, dontclose) {
} else { } else {
var animecss = '' var animecss = ''
} }
unstreamingTL( unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.data)
acct.type,
key,
basekey,
insert,
icnsert,
acct.left_fold,
css,
animecss,
acct.data
)
} else if (acct.type == 'bookmark') { } else if (acct.type == 'bookmark') {
if (!acct.left_fold) { if (!acct.left_fold) {
basekey = key basekey = key
@@ -213,17 +200,19 @@ function parseColumn(target, dontclose) {
} else { } else {
var animecss = '' var animecss = ''
} }
unstreamingTL( unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.domain)
acct.type, } else if (acct.type == 'utl') {
key, if (!acct.left_fold) {
basekey, basekey = key
insert, }
icnsert,
acct.left_fold, var anime = localStorage.getItem('animation')
css, if (anime == 'yes' || !anime) {
animecss, var animecss = 'box-anime'
acct.domain } else {
) var animecss = ''
}
unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, { acct: acct.domain, data: acct.data })
} else { } else {
var anime = localStorage.getItem('animation') var anime = localStorage.getItem('animation')
if (anime == 'yes' || !anime) { if (anime == 'yes' || !anime) {
@@ -292,16 +281,33 @@ function parseColumn(target, dontclose) {
${lang.lang_layout_excludingbt} ${lang.lang_layout_excludingbt}
<br>` <br>`
} else if (acct.type == 'tag') { } else if (acct.type == 'tag') {
if (acct.data.name) {
var name = acct.data.name
var all = acct.data.all
var any = acct.data.any
var none = acct.data.none
} else {
var name = acct.data
var all = ''
var any = ''
var none = ''
}
if_tag = `<div class="column-hide notf-indv-box" id="tag-box_${key}" style="padding:5px;"> if_tag = `<div class="column-hide notf-indv-box" id="tag-box_${key}" style="padding:5px;">
Base: ${acct.data}<br> Base: ${name}<br>
<div id="tagManager-${key}"></div> <div id="tagManager-${key}">
<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Add</button> all: <input type="text" id="all_tm-${key}"" value="${all}">
any: <input type="text" id="any_tm-${key}" value="${any}">
none: <input type="text" id="none_tm-${key}"" value="${none}">
</div>
<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Refresh</button>
</div>` </div>`
if_tag_btn = `<a onclick="setToggleTag('${key}')" class="setting nex" if_tag_btn = `<a onclick="setToggleTag('${key}')" class="setting nex"
title="${lang.lang_layout_tagManager}" style="width:30px"> title="${lang.lang_layout_tagManager}" style="width:30px">
<i class="material-icons waves-effect nex">note_add</i> <i class="material-icons waves-effect nex">note_add</i>
</a>` </a>`
unread = '' unread = ''
var exclude = ''
var if_notf = 'hide'
} else { } else {
var exclude = '' var exclude = ''
unread = '' unread = ''
@@ -335,9 +341,7 @@ function parseColumn(target, dontclose) {
if (key === 0) { if (key === 0) {
left_hold = '' left_hold = ''
} }
if ( if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct.domain)) == 'misskey') {
localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct.domain)) == 'misskey'
) {
var isMisRed = '' var isMisRed = ''
exclude = '' exclude = ''
var if_misskey_hide = 'hide' var if_misskey_hide = 'hide'
@@ -350,6 +354,18 @@ function parseColumn(target, dontclose) {
} else { } else {
var addHeight = '' var addHeight = ''
} }
if (acct.type != 'pub' && acct.type != 'pub-media') {
console.log(acct.type, key)
var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex">
<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
<span id="sta-media-${key}">On</span>
</a>${lang.lang_layout_mediafil}`
} else {
var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex">
<i class="material-icons waves-effect nex" title="${lang.lang_layout_remoteOnly}">perm_media</i>
<span id="sta-remote-${key}">Off</span>
</a>${lang.lang_layout_remoteOnly}`
}
var html = ` var html = `
<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}" data-acct="${acct.domain}" style="${addHeight}"> <div class="boxIn" id="timeline_box_${key}_box" tlid="${key}" data-acct="${acct.domain}" style="${addHeight}">
<div class="notice-box z-depth-2" id="menu_${key}" style="${insert}"> <div class="notice-box z-depth-2" id="menu_${key}" style="${insert}">
@@ -357,7 +373,7 @@ function parseColumn(target, dontclose) {
<i class="material-icons waves-effect ${isMisRed}" id="notice_icon_${key}" ${notf_attr} <i class="material-icons waves-effect ${isMisRed}" id="notice_icon_${key}" ${notf_attr}
style="font-size:40px; padding-top:25%;" style="font-size:40px; padding-top:25%;"
onclick="checkStr('${acct.type}','${data}','${acct.domain}', '${key}', '${delc}','${voice}',null)" onclick="checkStr('${acct.type}','${data}','${acct.domain}', '${key}', '${delc}','${voice}',null)"
title="${lang.lang_layout_gotop}"> title="${lang.lang_layout_gotop}" aria-hidden="true">
</i> </i>
</div> </div>
<div class="area-notice_name"> <div class="area-notice_name">
@@ -366,29 +382,33 @@ function parseColumn(target, dontclose) {
<div class="area-a1"> <div class="area-a1">
<a onclick="notfToggle('${acct.domain}','${key}')" class="setting nex ${if_notf}" <a onclick="notfToggle('${acct.domain}','${key}')" class="setting nex ${if_notf}"
title="${unique_notf}" ${icnsert}> title="${unique_notf}" ${icnsert}>
<i class="material-icons waves-effect nex notf-icon_${acct.domain}">notifications</i> <i class="material-icons waves-effect nex notf-icon_${acct.domain}" aria-hidden="true">notifications</i>
<span class="voice">${unique_notf}</span>
</a> </a>
<span class="cbadge hide notf-announ_${acct.domain}" style="margin-right:0" <span class="cbadge hide notf-announ_${acct.domain}" style="margin-right:0"
onclick="notfToggle('${acct.domain}','${key}')" title="${lang.lang_layout_announ}"> onclick="notfToggle('${acct.domain}','${key}')" title="${lang.lang_layout_announ}">
<i class="fas fa-bullhorn"></i> <i class="fas fa-bullhorn"></i>
<span class="notf-announ_${acct.domain}_ct"></span> <span class="notf-announ_${acct.domain}_ct"></span>
<span class="voice">${lang.lang_layout_announ}</span>
</span> </span>
${if_tag_btn} ${if_tag_btn}
</div> </div>
<div class="area-sta"> <div class="area-sta">
<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply">0</span> <span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply" aria-hidden="true">0</span>
<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav">0</span> <span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav" aria-hidden="true">0</span>
<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT">0</span> <span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT" aria-hidden="true">0</span>
<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow">0</span> <span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow" aria-hidden="true">0</span>
</div> </div>
<div class="area-a2"> <div class="area-a2">
<a onclick="removeColumn('${key}')" class="setting nex"> <a onclick="removeColumn('${key}')" class="setting nex">
<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert}>cancel</i> <i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert} aria-hidden="true">cancel</i>
<span class="voice">${lang.lang_layout_delthis}</span>
</a> </a>
</div> </div>
<div class="area-a3"> <div class="area-a3">
<a onclick="setToggle('${key}')" class="setting nex" title="${lang.lang_layout_setthis}" ${icnsert}> <a onclick="setToggle('${key}')" class="setting nex" title="${lang.lang_layout_setthis}" ${icnsert}>
<i class="material-icons waves-effect nex">settings</i> <i class="material-icons waves-effect nex" aria-hidden="true">settings</i>
<span class="voice">${lang.lang_layout_setthis}</span>
</a> </a>
</div> </div>
</div> </div>
@@ -400,11 +420,7 @@ function parseColumn(target, dontclose) {
<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;"> <div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
${unread} ${unread}
${exclude}${left_hold} ${exclude}${left_hold}
<a onclick="mediaToggle('${key}')" class="setting nex"> ${mediaFil}<br>
<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
<span id="sta-media-${key}">On</span>
</a>
${lang.lang_layout_mediafil}<br>
<a onclick="cardToggle('${key}')" class="setting nex"> <a onclick="cardToggle('${key}')" class="setting nex">
<i class="material-icons waves-effect nex" title="${lang.lang_layout_linkanades}">link</i> <i class="material-icons waves-effect nex" title="${lang.lang_layout_linkanades}">link</i>
<span id="sta-card-${key}">On</span> <span id="sta-card-${key}">On</span>
@@ -496,13 +512,13 @@ function parseColumn(target, dontclose) {
minHeight: 50, minHeight: 50,
minWidth: 50, minWidth: 50,
grid: 50, grid: 50,
resize: function(event, ui) { resize: function (event, ui) {
$(this).css('min-width', ui.size.width + 'px') $(this).css('min-width', ui.size.width + 'px')
$(this).css('max-width', ui.size.width + 'px') $(this).css('max-width', ui.size.width + 'px')
$(this).css('min-height', ui.size.height + 'px') $(this).css('min-height', ui.size.height + 'px')
$(this).css('max-height', ui.size.height + 'px') $(this).css('max-height', ui.size.height + 'px')
}, },
stop: function(event, ui) { stop: function (event, ui) {
var col = localStorage.getItem('column') var col = localStorage.getItem('column')
var o = JSON.parse(col) var o = JSON.parse(col)
var width = ui.size.width var width = ui.size.width
@@ -517,16 +533,14 @@ function parseColumn(target, dontclose) {
} else { } else {
//横幅。その縦幅を持つカラムのidは //横幅。その縦幅を持つカラムのidは
console.log('yoko') console.log('yoko')
var key = $(this) var key = $(this).find('.boxIn').attr('tlid')
.find('.boxIn')
.attr('tlid')
var obj = o[key] var obj = o[key]
obj.width = width obj.width = width
o[key] = obj o[key] = obj
} }
var json = JSON.stringify(o) var json = JSON.stringify(o)
localStorage.setItem('column', json) localStorage.setItem('column', json)
} },
}) })
} }
function checkStr(type, data, acct_id, key, delc, voice) { function checkStr(type, data, acct_id, key, delc, voice) {
@@ -576,7 +590,7 @@ function addColumn() {
} }
var add = { var add = {
domain: acct, domain: acct,
type: type type: type,
} }
var multi = localStorage.getItem('column') var multi = localStorage.getItem('column')
var obj = JSON.parse(multi) var obj = JSON.parse(multi)
@@ -610,9 +624,7 @@ function addselCk() {
$('#webview-add').addClass('hide') $('#webview-add').addClass('hide')
} }
if (domain == 'knzk.me' || domain == 'mstdn.y-zu.org') { if (domain == 'knzk.me' || domain == 'mstdn.y-zu.org') {
$('#type-sel').append( $('#type-sel').append('<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>')
'<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>'
)
} else { } else {
$('#direct-add').remove() $('#direct-add').remove()
} }
@@ -629,16 +641,20 @@ function removeColumn(tlid) {
confirmButtonColor: '#3085d6', confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33', cancelButtonColor: '#d33',
confirmButtonText: lang.lang_yesno, confirmButtonText: lang.lang_yesno,
cancelButtonText: lang.lang_no cancelButtonText: lang.lang_no,
}).then(result => { }).then((result) => {
if (result.value) { if (result.value) {
var multi = localStorage.getItem('column') var multi = localStorage.getItem('column')
var obj = JSON.parse(multi) var obj = JSON.parse(multi)
var data = obj[tlid]
obj.splice(tlid, 1) obj.splice(tlid, 1)
var json = JSON.stringify(obj) var json = JSON.stringify(obj)
localStorage.setItem('column', json) localStorage.setItem('column', json)
sortLoad() sortLoad()
$('#timeline_box_' + tlid + '_parentBox').remove() $('#timeline_box_' + tlid + '_box').remove()
if(!data.left_fold) {
$('#timeline_box_' + tlid + '_parentBox').remove()
}
} }
$('#sort-box').removeClass('hide') $('#sort-box').removeClass('hide')
$('#sort-box').addClass('show') $('#sort-box').addClass('show')
@@ -652,28 +668,28 @@ function setToggle(tlid) {
$('#util-box_' + tlid).css('display', 'block') $('#util-box_' + tlid).css('display', 'block')
$('#util-box_' + tlid).animate( $('#util-box_' + tlid).animate(
{ {
height: '200px' height: '200px',
}, },
{ {
duration: 300, duration: 300,
complete: function() { complete: function () {
$('#util-box_' + tlid).css('overflow-y', 'scroll') $('#util-box_' + tlid).css('overflow-y', 'scroll')
$('#util-box_' + tlid).removeClass('column-hide') $('#util-box_' + tlid).removeClass('column-hide')
} },
} }
) )
} else { } else {
$('#util-box_' + tlid).css('overflow-y', 'hidden') $('#util-box_' + tlid).css('overflow-y', 'hidden')
$('#util-box_' + tlid).animate( $('#util-box_' + tlid).animate(
{ {
height: '0' height: '0',
}, },
{ {
duration: 300, duration: 300,
complete: function() { complete: function () {
$('#util-box_' + tlid).addClass('column-hide') $('#util-box_' + tlid).addClass('column-hide')
$('#util-box_' + tlid).css('display', 'none') $('#util-box_' + tlid).css('display', 'none')
} },
} }
) )
} }
@@ -685,28 +701,28 @@ function setToggleTag(tlid) {
$('#tag-box_' + tlid).css('display', 'block') $('#tag-box_' + tlid).css('display', 'block')
$('#tag-box_' + tlid).animate( $('#tag-box_' + tlid).animate(
{ {
height: '200px' height: '200px',
}, },
{ {
duration: 300, duration: 300,
complete: function() { complete: function () {
$('#tag-box_' + tlid).css('overflow-y', 'scroll') $('#tag-box_' + tlid).css('overflow-y', 'scroll')
$('#tag-box_' + tlid).removeClass('column-hide') $('#tag-box_' + tlid).removeClass('column-hide')
} },
} }
) )
} else { } else {
$('#tag-box_' + tlid).css('overflow-y', 'hidden') $('#tag-box_' + tlid).css('overflow-y', 'hidden')
$('#tag-box_' + tlid).animate( $('#tag-box_' + tlid).animate(
{ {
height: '0' height: '0',
}, },
{ {
duration: 300, duration: 300,
complete: function() { complete: function () {
$('#tag-box_' + tlid).addClass('column-hide') $('#tag-box_' + tlid).addClass('column-hide')
$('#tag-box_' + tlid).css('display', 'none') $('#tag-box_' + tlid).css('display', 'none')
} },
} }
) )
} }
@@ -813,11 +829,16 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
${lang.lang_layout_leftUnfold} ${lang.lang_layout_leftUnfold}
</span><br>` </span><br>`
} }
if(type == 'utl') {
var dataHtml = false
} else {
var dataHtml = data
}
var html = `<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}"> var html = `<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}">
<div class="notice-box z-depth-2" id="menu_${key}" style="${insert} "> <div class="notice-box z-depth-2" id="menu_${key}" style="${insert} ">
<div class="area-notice"> <div class="area-notice">
<i class="material-icons waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;" <i class="material-icons waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;"
onclick="${type}('${key}','${data}');" title="${lang.lang_layout_gotop}"></i> onclick="${type}('${key}','${dataHtml}');" title="${lang.lang_layout_gotop}"></i>
</div> </div>
<div class="area-notice_name"> <div class="area-notice_name">
<span id="notice_${key}" class="tl-title"></span> <span id="notice_${key}" class="tl-title"></span>
@@ -858,6 +879,8 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
} else if (type == 'bookmark') { } else if (type == 'bookmark') {
console.log(key, data) console.log(key, data)
bookmark(key, data) bookmark(key, data)
} else if (type == 'utl') {
utl(key, data.acct, data.data)
} }
cardCheck(key) cardCheck(key)
ebtCheck(key) ebtCheck(key)
@@ -875,6 +898,22 @@ function bookmark(key, data) {
} }
tl('bookmark', '', data, key, 'false', voice, '') tl('bookmark', '', data, key, 'false', voice, '')
} }
function utl(key, acct_id, data) {
if(!data) {
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
data = obj[key].data
acct_id = obj[key].domain
}
console.log(key, data)
if (localStorage.getItem('voice_' + key)) {
var voice = true
} else {
var voice = false
}
tl('utl', data, acct_id, key, 'false', voice, '')
}
function leftFoldSet(key) { function leftFoldSet(key) {
var multi = localStorage.getItem('column') var multi = localStorage.getItem('column')
var obj = JSON.parse(multi) var obj = JSON.parse(multi)

View File

@@ -33,6 +33,7 @@ function menu() {
$("#add-box").removeClass("hide"); $("#add-box").removeClass("hide");
$("#left-menu div").removeClass("active"); $("#left-menu div").removeClass("active");
$("#addColumnMenu").addClass("active"); $("#addColumnMenu").addClass("active");
$("#addColumnMenu").click();
} else { } else {
$('#menu').fadeOut() $('#menu').fadeOut()
$("#menu").removeClass("appear") $("#menu").removeClass("appear")
@@ -69,7 +70,7 @@ $(function () {
}); });
}); });
function help() { function help() {
$("#left-menu div").removeClass("active"); $("#left-menu a").removeClass("active");
$("#helpMenu").addClass("active"); $("#helpMenu").addClass("active");
$(".menu-content").addClass("hide"); $(".menu-content").addClass("hide");
$("#help-box").removeClass("hide"); $("#help-box").removeClass("hide");

View File

@@ -58,10 +58,10 @@ function show() {
mdCheck() mdCheck()
} }
$(function() { $(function () {
$('#post-box').draggable({ $('#post-box').draggable({
handle: '#post-bar', handle: '#post-bar',
stop: function() { stop: function () {
var left = $('#post-box').offset().left var left = $('#post-box').offset().left
if (left > $('body').width() - $('#post-box').width()) { if (left > $('body').width() - $('#post-box').width()) {
left = $('body').width() - $('#post-box').width() left = $('body').width() - $('#post-box').width()
@@ -76,15 +76,15 @@ $(function() {
} }
localStorage.setItem('postbox-left', left) localStorage.setItem('postbox-left', left)
localStorage.setItem('postbox-top', top) localStorage.setItem('postbox-top', top)
} },
}) })
$('#post-box').resizable({ $('#post-box').resizable({
minHeight: 150, minHeight: 150,
minWidth: 100, minWidth: 100,
stop: function(event, ui) { stop: function (event, ui) {
$('#textarea').blur() $('#textarea').blur()
localStorage.setItem('postbox-width', ui.size.width) localStorage.setItem('postbox-width', ui.size.width)
} },
}) })
}) })
@@ -101,41 +101,44 @@ if (location.search) {
$('.mini-btn').text('expand_less') $('.mini-btn').text('expand_less')
} }
} }
$('#posttgl').click(function(e) { window.onload = initPostbox
if (!$('#post-box').hasClass('appear')) { function initPostbox() {
show() $('#posttgl').click(function (e) {
} else { if (!$('#post-box').hasClass('appear')) {
hide() show()
} } else {
$('.cvo').removeClass('selectedToot')
selectedColumn = 0
selectedToot = 0
})
$('#timeline-container,#group').click(function(e) {
if (localStorage.getItem('box') != 'absolute') {
if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
hide() hide()
} }
} $('.cvo').removeClass('selectedToot')
$('.cvo').removeClass('selectedToot') selectedColumn = 0
selectedColumn = 0 selectedToot = 0
selectedToot = 0 })
localStorage.removeItem('nohide')
srcBox('close') $('#timeline-container,#group').click(function (e) {
}) if (localStorage.getItem('box') != 'absolute') {
$('#contextWrap').click(function(e) { if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
$('#contextWrap').addClass('hide') hide()
$('.contextMenu').addClass('hide') }
$('.act-icon').text('expand_more') }
}) $('.cvo').removeClass('selectedToot')
$('#textarea,#cw-text').focusout(function(e) { selectedColumn = 0
localStorage.setItem('nohide', true) selectedToot = 0
var countup = function() {
localStorage.removeItem('nohide') localStorage.removeItem('nohide')
} srcBox('close')
//setTimeout(remove, 100); })
$('.cvo').removeClass('selectedToot') $('#contextWrap').click(function (e) {
selectedColumn = 0 $('#contextWrap').addClass('hide')
selectedToot = 0 $('.contextMenu').addClass('hide')
}) $('.act-icon').text('expand_more')
})
$('#textarea,#cw-text').focusout(function (e) {
localStorage.setItem('nohide', true)
var countup = function () {
localStorage.removeItem('nohide')
}
//setTimeout(remove, 100);
$('.cvo').removeClass('selectedToot')
selectedColumn = 0
selectedToot = 0
})
}

View File

@@ -3,7 +3,7 @@ var envView = new Vue({
el: '#envView', el: '#envView',
data: { config: envConstruction }, data: { config: envConstruction },
methods: { methods: {
complete: function(i, val) { complete: function (i, val) {
var ls = envView.config[i].storage var ls = envView.config[i].storage
M.toast({ html: 'Complete', displayLength: 3000 }) M.toast({ html: 'Complete', displayLength: 3000 })
if (!val) { if (!val) {
@@ -21,14 +21,14 @@ var envView = new Vue({
frameSet(val) frameSet(val)
} }
return true return true
} },
} },
}) })
var tlView = new Vue({ var tlView = new Vue({
el: '#tlView', el: '#tlView',
data: { config: tlConstruction }, data: { config: tlConstruction },
methods: { methods: {
complete: function(i, val) { complete: function (i, val) {
var ls = tlView.config[i] var ls = tlView.config[i]
if (val) { if (val) {
localStorage.setItem(ls.storage, val) localStorage.setItem(ls.storage, val)
@@ -46,18 +46,18 @@ var tlView = new Vue({
} }
} }
return true return true
} },
} },
}) })
var postView = new Vue({ var postView = new Vue({
el: '#postView', el: '#postView',
data: { data: {
config: postConstruction, config: postConstruction,
kirishima: localStorage.getItem('kirishima'), kirishima: localStorage.getItem('kirishima'),
quoters: localStorage.getItem('quoters') quoters: localStorage.getItem('quoters'),
}, },
methods: { methods: {
complete: function(i, val) { complete: function (i, val) {
var ls = postView.config[i] var ls = postView.config[i]
if (val) { if (val) {
localStorage.setItem(ls.storage, val) localStorage.setItem(ls.storage, val)
@@ -75,8 +75,8 @@ var postView = new Vue({
} }
} }
return true return true
} },
} },
}) })
//設定ボタン押した。 //設定ボタン押した。
function settings() { function settings() {
@@ -99,14 +99,14 @@ function settings() {
var fontd = $('#font').val() var fontd = $('#font').val()
if (fontd) { if (fontd) {
if (fontd != localStorage.getItem('font')) { if (fontd != localStorage.getItem('font')) {
M.toast({ html: lang.lang_setting_font.replace('{{set}}', ct), displayLength: 3000 }) M.toast({ html: lang.lang_setting_font.replace('{{set}}', fontd), displayLength: 3000 })
} }
localStorage.setItem('font', fontd) localStorage.setItem('font', fontd)
themes() themes()
} else { } else {
if (localStorage.getItem('font')) { if (localStorage.getItem('font')) {
localStorage.removeItem('font') localStorage.removeItem('font')
M.toast({ html: lang.lang_setting_font.replace('{{set}}', ct), displayLength: 3000 }) M.toast({ html: lang.lang_setting_font.replace('{{set}}', '"default"'), displayLength: 3000 })
themes() themes()
} }
} }
@@ -177,6 +177,7 @@ function load() {
$('#soundVolVal').text(cvol * 100) $('#soundVolVal').text(cvol * 100)
} }
//$("#log").val(localStorage.getItem("errors")) //$("#log").val(localStorage.getItem("errors"))
$('#lastFmUser').val(localStorage.getItem('lastFmUser'))
} }
function customVol() { function customVol() {
var cvol = $('#soundvol').val() var cvol = $('#soundvol').val()
@@ -215,7 +216,7 @@ function climute() {
return return
} }
var templete var templete
Object.keys(obj).forEach(function(key) { Object.keys(obj).forEach(function (key) {
var cli = obj[key] var cli = obj[key]
var list = key * 1 + 1 var list = key * 1 + 1
templete = templete =
@@ -250,7 +251,7 @@ function wordmute() {
obj = [] obj = []
} }
$('#wordmute').chips({ $('#wordmute').chips({
data: obj data: obj,
}) })
} }
function wordmuteSave() { function wordmuteSave() {
@@ -266,7 +267,7 @@ function wordemp() {
obj = [] obj = []
} }
$('#wordemp').chips({ $('#wordemp').chips({
data: obj data: obj,
}) })
} }
function wordempSave() { function wordempSave() {
@@ -278,7 +279,7 @@ function notftest() {
var os = localStorage.getItem('platform') var os = localStorage.getItem('platform')
var options = { var options = {
body: lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')', body: lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')',
icon: localStorage.getItem('prof_0') icon: localStorage.getItem('prof_0'),
} }
var n = new Notification('TheDesk' + lang.lang_setting_notftest, options) var n = new Notification('TheDesk' + lang.lang_setting_notftest, options)
} }
@@ -303,7 +304,7 @@ function changelang(lang) {
} }
function exportSettings() { function exportSettings() {
var exp = exportSettingsCore() var exp = exportSettingsCore()
$("#imp-exp").val(JSON5.stringify(exp)) $('#imp-exp').val(JSON5.stringify(exp))
Swal.fire({ Swal.fire({
title: lang.lang_setting_exportwarn, title: lang.lang_setting_exportwarn,
type: 'warning', type: 'warning',
@@ -311,8 +312,8 @@ function exportSettings() {
confirmButtonColor: '#3085d6', confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33', cancelButtonColor: '#d33',
confirmButtonText: lang.lang_yesno, confirmButtonText: lang.lang_yesno,
cancelButtonText: lang.lang_no cancelButtonText: lang.lang_no,
}).then(result => { }).then((result) => {
if (result.value) { if (result.value) {
postMessage(['exportSettings', ''], '*') postMessage(['exportSettings', ''], '*')
} }
@@ -351,11 +352,7 @@ function exportSettingsCore() {
config.font = localStorage.getItem('font') config.font = localStorage.getItem('font')
exp.config = config exp.config = config
//keysc //keysc
exp.ksc = [ exp.ksc = [localStorage.getItem('oks-1'), localStorage.getItem('oks-2'), localStorage.getItem('oks-3')]
localStorage.getItem('oks-1'),
localStorage.getItem('oks-2'),
localStorage.getItem('oks-3')
]
//climu //climu
var cli = localStorage.getItem('client_mute') var cli = localStorage.getItem('client_mute')
var climu = JSON.parse(cli) var climu = JSON.parse(cli)
@@ -384,8 +381,8 @@ function exportSettingsCore() {
return exp return exp
} }
function importSettings() { function importSettings() {
if($("#imp-exp").val()) { if ($('#imp-exp').val()) {
importSettingsCore(JSON5.parse($("#imp-exp").val())) importSettingsCore(JSON5.parse($('#imp-exp').val()))
return false return false
} }
Swal.fire({ Swal.fire({
@@ -395,8 +392,8 @@ function importSettings() {
confirmButtonColor: '#3085d6', confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33', cancelButtonColor: '#d33',
confirmButtonText: lang.lang_yesno, confirmButtonText: lang.lang_yesno,
cancelButtonText: lang.lang_no cancelButtonText: lang.lang_no,
}).then(result => { }).then((result) => {
if (result.value) { if (result.value) {
postMessage(['importSettings', ''], '*') postMessage(['importSettings', ''], '*')
} }
@@ -490,7 +487,7 @@ function importSettingsCore(obj) {
} else { } else {
Swal.fire({ Swal.fire({
type: 'error', type: 'error',
title: 'Error' title: 'Error',
}) })
} }
} }
@@ -505,21 +502,13 @@ function fontList(arg) {
$('#fonts').removeClass('hide') $('#fonts').removeClass('hide')
for (var i = 0; i < arg.length; i++) { for (var i = 0; i < arg.length; i++) {
var font = arg[i] var font = arg[i]
$('#fonts').append( $('#fonts').append('<div class="font pointer" style="font-family:' + font + '" onclick="insertFont(\'' + font + '\')">' + font + '</div>')
'<div class="font pointer" style="font-family:' +
font +
'" onclick="insertFont(\'' +
font +
'\')">' +
font +
'</div>'
)
} }
} }
function insertFont(name) { function insertFont(name) {
$('#font').val(name) $('#font').val(name)
} }
$('.color-picker').each(function(i, elem) { $('.color-picker').each(function (i, elem) {
pickerDefine(i, 'fff') pickerDefine(i, 'fff')
}) })
function pickerDefine(i, color) { function pickerDefine(i, color) {
@@ -536,17 +525,16 @@ function pickerDefine(i, color) {
hue: true, // Hue slider hue: true, // Hue slider
interaction: { interaction: {
rgba: false, // rgba option (red green blue and alpha) rgba: false, // rgba option (red green blue and alpha)
input: true // input / output element input: true, // input / output element
} },
}, },
strings: { strings: {
save: 'Save', // Default for save button save: 'Save', // Default for save button
clear: 'Clear' // Default for clear button clear: 'Clear', // Default for clear button
} },
}) })
pickr.on('change', (...args) => { pickr.on('change', (...args) => {
var rgb = var rgb = 'rgb(' + args[0].toRGBA()[0] + ',' + args[0].toRGBA()[1] + ',' + args[0].toRGBA()[2] + ')'
'rgb(' + args[0].toRGBA()[0] + ',' + args[0].toRGBA()[1] + ',' + args[0].toRGBA()[2] + ')'
$('#color-picker' + i + '_value').val(rgb) $('#color-picker' + i + '_value').val(rgb)
}) })
} }
@@ -600,7 +588,7 @@ function customComp() {
TheDeskModal: modalC, TheDeskModal: modalC,
TheDeskBottom: bottomC, TheDeskBottom: bottomC,
TheDeskPostbox: postboxC, TheDeskPostbox: postboxC,
TheDeskSubcolor: subcolorC TheDeskSubcolor: subcolorC,
} }
} else { } else {
var advanceTheme = {} var advanceTheme = {}
@@ -620,10 +608,10 @@ function customComp() {
vars: { vars: {
primary: primaryC, primary: primaryC,
secondary: secondaryC, secondary: secondaryC,
text: textC text: textC,
}, },
props: advanceTheme, props: advanceTheme,
id: id id: id,
} }
$('#custom_json').val(JSON.stringify(json)) $('#custom_json').val(JSON.stringify(json))
themes('custom') themes('custom')
@@ -633,9 +621,7 @@ function customComp() {
$('#dark').prop('checked', true) $('#dark').prop('checked', true)
$('#custom_json').val('') $('#custom_json').val('')
for (var i = 0; i <= 8; i++) { for (var i = 0; i <= 8; i++) {
$('#color-picker' + i + '-wrap').html( $('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
'<div class="color-picker" id="color-picker' + i + '"></div>'
)
$('#color-picker' + i + '_value').val('') $('#color-picker' + i + '_value').val('')
pickerDefine(i, 'fff') pickerDefine(i, 'fff')
} }
@@ -648,9 +634,7 @@ function deleteIt() {
$('#dark').prop('checked', true) $('#dark').prop('checked', true)
$('#custom_json').val('') $('#custom_json').val('')
for (var i = 0; i <= 8; i++) { for (var i = 0; i <= 8; i++) {
$('#color-picker' + i + '-wrap').html( $('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
'<div class="color-picker" id="color-picker' + i + '"></div>'
)
$('#color-picker' + i + '_value').val('') $('#color-picker' + i + '_value').val('')
pickerDefine(i, 'fff') pickerDefine(i, 'fff')
} }
@@ -661,7 +645,7 @@ function ctLoad() {
} }
function ctLoadCore(args) { function ctLoadCore(args) {
var templete = '' var templete = ''
Object.keys(args).forEach(function(key) { Object.keys(args).forEach(function (key) {
var theme = args[key] var theme = args[key]
var themeid = theme.id var themeid = theme.id
templete = templete + '<option value="' + themeid + '">' + theme.name + '</option>' templete = templete + '<option value="' + themeid + '">' + theme.name + '</option>'
@@ -670,8 +654,7 @@ function ctLoadCore(args) {
localStorage.setItem('customtheme-id', args[0].id) localStorage.setItem('customtheme-id', args[0].id)
} }
$('#custom-sel-sel').html(templete) $('#custom-sel-sel').html(templete)
templete = templete = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete
'<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete
$('#custom-edit-sel').html(templete) $('#custom-edit-sel').html(templete)
$('select').formSelect() $('select').formSelect()
} }
@@ -687,9 +670,7 @@ function custom() {
$('#dark').prop('checked', true) $('#dark').prop('checked', true)
$('#custom_json').val('') $('#custom_json').val('')
for (var i = 0; i <= 8; i++) { for (var i = 0; i <= 8; i++) {
$('#color-picker' + i + '-wrap').html( $('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
'<div class="color-picker" id="color-picker' + i + '"></div>'
)
$('#color-picker' + i + '_value').val('') $('#color-picker' + i + '_value').val('')
pickerDefine(i, 'fff') pickerDefine(i, 'fff')
} }
@@ -737,9 +718,7 @@ function advancedConncet(args, tar, sub, i) {
} else { } else {
var color = args.vars[sub] var color = args.vars[sub]
} }
$('#color-picker' + i + '-wrap').html( $('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
'<div class="color-picker" id="color-picker' + i + '"></div>'
)
$('#color-picker' + i + '_value').val(color) $('#color-picker' + i + '_value').val(color)
pickerDefine(i, rgbToHex(color)) pickerDefine(i, rgbToHex(color))
} }
@@ -750,7 +729,7 @@ function customImp() {
} else { } else {
Swal.fire({ Swal.fire({
type: 'error', type: 'error',
title: 'Error' title: 'Error',
}) })
} }
} }
@@ -777,7 +756,7 @@ function customSoundSave(key, file) {
localStorage.setItem('custom' + key, file) localStorage.setItem('custom' + key, file)
$('#c1-file').text(file) $('#c1-file').text(file)
} }
window.onload = function() { window.onload = function () {
//最初に読む //最初に読む
load() load()
climute() climute()
@@ -787,17 +766,14 @@ window.onload = function() {
voiceSettingLoad() voiceSettingLoad()
oksload() oksload()
ctLoad() ctLoad()
$('body').addClass(localStorage.getItem('platform'))
} }
//設定画面で未読マーカーは要らない //設定画面で未読マーカーは要らない
function asReadEnd() { function asReadEnd() {
postMessage(['asReadComp', ''], '*') postMessage(['asReadComp', ''], '*')
} }
function checkupd() { function checkupd() {
if ( if (localStorage.getItem('winstore') == 'brewcask' || localStorage.getItem('winstore') == 'snapcraft' || localStorage.getItem('winstore') == 'winstore') {
localStorage.getItem('winstore') == 'brewcask' ||
localStorage.getItem('winstore') == 'snapcraft' ||
localStorage.getItem('winstore') == 'winstore'
) {
var winstore = true var winstore = true
} else { } else {
var winstore = false var winstore = false
@@ -805,22 +781,22 @@ function checkupd() {
var ver = localStorage.getItem('ver') var ver = localStorage.getItem('ver')
var start = 'https://thedesk.top/ver.json' var start = 'https://thedesk.top/ver.json'
fetch(start, { fetch(start, {
method: 'GET' method: 'GET',
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(mess) { .then(function (mess) {
console.table(mess) console.table(mess)
if (mess) { if (mess) {
var platform = localStorage.getItem('platform') var platform = localStorage.getItem('platform')
@@ -833,13 +809,13 @@ function checkupd() {
Swal.fire({ Swal.fire({
type: 'info', type: 'info',
title: lang.lang_setting_noupd, title: lang.lang_setting_noupd,
html: ver html: ver,
}) })
} else if (ver.indexOf('beta') != -1 || winstore) { } else if (ver.indexOf('beta') != -1 || winstore) {
Swal.fire({ Swal.fire({
type: 'info', type: 'info',
title: lang.lang_setting_thisisbeta, title: lang.lang_setting_thisisbeta,
html: ver html: ver,
}) })
} else { } else {
localStorage.removeItem('new-ver-skip') localStorage.removeItem('new-ver-skip')
@@ -848,3 +824,11 @@ function checkupd() {
} }
}) })
} }
function lastFmSet() {
if ($('#lastFmUser').val()) {
localStorage.setItem('lastFmUser', $('#lastFmUser').val())
} else {
localStorage.removeItem('lastFmUser')
}
M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
}

View File

@@ -33,7 +33,7 @@ function sortLoad () {
var acctdata = user + "@" + domain; var acctdata = user + "@" + domain;
} }
var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, escapeHTML(acct.data), acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key + var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, acct.data, acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key + ')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>'; ')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>';
$("#sort").append(html); $("#sort").append(html);
@@ -111,7 +111,7 @@ function sort() {
} }
//ソートボタントグル //ソートボタントグル
function sortMenu() { function sortMenu() {
$("#left-menu div").removeClass("active"); $("#left-menu a").removeClass("active");
$("#sortMenu").addClass("active"); $("#sortMenu").addClass("active");
$(".menu-content").addClass("hide"); $(".menu-content").addClass("hide");
$("#sort-box").removeClass("hide"); $("#sort-box").removeClass("hide");

View File

@@ -1,216 +1,294 @@
function spotifyConnect() { function spotifyConnect() {
var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing"; var auth = 'https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing'
var platform = localStorage.getItem("platform"); var platform = localStorage.getItem('platform')
if (platform == "win32") { if (platform == 'win32') {
postMessage(["openUrl", auth], "*"); postMessage(['openUrl', auth], '*')
postMessage(["sendSinmpleIpc", "quit"], "*"); postMessage(['sendSinmpleIpc', 'quit'], '*')
} else { } else {
auth = auth + "&state=code"; auth = auth + '&state=code'
$("#spotify-code-show").removeClass("hide"); $('#spotify-code-show').removeClass('hide')
postMessage(["openUrl", auth], "*"); postMessage(['openUrl', auth], '*')
} }
} }
function spotifyAuth() { function spotifyAuth() {
var code = $("#spotify-code").val(); var code = $('#spotify-code').val()
localStorage.setItem("spotify", "code"); localStorage.setItem('spotify', 'code')
localStorage.setItem("spotify-refresh", code); localStorage.setItem('spotify-refresh', code)
$("#spotify-code-show").addClass("hide"); $('#spotify-code-show').addClass('hide')
$("#spotify-enable").addClass("disabled"); $('#spotify-enable').addClass('disabled')
$("#spotify-disable").removeClass("disabled"); $('#spotify-disable').removeClass('disabled')
} }
function spotifyDisconnect() { function spotifyDisconnect() {
localStorage.removeItem("spotify"); localStorage.removeItem('spotify')
localStorage.removeItem("spotify-refresh"); localStorage.removeItem('spotify-refresh')
checkSpotify(); checkSpotify()
} }
function checkSpotify() { function checkSpotify() {
if (localStorage.getItem("spotify")) { if (localStorage.getItem('spotify')) {
$("#spotify-enable").addClass("disabled"); $('#spotify-enable').addClass('disabled')
$("#spotify-disable").removeClass("disabled"); $('#spotify-disable').removeClass('disabled')
} else { } else {
$("#spotify-enable").removeClass("disabled"); $('#spotify-enable').removeClass('disabled')
$("#spotify-disable").addClass("disabled"); $('#spotify-disable').addClass('disabled')
} }
var content = localStorage.getItem("np-temp"); var content = localStorage.getItem('np-temp')
if (!content || content == "" || content == "null") { if (!content || content == '' || content == 'null') {
var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk"; var content = '#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk'
} }
$("#np-temp").val(content); $('#np-temp').val(content)
var flag = localStorage.getItem("artwork"); var flag = localStorage.getItem('artwork')
if (flag) { if (flag) {
$("#awk_yes").prop("checked", true); $('#awk_yes').prop('checked', true)
} else { } else {
$("#awk_no").prop("checked", true); $('#awk_no').prop('checked', true)
} }
var flag2 = localStorage.getItem("complete-artwork"); var flag2 = localStorage.getItem('complete-artwork')
if (flag2) { if (flag2) {
$("#amw_yes").prop("checked", true); $('#amw_yes').prop('checked', true)
} else { } else {
$("#amw_no").prop("checked", true); $('#amw_no').prop('checked', true)
} }
} }
function spotifyFlagSave() { function spotifyFlagSave() {
var awk = $("[name=awk]:checked").val(); var awk = $('[name=awk]:checked').val()
if (awk == "yes") { if (awk == 'yes') {
localStorage.setItem("artwork", "yes"); localStorage.setItem('artwork', 'yes')
M.toast({ html: lang.lang_spotify_img, displayLength: 3000 }); M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
} else { } else {
localStorage.removeItem("artwork"); localStorage.removeItem('artwork')
M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 }); M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
} }
} }
function aMusicFlagSave() { function aMusicFlagSave() {
var awk = $("[name=amw]:checked").val(); var awk = $('[name=amw]:checked').val()
if (awk == "yes") { if (awk == 'yes') {
localStorage.setItem("complete-artwork", "yes"); localStorage.setItem('complete-artwork', 'yes')
M.toast({ html: lang.lang_spotify_img, displayLength: 3000 }); M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
} else { } else {
localStorage.removeItem("complete-artwork"); localStorage.removeItem('complete-artwork')
M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 }); M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
} }
} }
function nowplaying(mode) { function nowplaying(mode) {
if (mode == "spotify") { if (mode == 'spotify') {
var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh"); var start = 'https://thedesk.top/now-playing?at=' + localStorage.getItem('spotify') + '&rt=' + localStorage.getItem('spotify-refresh')
var at = localStorage.getItem("spotify"); var at = localStorage.getItem('spotify')
if (at) { if (at) {
fetch(start, { fetch(start, {
method: "GET", method: 'GET',
headers: { headers: {
"content-type": "application/json" 'content-type': 'application/json',
} },
}) })
.then(function(response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function (text) {
setLog(response.url, response.status, text); setLog(response.url, response.status, text)
}); })
} }
return response.json(); return response.json()
}) })
.catch(function(error) { .catch(function (error) {
todo(error); todo(error)
setLog(start, "JSON", error); setLog(start, 'JSON', error)
console.error(error); console.error(error)
}) })
.then(function(json) { .then(function (json) {
console.table(json); console.table(json)
if (json.length < 1) { if (json.length < 1) {
return false; return false
} }
var item = json.item; var item = json.item
var img = item.album.images[0].url; var img = item.album.images[0].url
var flag = localStorage.getItem("artwork"); var flag = localStorage.getItem('artwork')
if (flag) { if (flag) {
postMessage(["bmpImage", [img, 0]], "*"); postMessage(['bmpImage', [img, 0]], '*')
} }
var content = localStorage.getItem("np-temp"); var content = localStorage.getItem('np-temp')
if (!content || content == "" || content == "null") { if (!content || content == '' || content == 'null') {
var content = "#NowPlaying {song} / {album} / {artist}\n{url}"; var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
} }
var regExp = new RegExp("{song}", "g"); var regExp = new RegExp('{song}', 'g')
content = content.replace(regExp, item.name); content = content.replace(regExp, item.name)
var regExp = new RegExp("{album}", "g"); var regExp = new RegExp('{album}', 'g')
content = content.replace(regExp, item.album.name); content = content.replace(regExp, item.album.name)
var regExp = new RegExp("{artist}", "g"); var regExp = new RegExp('{artist}', 'g')
content = content.replace(regExp, item.artists[0].name); content = content.replace(regExp, item.artists[0].name)
var regExp = new RegExp("{url}", "g"); var regExp = new RegExp('{url}', 'g')
content = content.replace(regExp, item.external_urls.spotify); content = content.replace(regExp, item.external_urls.spotify)
var regExp = new RegExp("{composer}", "g"); var regExp = new RegExp('{composer}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
var regExp = new RegExp("{hz}", "g"); var regExp = new RegExp('{hz}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
var regExp = new RegExp("{bitRate}", "g"); var regExp = new RegExp('{bitRate}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
var regExp = new RegExp("{lyricist}", "g"); var regExp = new RegExp('{lyricist}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
var regExp = new RegExp("{bpm}", "g"); var regExp = new RegExp('{bpm}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
var regExp = new RegExp("{genre}", "g"); var regExp = new RegExp('{genre}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
$("#textarea").val(content); $('#textarea').val(content)
}); })
} else { } else {
Swal.fire({ Swal.fire({
type: "info", type: 'info',
title: lang.lang_spotify_acct title: lang.lang_spotify_acct,
}); })
}
} else if (mode == 'itunes') {
postMessage(['itunes', ''], '*')
} else if (mode == 'lastFm') {
var user = localStorage.getItem('lastFmUser')
var start = 'https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=' + user + '&limit=1&api_key=8f113803bfea951b6dde9e56d32458b2&format=json'
if (user) {
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) {
console.table(json)
if (!json || !json.recenttracks) {
console.error('no data')
return false
}
var item = json.recenttracks.track[0]
if(!item['@attr']) return false
var img = item.image[3]['#text']
var isImg = item.streamable*1
var flag = localStorage.getItem('artwork')
if (flag && isImg && img) {
postMessage(['bmpImage', [img, 0]], '*')
}
var content = localStorage.getItem('np-temp')
if (!content || content == '' || content == 'null') {
var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
}
var regExp = new RegExp('{song}', 'g')
content = content.replace(regExp, item.name)
var regExp = new RegExp('{album}', 'g')
content = content.replace(regExp, item.album['#text'])
var regExp = new RegExp('{artist}', 'g')
content = content.replace(regExp, item.artist['#text'])
var regExp = new RegExp('{url}', 'g')
content = content.replace(regExp,'')
var regExp = new RegExp('{composer}', 'g')
content = content.replace(regExp, '')
var regExp = new RegExp('{hz}', 'g')
content = content.replace(regExp, '')
var regExp = new RegExp('{bitRate}', 'g')
content = content.replace(regExp, '')
var regExp = new RegExp('{lyricist}', 'g')
content = content.replace(regExp, '')
var regExp = new RegExp('{bpm}', 'g')
content = content.replace(regExp, '')
var regExp = new RegExp('{genre}', 'g')
content = content.replace(regExp, '')
$('#textarea').val(content)
})
} else {
Swal.fire({
type: 'info',
title: lang.lang_spotify_acct,
})
} }
} else if (mode == "itunes") {
postMessage(["itunes", ""], "*");
} }
} }
async function npCore(arg) { async function npCore(arg) {
console.table(arg); console.table(arg)
var content = localStorage.getItem("np-temp"); var content = localStorage.getItem('np-temp')
if (!content || content == "" || content == "null") { if (!content || content == '' || content == 'null') {
var content = "#NowPlaying {song} / {album} / {artist}\n{url}"; var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
} }
var flag = localStorage.getItem("artwork"); var flag = localStorage.getItem('artwork')
var platform = localStorage.getItem("platform"); var platform = localStorage.getItem('platform')
if (platform == "win32") { var aaw = { aaw: '', album: '' }
if (platform == 'win32') {
if (flag && arg.path) { if (flag && arg.path) {
media(arg.path, "image/png", "new"); media(arg.path, 'image/png', 'new')
} }
} else if (platform == "darwin") { } else if (platform == 'darwin') {
if (flag && arg.artwork) { if (flag && arg.artwork) {
media(arg.artwork, "image/png", "new"); media(arg.artwork, 'image/png', 'new')
} else if (flag && localStorage.getItem('complete-artwork')) { } else if (flag && localStorage.getItem('complete-artwork')) {
var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name; var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name
postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*"); aaw = await getUnknownAA(q)
postMessage(['bmpImage', [aaw.aaw, 0]], '*')
} }
} }
var regExp = new RegExp("{song}", "g"); var regExp = new RegExp('{song}', 'g')
content = content.replace(regExp, arg.name); content = content.replace(regExp, arg.name)
var regExp = new RegExp("{album}", "g"); var regExp = new RegExp('{album}', 'g')
if (arg.album) { if (arg.album) {
if (arg.album.name) { if (arg.album.name) {
content = content.replace(regExp, arg.album.name); content = content.replace(regExp, arg.album.name)
} else {
if (aaw.album) content = content.replace(regExp, aaw.album)
content = content.replace(regExp, '-')
} }
} else {
if (aaw.album) content = content.replace(regExp, aaw.album)
content = content.replace(regExp, '-')
} }
var regExp = new RegExp("{artist}", "g"); var regExp = new RegExp('{artist}', 'g')
content = content.replace(regExp, arg.artist); content = content.replace(regExp, arg.artist)
var regExp = new RegExp("{url}", "g"); var regExp = new RegExp('{url}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
var regExp = new RegExp("{composer}", "g"); var regExp = new RegExp('{composer}', 'g')
content = content.replace(regExp, arg.composer); content = content.replace(regExp, arg.composer)
var regExp = new RegExp("{hz}", "g"); var regExp = new RegExp('{hz}', 'g')
content = content.replace(regExp, arg.sampleRate / 1000 + "kHz"); content = content.replace(regExp, arg.sampleRate / 1000 + 'kHz')
var regExp = new RegExp("{lyricist}", "g"); var regExp = new RegExp('{lyricist}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
var regExp = new RegExp("{bpm}", "g"); var regExp = new RegExp('{bpm}', 'g')
content = content.replace(regExp, ""); content = content.replace(regExp, '')
var regExp = new RegExp("{bitRate}", "g"); var regExp = new RegExp('{bitRate}', 'g')
content = content.replace(regExp, arg.bitRate + "kbps"); content = content.replace(regExp, arg.bitRate + 'kbps')
var regExp = new RegExp("{genre}", "g"); var regExp = new RegExp('{genre}', 'g')
content = content.replace(regExp, arg.genre); content = content.replace(regExp, arg.genre)
$("#textarea").val(content); $('#textarea').val(content)
} }
function spotifySave() { function spotifySave() {
var temp = $("#np-temp").val(); var temp = $('#np-temp').val()
localStorage.setItem("np-temp", temp); localStorage.setItem('np-temp', temp)
M.toast({ html: lang.lang_spotify_np, displayLength: 3000 }); M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
} }
if (location.search) { if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/); var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
var mode = m[1]; var mode = m[1]
var codex = m[2]; var codex = m[2]
if (mode == "spotify") { if (mode == 'spotify') {
var coder = codex.split(":"); var coder = codex.split(':')
localStorage.setItem("spotify", coder[0]); localStorage.setItem('spotify', coder[0])
localStorage.setItem("spotify-refresh", coder[1]); localStorage.setItem('spotify-refresh', coder[1])
} else { } else {
} }
} }
async function getUnknownAA(q) { async function getUnknownAA(q) {
const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song' const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
let promise = await fetch(start, { let promise = await fetch(start, {
method: 'GET' method: 'GET',
}) })
const json = await promise.json() const json = await promise.json()
if(!json.resultCount) { if (!json.resultCount) {
return [] return []
} }
const data = json.results[0].artworkUrl100 const data = json.results[0].artworkUrl100
return data.replace(/100x100/, '512x512') return { aaw: data.replace(/100x100/, '512x512'), album: json.results[0].collectionName }
} }

View File

@@ -30,7 +30,7 @@ function tips(mode) {
localStorage.getItem('ver') + localStorage.getItem('ver') +
' git: ' + ' git: ' +
gitHash + gitHash +
'\')">TheDesk ' + '\')"> ' +
localStorage.getItem('ver') + localStorage.getItem('ver') +
' {' + ' {' +
gitHash.slice(0, 7) + gitHash.slice(0, 7) +

View File

@@ -1,6 +1,6 @@
//ユーザーデータ表示 //ユーザーデータ表示
//タイムライン //タイムライン
function utl(user, more, acct_id) { function utlShow(user, more, acct_id) {
if (!acct_id) { if (!acct_id) {
var acct_id = $("#his-data").attr("use-acct"); var acct_id = $("#his-data").attr("use-acct");
} }
@@ -79,6 +79,26 @@ function utl(user, more, acct_id) {
jQuery("time.timeago").timeago(); jQuery("time.timeago").timeago();
}); });
} }
function utlAdd() {
var acct_id = $("#his-data").attr("use-acct");
var user = $("#his-data").attr("user-id");
var add = {
domain: acct_id,
type: 'utl',
data: {
id: user,
acct: $("#his-acct").attr('fullname')
}
}
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
localStorage.setItem('card_' + obj.length, 'true')
obj.push(add)
var json = JSON.stringify(obj)
localStorage.setItem('column', json)
parseColumn('add')
hisclose()
}
//ピン留めTL //ピン留めTL
function pinutl(before, user, acct_id) { function pinutl(before, user, acct_id) {
if (!acct_id) { if (!acct_id) {
@@ -719,46 +739,3 @@ function udAdd(acct_id, id, start) {
} }
}); });
} }
//ユーザーマッチングリスト
function showMat() {
$("#his-matching-list-contents").html(lang.lang_hisdata_taketime);
var full = $("#his-acct").attr("fullname");
var acct_id = $("#his-data").attr("use-acct");
full = full.split("@");
var start = "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-filtered-api.cgi?" + full[1] + "+" + full[0];
fetch(start, {
method: "GET",
headers: {
"content-type": "application/json"
}
//body: JSON.stringify({})
})
.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 templete = "";
Object.keys(json).forEach(function(key) {
var user = json[key];
if (user.avatar) {
var avatar = user.avatar;
} else {
var avatar = "../../img/loading.svg";
}
templete = templete + '<div class="" style="padding-top:5px;">' + '<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' + '<div style="flex-basis:40px;"><a onclick="udgEx(\'' + user.user + "'," + acct_id + ');" user="' + user.user + '" class="udg">' + '<img src="' + avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' + '<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' + escapeHTML(user.screen_name) + "</big></div>" + '<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' + user.user + "@" + user.host + "</div>" + "</div>" + '<div class="divider"></div>' + "</div>" + "</div>";
});
$("#his-matching-list").css("height", $("#his-float-data").height() - $("#his-basic-prof").height() - $("#his-des").height() - $("#his-plus-action").height() + "px");
$("#his-matching-list-contents").html(templete);
});
}

View File

@@ -115,7 +115,7 @@ function udg(user, acct_id) {
$("#his-data").attr("remote", "false"); $("#his-data").attr("remote", "false");
var fullname = json.acct + "@" + domain; var fullname = json.acct + "@" + domain;
} }
utl(json.id, "", acct_id); utlShow(json.id, "", acct_id);
flw(json.id, "", acct_id); flw(json.id, "", acct_id);
fer(json.id, "", acct_id); fer(json.id, "", acct_id);
var dis_name = escapeHTML(json.display_name); var dis_name = escapeHTML(json.display_name);
@@ -239,6 +239,11 @@ function udg(user, acct_id) {
$(".only-his-data").show(); $(".only-his-data").show();
} }
todc(); 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);
}); });
@@ -298,7 +303,7 @@ function misskeyUdg(user, acct_id) {
$("#his-data").attr("remote", "false"); $("#his-data").attr("remote", "false");
var fullname = json.acct + "@" + domain; var fullname = json.acct + "@" + domain;
} }
utl(json.id, "", acct_id); utlShow(json.id, "", acct_id);
flw(json.id, "", acct_id); flw(json.id, "", acct_id);
fer(json.id, "", acct_id); fer(json.id, "", acct_id);
if (json.name) { if (json.name) {
@@ -412,9 +417,14 @@ function relations(user, acct_id) {
}) })
.then(function(json) { .then(function(json) {
var json = json[0]; var json = json[0];
if(json.requested) {
//フォロリク中
$('#his-data').addClass('following')
$("#his-follow-btn-text").text(lang.lang_status_requesting)
}
if (json.following) { if (json.following) {
//自分がフォローしている //自分がフォローしている
$("#his-data").addClass("following"); $("#his-data").addClass("following")
$("#his-follow-btn-text").text(lang.lang_status_unfollow); $("#his-follow-btn-text").text(lang.lang_status_unfollow);
hisList(user, acct_id); hisList(user, acct_id);
} else { } else {
@@ -538,6 +548,8 @@ function reset() {
$("#his-float-blocked").hide(); $("#his-float-blocked").hide();
$("#his-main-acct").show(); $("#his-main-acct").show();
$("#his-proof-prof").html(""); $("#his-proof-prof").html("");
$('#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"); var target = $(this).attr("go");

View File

@@ -3,6 +3,10 @@ var dir = 'file://' + __dirname
var base = dir + '/view/' var base = dir + '/view/'
// Electronのモジュール // Electronのモジュール
const electron = require('electron') const electron = require('electron')
// アプリケーションをコントロールするモジュール
const app = electron.app
// Electronの初期化完了後に実行
app.on('ready', createWindow)
const fs = require('fs') const fs = require('fs')
const language = require('./main/language.js') const language = require('./main/language.js')
const css = require('./main/css.js') const css = require('./main/css.js')
@@ -12,9 +16,6 @@ const np = require('./main/np.js')
const systemFunc = require('./main/system.js') const systemFunc = require('./main/system.js')
const Menu = electron.Menu const Menu = electron.Menu
const join = require('path').join const join = require('path').join
// アプリケーションをコントロールするモジュール
const app = electron.app
// ウィンドウを作成するモジュール // ウィンドウを作成するモジュール
const BrowserWindow = electron.BrowserWindow const BrowserWindow = electron.BrowserWindow
// メインウィンドウはGCされないようにグローバル宣言 // メインウィンドウはGCされないようにグローバル宣言
@@ -36,60 +37,11 @@ if (!gotTheLock) {
}) })
} }
if (process.argv.indexOf('--dev') === -1) { // 全てのウィンドウが閉じたら終了
var packaged = true app.on('window-all-closed', function () {
} else { electron.session.defaultSession.clearCache(() => {})
var packaged = false app.quit()
console.log( })
'||\\\\\\ \n' +
'|||| \\\\\\\\ \n' +
'|||| \\\\\\\\ \n' +
'|||| Am I a \\\\\\\\ \n' +
'|||| cat? ^ ^ \\\\\\\\\\ _____ _ ____ _ \n' +
'|||| (.-.) \\\\\\\\\\ |_ _| |__ ___| _ \\ ___ ___| | __\n' +
"|||| ___> ) ||||| | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
'|||| < _ _) ////// | | | | | | __/ |_| | __/__ \\ < \n' +
'|||| |_||_| ///// |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
'|||| ///// \n' +
'|||| /////\n' +
'|||| /////\n' +
'||||//////'
)
console.log('If it does not show the window, you might forget `npm run construct`.')
}
var info_path = join(app.getPath('userData'), 'window-size.json')
var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
var lang_path = join(app.getPath('userData'), 'language')
var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
var ua_path = join(app.getPath('userData'), 'useragent')
var frame_path = join(app.getPath('userData'), 'frame')
try {
fs.readFileSync(ha_path, 'utf8')
app.disableHardwareAcceleration()
if (!packaged) console.log('disabled: Hardware Acceleration')
} catch {
if (!packaged) console.log('enabled: Hardware Acceleration')
}
var window_size
try {
window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
} catch (e) {
window_size = {
width: 1000,
height: 750
} // デフォルトバリュー
}
var max_window_size
try {
max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
} catch (e) {
max_window_size = {
width: 'string',
height: 'string',
x: 'string',
y: 'string'
} // デフォルトバリュー
}
function isFile(file) { function isFile(file) {
try { try {
fs.statSync(file) fs.statSync(file)
@@ -98,24 +50,8 @@ function isFile(file) {
if (err.code === 'ENOENT') return false if (err.code === 'ENOENT') return false
} }
} }
try {
var frameRaw = fs.readFileSync(frame_path, 'utf8')
if(frameRaw == 'false') {
var frame = false
var frameTitle = 'hidden'
} else {
var frame = true
var frameTitle = 'default'
}
} catch {
var frame = true
}
// 全てのウィンドウが閉じたら終了
app.on('window-all-closed', function() {
electron.session.defaultSession.clearCache(() => {})
app.quit()
})
function createWindow() { function createWindow() {
var lang_path = join(app.getPath('userData'), 'language')
if (isFile(lang_path)) { if (isFile(lang_path)) {
var lang = fs.readFileSync(lang_path, 'utf8') var lang = fs.readFileSync(lang_path, 'utf8')
} else { } else {
@@ -132,69 +68,134 @@ function createWindow() {
} else { } else {
lang = 'en' lang = 'en'
} }
fs.mkdir(app.getPath('userData'), function(err) { fs.mkdir(app.getPath('userData'), function (err) {
fs.writeFileSync(lang_path, lang) fs.writeFileSync(lang_path, lang)
}) })
} }
if (!packaged) console.log('your lang:' + app.getLocale()) if (!packaged) console.log('your lang:' + app.getLocale())
if (!packaged) console.log('launch:' + lang) if (!packaged) console.log('launch:' + lang)
//Opening
const package = fs.readFileSync(__dirname + '/package.json')
if(lang == 'ja') {
const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
var show = maxims[Math.floor(Math.random() * maxims.length)]
} else if(lang == 'ja-KS') {
//ja-KSも作れたらいいね
const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
var show = maxims[Math.floor(Math.random() * maxims.length)]
} else{
var show = 'TheDesk 2018'
}
const data = JSON.parse(package)
const version = data.version
const codename = data.codename
var openingWindow = new BrowserWindow({
width: 300,
height: 400,
transparent: false,
frame: false,
resizable: false,
})
openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
if (process.argv.indexOf('--dev') === -1) {
var packaged = true
} else {
var packaged = false
console.log(
'||\\\\\\ \n' +
'|||| \\\\\\\\ \n' +
'|||| \\\\\\\\ \n' +
'|||| Am I a \\\\\\\\ \n' +
'|||| cat? ^ ^ \\\\\\\\\\ _____ _ ____ _ \n' +
'|||| (.-.) \\\\\\\\\\ |_ _| |__ ___| _ \\ ___ ___| | __\n' +
"|||| ___> ) ||||| | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
'|||| < _ _) ////// | | | | | | __/ |_| | __/__ \\ < \n' +
'|||| |_||_| ///// |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
'|||| ///// \n' +
'|||| /////\n' +
'|||| /////\n' +
'||||//////'
)
console.log('If it does not show the window, you might forget `npm run construct`.')
}
var info_path = join(app.getPath('userData'), 'window-size.json')
var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
var ua_path = join(app.getPath('userData'), 'useragent')
var frame_path = join(app.getPath('userData'), 'frame')
try {
fs.readFileSync(ha_path, 'utf8')
app.disableHardwareAcceleration()
if (!packaged) console.log('disabled: Hardware Acceleration')
} catch {
if (!packaged) console.log('enabled: Hardware Acceleration')
}
var window_size
try {
window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
} catch (e) {
window_size = {
width: 1000,
height: 750,
} // デフォルトバリュー
}
var max_window_size
try {
max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
} catch (e) {
max_window_size = {
width: 'string',
height: 'string',
x: 'string',
y: 'string',
} // デフォルトバリュー
}
try {
var frameRaw = fs.readFileSync(frame_path, 'utf8')
if (frameRaw == 'false') {
var frame = false
var frameTitle = 'hidden'
} else {
var frame = true
var frameTitle = 'default'
}
} catch {
var frame = true
}
// メイン画面の表示。ウィンドウの幅、高さを指定できる // メイン画面の表示。ウィンドウの幅、高さを指定できる
var platform = process.platform var platform = process.platform
var bit = process.arch var bit = process.arch
var arg = {
webPreferences: {
webviewTag: true,
nodeIntegration: false,
contextIsolation: true,
preload: join(__dirname, 'js', 'platform', 'preload.js'),
},
width: window_size.width,
height: window_size.height,
x: window_size.x,
y: window_size.y,
show: false,
frame: frame,
}
if (platform == 'linux') { if (platform == 'linux') {
var arg = { arg.resizable = true
webPreferences: { arg.icon = __dirname + '/desk.png'
webviewTag: true,
nodeIntegration: false,
contextIsolation: true,
preload: join(__dirname, 'js', 'platform', 'preload.js')
},
width: window_size.width,
height: window_size.height,
x: window_size.x,
y: window_size.y,
icon: __dirname + '/desk.png',
show: false,
frame: frame,
resizable: true
}
} else if (platform == 'win32') { } else if (platform == 'win32') {
var arg = { arg.simpleFullscreen = true
webPreferences: {
webviewTag: true,
nodeIntegration: false,
contextIsolation: true,
preload: join(__dirname, 'js', 'platform', 'preload.js')
},
width: window_size.width,
height: window_size.height,
x: window_size.x,
y: window_size.y,
simpleFullscreen: true,
show: false,
frame: frame
}
} else if (platform == 'darwin') { } else if (platform == 'darwin') {
var arg = { arg.simpleFullscreen = true
webPreferences: { arg.titleBarStyle = frameTitle
webviewTag: true,
nodeIntegration: false,
contextIsolation: true,
preload: join(__dirname, 'js', 'platform', 'preload.js')
},
width: window_size.width,
height: window_size.height,
x: window_size.x,
y: window_size.y,
simpleFullscreen: true,
show: false,
titleBarStyle: frameTitle,
frame: frame,
}
} }
mainWindow = new BrowserWindow(arg) mainWindow = new BrowserWindow(arg)
mainWindow.once('page-title-updated', () => { mainWindow.once('page-title-updated', () => {
openingWindow.close()
mainWindow.show() mainWindow.show()
console.log('Accessibility: ' + app.accessibilitySupportEnabled)
if (window_size.max) { if (window_size.max) {
mainWindow.maximize() mainWindow.maximize()
} }
@@ -225,40 +226,35 @@ function createWindow() {
// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36 // Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
const crypto = require('crypto') const crypto = require('crypto')
const N = 100 const N = 100
var ua = var ua = 'Mastodon client: ' + crypto.randomBytes(N).toString('base64').substring(0, N)
'Mastodon client: ' +
crypto
.randomBytes(N)
.toString('base64')
.substring(0, N)
} }
mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua }) mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
if (!window_size.x && !window_size.y) { if (!window_size.x && !window_size.y) {
mainWindow.center() mainWindow.center()
} }
// ウィンドウが閉じられたらアプリも終了 // ウィンドウが閉じられたらアプリも終了
mainWindow.on('closed', function() { mainWindow.on('closed', function () {
electron.ipcMain.removeAllListeners() electron.ipcMain.removeAllListeners()
mainWindow = null mainWindow = null
}) })
closeArg = false closeArg = false
mainWindow.on('close', function(e, arg) { mainWindow.on('close', function (e, arg) {
writePos(mainWindow) writePos(mainWindow)
if (!closeArg) { if (!closeArg) {
e.preventDefault() e.preventDefault()
} }
const promise = new Promise(function(resolve) { const promise = new Promise(function (resolve) {
mainWindow.webContents.send('asReadEnd', '') mainWindow.webContents.send('asReadEnd', '')
setTimeout(function() { setTimeout(function () {
resolve() resolve()
}, 3000) }, 3000)
}) })
promise.then(function(response) { promise.then(function (response) {
closeArg = true closeArg = true
mainWindow.close() mainWindow.close()
}) })
}) })
electron.ipcMain.on('sendMarkersComplete', function(e, arg) { electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
closeArg = true closeArg = true
mainWindow.close() mainWindow.close()
}) })
@@ -274,33 +270,31 @@ function createWindow() {
height: mainWindow.getBounds().height, height: mainWindow.getBounds().height,
x: mainWindow.getBounds().x, x: mainWindow.getBounds().x,
y: mainWindow.getBounds().y, y: mainWindow.getBounds().y,
max: true max: true,
} }
} else { } else {
var size = { var size = {
width: mainWindow.getBounds().width, width: mainWindow.getBounds().width,
height: mainWindow.getBounds().height, height: mainWindow.getBounds().height,
x: mainWindow.getBounds().x, x: mainWindow.getBounds().x,
y: mainWindow.getBounds().y y: mainWindow.getBounds().y,
} }
} }
fs.writeFileSync(info_path, JSON.stringify(size)) fs.writeFileSync(info_path, JSON.stringify(size))
} }
mainWindow.on('maximize', function() { mainWindow.on('maximize', function () {
writePos(mainWindow) writePos(mainWindow)
fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds())) fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
}) })
mainWindow.on('minimize', function() { mainWindow.on('minimize', function () {
writePos(mainWindow) writePos(mainWindow)
mainWindow.webContents.send('asRead', '') mainWindow.webContents.send('asRead', '')
}) })
var platform = process.platform var platform = process.platform
var bit = process.arch var bit = process.arch
Menu.setApplicationMenu( Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame)))
Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame)) if (!frame) {
)
if(!frame) {
mainWindow.setMenu(null) mainWindow.setMenu(null)
} }
//CSS //CSS
@@ -313,7 +307,7 @@ function createWindow() {
np.TheDeskNowPlaying(mainWindow) np.TheDeskNowPlaying(mainWindow)
//その他system //その他system
systemFunc.system(mainWindow, dir, lang, dirname) systemFunc.system(mainWindow, dir, lang, dirname)
setInterval(function() { setInterval(function () {
mouseTrack(mainWindow) mouseTrack(mainWindow)
}, 1000) }, 1000)
} }
@@ -339,10 +333,5 @@ function mouseTrack(mainWindow) {
x = xNow x = xNow
y = yNow y = yNow
} }
// Electronの初期化完了後に実行
app.on('ready', createWindow)
var onError = function(err, response) {
console.error(err, response)
}
app.setAsDefaultProtocolClient('thedesk') app.setAsDefaultProtocolClient('thedesk')

View File

@@ -24,10 +24,14 @@ function dl(mainWindow, lang_path, base, dirname) {
height: 400, height: 400,
transparent: false, // ウィンドウの背景を透過 transparent: false, // ウィンドウの背景を透過
frame: false, // 枠の無いウィンドウ frame: false, // 枠の無いウィンドウ
resizable: false resizable: false,
show: false
}) })
var lang = fs.readFileSync(lang_path, 'utf8') var lang = fs.readFileSync(lang_path, 'utf8')
updatewin.loadURL(base + lang + '/update.html') updatewin.loadURL(base + lang + '/update.html')
updatewin.webContents.once('dom-ready', () => {
updatewin.show()
})
return 'true' return 'true'
} else { } else {
return false return false
@@ -36,13 +40,13 @@ function dl(mainWindow, lang_path, base, dirname) {
//アプデDL //アプデDL
ipc.on('download-btn', async (e, args) => { ipc.on('download-btn', async (e, args) => {
function dl(url, file, dir, e) { function dl(url, file, dir, e) {
e.sender.webContents.send('mess', 'ダウンロードを開始します。') e.sender.webContents.send('mess', 'Start...')
const opts = { const opts = {
directory: dir, directory: dir,
filename: file, filename: file,
openFolderWhenDone: true, openFolderWhenDone: true,
onProgress: function(event) { onProgress: function(event) {
e.sender.webContents.send('prog', event) e.sender.webContents.send('prog', [event, args[2]])
}, },
saveAs: false saveAs: false
} }
@@ -91,6 +95,7 @@ function dl(mainWindow, lang_path, base, dirname) {
var name = '' var name = ''
var platform = process.platform var platform = process.platform
var bit = process.arch var bit = process.arch
const filename = args[0].match(/https:\/\/.+\/(.+\..+)$/)
if (args[1] == '') { if (args[1] == '') {
if (platform == 'win32') { if (platform == 'win32') {
var dir = app.getPath('home') + '\\Pictures\\TheDesk' var dir = app.getPath('home') + '\\Pictures\\TheDesk'
@@ -111,11 +116,21 @@ function dl(mainWindow, lang_path, base, dirname) {
} }
download(BrowserWindow.getFocusedWindow(), args[0], opts) download(BrowserWindow.getFocusedWindow(), args[0], opts)
.then(dl => { .then(dl => {
event.sender.webContents.send('general-dl-message', dir) if(filename[1]) {
if (platform == 'win32') {
var name = dir + '\\' + filename[1]
} else if (platform == 'linux' || platform == 'darwin') {
var name = dir + '/' + filename[1]
}
} else {
var name = dir
}
event.sender.webContents.send('general-dl-message', name)
}) })
.catch(console.error) .catch(console.error)
}) })
ipc.on('open-finder', (e, folder) => { ipc.on('openFinder', (e, folder) => {
console.log(folder)
shell.showItemInFolder(folder) shell.showItemInFolder(folder)
}) })
} }

View File

@@ -6,38 +6,33 @@ function img(mainWindow, dir) {
var ipc = electron.ipcMain var ipc = electron.ipcMain
const BrowserWindow = electron.BrowserWindow const BrowserWindow = electron.BrowserWindow
ipc.on('file-select', (e, args) => { ipc.on('file-select', (e, args) => {
dialog.showOpenDialog( let fileNames = dialog.showOpenDialogSync(mainWindow, {
null, properties: ['openFile', 'multiSelections'],
{ title: '添付ファイルを選択',
properties: ['openFile', 'multiSelections'], defaultPath: '.',
title: '添付ファイルを選択', filters: [
defaultPath: '.', {
filters: [ name: 'メディアファイル',
{ extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'],
name: 'メディアファイル', },
extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] { name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
}, { name: '動画', extensions: ['mp4', 'webm'] },
{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] }, { name: '全てのファイル', extensions: ['*'] },
{ name: '動画', extensions: ['mp4', 'webm'] }, ],
{ name: '全てのファイル', extensions: ['*'] } })
] if (!fileNames) {
}, return false
fileNames => { }
if (!fileNames) { for (var i = 0; i < fileNames.length; i++) {
return false var path = fileNames[i]
} var bin = fs.readFileSync(path, 'base64')
for (var i = 0; i < fileNames.length; i++) { e.sender.webContents.send('resizeJudgement', [bin, 'new'])
var path = fileNames[i] }
var bin = fs.readFileSync(path, 'base64')
e.sender.webContents.send('resizeJudgement', [bin, 'new'])
}
}
)
}) })
ipc.on('bmp-image', (e, args) => { ipc.on('bmp-image', (e, args) => {
Jimp.read(args[0], function(err, lenna) { Jimp.read(args[0], function (err, lenna) {
if (err) throw err if (err) throw err
lenna.getBase64(Jimp.MIME_PNG, function(err, src) { lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1]]) e.sender.webContents.send('bmp-img-comp', [src, args[1]])
}) })
}) })
@@ -51,9 +46,9 @@ function img(mainWindow, dir) {
} }
var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '') var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
var decodedFile = new Buffer(b64, 'base64') var decodedFile = new Buffer(b64, 'base64')
Jimp.read(decodedFile, function(err, lenna) { Jimp.read(decodedFile, function (err, lenna) {
if (err) throw err if (err) throw err
lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function(err, src) { lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function (err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1]]) e.sender.webContents.send('bmp-img-comp', [src, args[1]])
}) })
}) })
@@ -63,24 +58,24 @@ function img(mainWindow, dir) {
var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '') var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
var decodedFile = new Buffer(b64, 'base64') var decodedFile = new Buffer(b64, 'base64')
console.log(text) console.log(text)
Jimp.read(decodedFile, function(err, image) { Jimp.read(decodedFile, function (err, image) {
if (err) throw err if (err) throw err
Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then(font => { Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then((font) => {
var evWidth = Jimp.measureText(font, text) var evWidth = Jimp.measureText(font, text)
var width = image.bitmap.width var width = image.bitmap.width
var height = image.bitmap.height var height = image.bitmap.height
var left = width - evWidth - 10 var left = width - evWidth - 10
var top = height - 30 var top = height - 30
var color = Jimp.intToRGBA(image.getPixelColor(left, top)) var color = Jimp.intToRGBA(image.getPixelColor(left, top))
console.log(left, top, color) console.log(left, top, color)
var ave = (color.r + color.g + color.b) / 3 var ave = (color.r + color.g + color.b) / 3
if (ave > 128) { if (ave > 128) {
image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) { image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1], true]) e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
}) })
} else { } else {
Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then(font => { Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then((font) => {
image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) { image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1], true]) e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
}) })
}) })

View File

@@ -1,309 +1,303 @@
function system(mainWindow, dir, lang, dirname) { function system(mainWindow, dir, lang, dirname) {
const electron = require("electron"); const electron = require('electron')
const app = electron.app; const app = electron.app
const join = require("path").join; const join = require('path').join
var Jimp = require("jimp"); var Jimp = require('jimp')
const fs = require("fs"); const fs = require('fs')
var JSON5 = require("json5"); var JSON5 = require('json5')
var ipc = electron.ipcMain; var ipc = electron.ipcMain
const clipboard = electron.clipboard; const clipboard = electron.clipboard
var tmp_img = join(app.getPath("userData"), "tmp.png"); var tmp_img = join(app.getPath('userData'), 'tmp.png')
var ha_path = join(app.getPath("userData"), "hardwareAcceleration"); var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
var ua_path = join(app.getPath("userData"), "useragent"); var ua_path = join(app.getPath('userData'), 'useragent')
var lang_path = join(app.getPath("userData"), "language"); var lang_path = join(app.getPath('userData'), 'language')
var log_dir_path = join(app.getPath("userData"), "logs"); var log_dir_path = join(app.getPath('userData'), 'logs')
var frame_path = join(app.getPath("userData"), "frame"); var frame_path = join(app.getPath('userData'), 'frame')
//ログ //ログ
var today = new Date(); var today = new Date()
//今日のやつ //今日のやつ
var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log"; var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
//昨日のやつ //昨日のやつ
today.setDate(today.getDate() - 1); today.setDate(today.getDate() - 1)
var yestStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log"; var yestStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
//一昨日のやつ //一昨日のやつ
today.setDate(today.getDate() - 1); today.setDate(today.getDate() - 1)
var yest2Str = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log"; var yest2Str = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
const BrowserWindow = electron.BrowserWindow; const BrowserWindow = electron.BrowserWindow
const dialog = electron.dialog; const dialog = electron.dialog
const os = require("os"); const os = require('os')
const language = require("../main/language.js"); const language = require('../main/language.js')
//プラットフォーム //プラットフォーム
ipc.on("getPlatform", function(e, arg) { ipc.on('getPlatform', function (e, arg) {
try { try {
var gitHash = fs.readFileSync("git", "utf8"); var gitHash = fs.readFileSync('git', 'utf8')
} catch { } catch {
var gitHash = null; var gitHash = null
} }
e.sender.webContents.send("platform", [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]); e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash])
}); })
//言語 //言語
ipc.on("lang", function(e, arg) { ipc.on('lang', function (e, arg) {
console.log("set:" + arg); console.log('set:' + arg)
fs.writeFileSync(lang_path, arg); fs.writeFileSync(lang_path, arg)
e.sender.webContents.send("langres", arg); e.sender.webContents.send('langres', arg)
}); })
//エクスポートのダイアログ //エクスポートのダイアログ
ipc.on("exportSettings", function(e, args) { ipc.on('exportSettings', function (e, args) {
dialog.showSaveDialog( let savedFiles = dialog.showSaveDialogSync(mainWindow, {
mainWindow, title: 'Export',
{ properties: ['openFile', 'createDirectory'],
title: "Export", defaultPath: 'export.thedeskconfig.json5',
properties: ["openFile", "createDirectory"], })
defaultPath: "export.thedeskconfig.json5" if (!savedFiles) {
}, return false
savedFiles => { }
if (!savedFiles) { e.sender.webContents.send('exportSettingsFile', savedFiles)
return false; })
}
e.sender.webContents.send("exportSettingsFile", savedFiles);
}
);
});
//インポートのダイアログ //インポートのダイアログ
ipc.on("importSettings", function(e, args) { ipc.on('importSettings', function (e, args) {
dialog.showOpenDialog( let fileNames = dialog.showOpenDialogSync(mainWindow, {
mainWindow, title: 'Import',
{ properties: ['openFile'],
title: "Import", filters: [{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] }],
properties: ["openFile"], })
filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }] console.log('imported from: ', fileNames)
}, if (!fileNames) {
fileNames => { return false
console.log("imported from: ", fileNames) }
if (!fileNames) { e.sender.webContents.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')))
return false; })
}
e.sender.webContents.send("config", JSON5.parse(fs.readFileSync(fileNames[0], "utf8")));
}
);
});
//保存フォルダのダイアログ //保存フォルダのダイアログ
ipc.on("savefolder", function(e, args) { ipc.on('savefolder', function (e, args) {
dialog.showOpenDialog( let fileNames = dialog.showOpenDialogSync(
mainWindow, mainWindow,
{ {
title: "Save folder", title: 'Save folder',
properties: ["openDirectory"] properties: ['openDirectory'],
},
fileNames => {
e.sender.webContents.send("savefolder", fileNames[0]);
} }
); )
}); e.sender.webContents.send('savefolder', fileNames[0])
})
//カスタムサウンドのダイアログ //カスタムサウンドのダイアログ
ipc.on("customSound", function(e, arg) { ipc.on('customSound', function (e, arg) {
dialog.showOpenDialog( let fileNames = dialog.showOpenDialogSync(
mainWindow, mainWindow,
{ {
title: "Custom sound", title: 'Custom sound',
properties: ["openFile"], properties: ['openFile'],
filters: [{ name: "Audio", extensions: ["mp3", "aac", "wav", "flac", "m4a"] }, { name: "All", extensions: ["*"] }] filters: [
}, { name: 'Audio', extensions: ['mp3', 'aac', 'wav', 'flac', 'm4a'] },
fileNames => { { name: 'All', extensions: ['*'] },
e.sender.webContents.send("customSoundRender", [arg, fileNames[0]]); ],
} }
); )
}); e.sender.webContents.send('customSoundRender', [arg, fileNames[0]])
})
//ハードウェアアクセラレーションの無効化 //ハードウェアアクセラレーションの無効化
ipc.on("ha", function(e, arg) { ipc.on('ha', function (e, arg) {
if (arg == "true") { if (arg == 'true') {
fs.writeFileSync(ha_path, arg); fs.writeFileSync(ha_path, arg)
} else { } else {
fs.unlink(ha_path, function(err) {}); fs.unlink(ha_path, function (err) {})
} }
app.relaunch(); app.relaunch()
app.exit(); app.exit()
}); })
//ユーザーエージェント //ユーザーエージェント
ipc.on("ua", function(e, arg) { ipc.on('ua', function (e, arg) {
if (arg == "") { if (arg == '') {
fs.unlink(ua_path, function(err) {}); fs.unlink(ua_path, function (err) {})
} else { } else {
fs.writeFileSync(ua_path, arg); fs.writeFileSync(ua_path, arg)
} }
app.relaunch(); app.relaunch()
app.exit(); app.exit()
}); })
//フレームのありなし //フレームのありなし
ipc.on("frameSet", function(e, arg) { ipc.on('frameSet', function (e, arg) {
fs.writeFileSync(frame_path, arg); fs.writeFileSync(frame_path, arg)
app.relaunch(); app.relaunch()
app.exit(); app.exit()
}); })
//スクリーンリーダー
ipc.on("quit", (e, args) => { ipc.on('acsCheck', function (e, arg) {
app.quit(); if (app.accessibilitySupportEnabled) {
}); mainWindow.webContents.send('accessibility', 'true')
ipc.on("about", (e, args) => { }
about(); })
}); ipc.on('quit', (e, args) => {
app.quit()
})
ipc.on('about', (e, args) => {
about()
})
function about() { function about() {
var ver = app.getVersion(); var ver = app.getVersion()
var window = new BrowserWindow({ var window = new BrowserWindow({
webPreferences: { webPreferences: {
webviewTag: false, webviewTag: false,
nodeIntegration: false, nodeIntegration: false,
contextIsolation: true, contextIsolation: true,
preload: join(dirname, "js", "platform", "preload.js") preload: join(dirname, 'js', 'platform', 'preload.js'),
}, },
width: 300, width: 300,
height: 500, height: 500,
transparent: false, // ウィンドウの背景を透過 transparent: false, // ウィンドウの背景を透過
frame: false, // 枠の無いウィンドウ frame: false, // 枠の無いウィンドウ
resizable: false resizable: false,
}); })
window.loadURL(dir + "/about.html?ver=" + ver); window.loadURL(dir + '/about.html?ver=' + ver)
return "true"; return 'true'
} }
ipc.on("nano", function(e, x, y) { ipc.on('nano', function (e, x, y) {
var nano_info_path = join(app.getPath("userData"), "nano-window-position.json"); var nano_info_path = join(app.getPath('userData'), 'nano-window-position.json')
var window_pos; var window_pos
try { try {
window_pos = JSON.parse(fs.readFileSync(nano_info_path, "utf8")); window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'))
} catch (e) { } catch (e) {
window_pos = [0, 0]; // デフォルトバリュー window_pos = [0, 0] // デフォルトバリュー
} }
var nanowindow = new BrowserWindow({ var nanowindow = new BrowserWindow({
webPreferences: { webPreferences: {
webviewTag: false, webviewTag: false,
nodeIntegration: false, nodeIntegration: false,
contextIsolation: true, contextIsolation: true,
preload: join(dirname, "js", "platform", "preload.js") preload: join(dirname, 'js', 'platform', 'preload.js'),
}, },
width: 350, width: 350,
height: 140, height: 140,
transparent: false, // ウィンドウの背景を透過 transparent: false, // ウィンドウの背景を透過
frame: false, // 枠の無いウィンドウ frame: false, // 枠の無いウィンドウ
resizable: false resizable: false,
}); })
nanowindow.loadURL(dir + "/nano.html"); nanowindow.loadURL(dir + '/nano.html')
nanowindow.setAlwaysOnTop(true); nanowindow.setAlwaysOnTop(true)
//nanowindow.toggleDevTools() //nanowindow.toggleDevTools()
nanowindow.setPosition(window_pos[0], window_pos[1]); nanowindow.setPosition(window_pos[0], window_pos[1])
nanowindow.on("close", function() { nanowindow.on('close', function () {
fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition())); fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()))
}); })
return true; return true
}); })
var cbTimer1; var cbTimer1
ipc.on("startmem", (e, arg) => { ipc.on('startmem', (e, arg) => {
event = e.sender; event = e.sender
cbTimer1 = setInterval(mems, 1000); cbTimer1 = setInterval(mems, 1000)
}); })
function mems() { function mems() {
var mem = os.totalmem() - os.freemem(); var mem = os.totalmem() - os.freemem()
if (mainWindow) { if (mainWindow) {
event.webContents.send("memory", [mem, os.cpus()[0].model, os.totalmem()]); event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()])
} }
} }
ipc.on("endmem", (e, arg) => { ipc.on('endmem', (e, arg) => {
if (cbTimer1) { if (cbTimer1) {
clearInterval(cbTimer1); clearInterval(cbTimer1)
} }
}); })
ipc.on("export", (e, args) => { ipc.on('export', (e, args) => {
fs.writeFileSync(args[0], JSON5.stringify(args[1])); fs.writeFileSync(args[0], JSON5.stringify(args[1]))
e.sender.webContents.send("exportAllComplete", ""); e.sender.webContents.send('exportAllComplete', '')
}); })
//フォント //フォント
function object_array_sort(data, key, order, fn) { function object_array_sort(data, key, order, fn) {
//デフォは降順(DESC) //デフォは降順(DESC)
var num_a = -1; var num_a = -1
var num_b = 1; var num_b = 1
if (order === "asc") { if (order === 'asc') {
//指定があれば昇順(ASC) //指定があれば昇順(ASC)
num_a = 1; num_a = 1
num_b = -1; num_b = -1
} }
data = data.sort(function(a, b) { data = data.sort(function (a, b) {
var x = a[key]; var x = a[key]
var y = b[key]; var y = b[key]
if (x > y) return num_a; if (x > y) return num_a
if (x < y) return num_b; if (x < y) return num_b
return 0; return 0
}); })
//重複排除 //重複排除
var arrObj = {}; var arrObj = {}
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
arrObj[data[i]["family"]] = data[i]; arrObj[data[i]['family']] = data[i]
} }
data = []; data = []
for (var key in arrObj) { for (var key in arrObj) {
data.push(arrObj[key]); data.push(arrObj[key])
} }
fn(data); // ソート後の配列を返す fn(data) // ソート後の配列を返す
} }
ipc.on("fonts", (e, arg) => { ipc.on('fonts', (e, arg) => {
var SystemFonts = require('system-font-families').default; var SystemFonts = require('system-font-families').default
var fm = new SystemFonts(); var fm = new SystemFonts()
const fontList = fm.getFontsSync(); const fontList = fm.getFontsSync()
e.sender.webContents.send("font-list", fontList); e.sender.webContents.send('font-list', fontList)
}); })
//コピー //コピー
ipc.on("copy", (e, arg) => { ipc.on('copy', (e, arg) => {
clipboard.writeText(arg); clipboard.writeText(arg)
}); })
//ログ //ログ
ipc.on("log", (e, arg) => { ipc.on('log', (e, arg) => {
var today = new Date(); var today = new Date()
var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate(); var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate()
var log_path = join(log_dir_path, todayStr + ".log"); var log_path = join(log_dir_path, todayStr + '.log')
fs.appendFile(log_path, "\n" + arg, function(err) { fs.appendFile(log_path, '\n' + arg, function (err) {
if (err) { if (err) {
throw err; throw err
} }
}); })
}); })
ipc.on("getLogs", (e, arg) => { ipc.on('getLogs', (e, arg) => {
var logs="" var logs = ''
var todayLog="" var todayLog = ''
var yestLog="" var yestLog = ''
var yest2Log="" var yest2Log = ''
fs.readdir(log_dir_path, function(err, files) { fs.readdir(log_dir_path, function (err, files) {
if (err) throw err; if (err) throw err
files.filter(function(file) { files.filter(function (file) {
if (file == todayStr) { if (file == todayStr) {
todayLog=fs.readFileSync(join(log_dir_path, file), "utf8") todayLog = fs.readFileSync(join(log_dir_path, file), 'utf8')
} }
if (file == yestStr) { if (file == yestStr) {
yestLog=logs+fs.readFileSync(join(log_dir_path, file), "utf8") yestLog = logs + fs.readFileSync(join(log_dir_path, file), 'utf8')
} }
if (file == yest2Str) { if (file == yest2Str) {
yest2Log=fs.readFileSync(join(log_dir_path, file), "utf8") yest2Log = fs.readFileSync(join(log_dir_path, file), 'utf8')
} }
logs = todayLog + yestLog + yest2Log; logs = todayLog + yestLog + yest2Log
}); })
logs = yest2Log + yestLog + todayLog; logs = yest2Log + yestLog + todayLog
e.sender.webContents.send("logData", logs); e.sender.webContents.send('logData', logs)
}); })
}); })
//起動時ログディレクトリ存在確認と作成、古ログ削除 //起動時ログディレクトリ存在確認と作成、古ログ削除
fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => { fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, (error) => {
if (error) { if (error) {
if (error.code === "ENOENT") { if (error.code === 'ENOENT') {
fs.mkdirSync(log_dir_path); fs.mkdirSync(log_dir_path)
} else { } else {
return; return
} }
} else { } else {
fs.readdir(log_dir_path, function(err, files) { fs.readdir(log_dir_path, function (err, files) {
if (err) throw err; if (err) throw err
files.filter(function(file) { files.filter(function (file) {
if (file != todayStr && file != yestStr && file != yest2Str) { if (file != todayStr && file != yestStr && file != yest2Str) {
fs.unlinkSync(join(log_dir_path, file)); fs.unlinkSync(join(log_dir_path, file))
} }
}); })
}); })
} }
}); })
} }
exports.system = system; exports.system = system

49
app/maxim.ja.json Normal file
View File

@@ -0,0 +1,49 @@
[
"TheDeskは自称ステイホームの必須アイテム",
"あと数秒でPCのファンが全力で回り始める",
"カラムの数だけ夢があるがネットワークは逼迫する",
"朝起きたらストリーミングが止まっていた…",
"誰も使ってない機能1: 未読管理",
"誰も使ってない機能2: スタンプ機能",
"誰も使ってない機能3: コードセットアップをオフにしたログイン",
"誰も使ってない機能4: TheDesk上でのプロフィール更新",
"誰も使ってない機能5: フォローレコメンデーション",
"TheDeskは重い(ダブルミーニング)",
"今日も生茶が美味しい(4ケース96本の在庫)",
"jQueryは死すべき(流れ弾)",
"なんでTheDeskのバージョン19は無いの",
"デレマス要素なくない?",
"今日も「TheDesk」でエゴサが捗る",
"開発者はTheDeskのヘビーユーザではない",
"アイコンは猫だが開発者は犬派",
"#TheDeskのアイコンは猫虐待",
"上のアニメーションからしてこの猫は完全に仮想化されている",
"TheDeskの歴史は2016年まで遡ることができる",
"WIP: Croudia, ネコ型SNS",
"リリース間隔は平均1桁日(昔1日に6回アプデを提供したせい)",
"node_modulesをignoreせずに上げてしまったせいでCode Frequencyが破壊された",
"TheDesk XSS Hunt をしなければならない()",
"毎月出る支援お願いしますダイアログで月初めを知る人 #いろいろな人",
"Integrated TLは目玉機能なので消せないが消せるものなら消したいくらい内部構造がヤバい",
"「アンケート」か「投票」か。「時間指定投稿」か「予約投稿」か",
"実装当初は言語を「関西弁」にするとお問い合わせフォームまで関西弁だった",
"Ctrl+Kでメニューが出ます",
"検索ボックスは入力後Enterで確定できる",
"開発者の推しカラーテーマはPolar Night",
"TheDeskのユーザーエージェントは毎回起動時に変わります。TheDeskと確定させることはできません",
"AppData/Roaming/TheDesk(Windows)の中にcutsom.cssを入れるとカスタムCSSを導入できます",
"環境設定の「ウィンドウフレーム」は「オフ」がおすすめ",
"各トゥートの右上の時刻表示を押すとトゥートのリンクがコピーされます",
"各トゥートの左下の公開範囲のアイコンを押すとそのトゥートの本文がコピーされますが挙動にバグがあります",
"TheDeskをMisskeyクライアントだと思って使ってはいけません",
"この迷文を追加したい場合はapp/maxim.ja.jsonを編集",
"本当はTheDesk 21.0.0(Mayu)専用のアイコンを用意していた",
"TheDesk 20.x.xと21.x.xではアイコンがちょっと違う",
"三大見てはいけないもの: TheDeskのコード、TheDeskのDevTool console、あと一つは",
"この画面がずっと出続けているのは多分yarn construct忘れてる",
"たまにここに何も出ないことがあるけど、なんでかはわからない",
"Kawaii->Mayu(今ここ)->Koume->Chieri->Anastasia->Aiko",
"言語設定を日本語以外にするとこの表示はどうなると思う?",
"今日も使ってくれてありがとう。利用者カウンターがキリ番ならご報告を",
"Ctrl+Eで通知の赤くなって「Fav: 1」とかなってるのをリセットできる"
]

View File

@@ -128,7 +128,7 @@
</select> </select>
</div> </div>
<button onclick="set()" id="setting">Setting</button> <button onclick="set()" id="setting">Setting</button>
<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post someyhing new"></textarea> <textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post something new"></textarea>
<button class="btn" onclick="post()">Post</button> <button class="btn" onclick="post()">Post</button>
<button onclick="window.close()">x</button><br /> <button onclick="window.close()">x</button><br />
<div id="timeline_nano">Click "settings" to show TL</div> <div id="timeline_nano">Click "settings" to show TL</div>

5
app/netlify.toml Normal file
View File

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

96
app/opening.html Normal file
View File

@@ -0,0 +1,96 @@
<!DOCTYPE html>
<html lang="ja">
<head>
<title>TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport" />
<meta charset="utf-8" />
<style>
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 300;
src: local('Open Sans Light'), local('OpenSans-Light'), url('./fonts/OpenSans-Light.ttf') format('truetype');
}
body {
font-family: 'Open Sans';
-webkit-app-region: drag;
cursor: move;
padding: 5px;
padding-top: 15px;
background-color: #222222;
color: white;
text-align: center;
}
.loading {
animation: throbber-loader 1000ms 300ms infinite ease-out;
background: #3d3d3d;
display: inline-block;
position: relative;
text-indent: -9999px;
width: 0.9em;
height: 0.9em;
margin: 0 .9em;
}
.loading:before,
.loading:after {
background: #3d3d3d;
content: '\x200B';
display: inline-block;
width: 0.9em;
height: 0.9em;
position: absolute;
top: 0;
}
.loading:before {
animation: throbber-loader 1000ms 150ms infinite ease-out;
left: -1.9em;
}
.loading:after {
animation: throbber-loader 1000ms 450ms infinite ease-out;
right: -1.9em;
}
@keyframes throbber-loader {
0% {
background: #3d3d3d;
}
10% {
background: #6b9dc8;
}
40% {
background: #3d3d3d;
}
}
a,
button {
-webkit-app-region: no-drag;
}
h1 {
margin: 0;
}
#maxim {
font-size: 0.7rem;
}
</style>
</head>
<body class="center" style="overflow: hidden;">
<img src="./img/desk-animation.svg" style="max-width: 62%;" />
<h1>TheDesk</h1>
<span id="ver"></span><br />
<span class="loading"></span><br />
<div class="cp">
<span id="maxim"></span><br />
<script>
if (location.search) {
var m = location.search.match(/\?ver=([0-9.]+)&codename=([a-zA-Z]+)&maxim=(.+)/)
var ver = m[1]
var code = m[2]
var maxim = m[3]
document.getElementById('ver').innerText = `${ver}(${code})`
document.getElementById('maxim').innerText = `${decodeURI(maxim)}`
}
</script>
</div>
</body>
</html>

View File

@@ -1,131 +1,130 @@
{ {
"name": "thedesk", "name": "thedesk",
"version": "20.3.2", "version": "21.0.4",
"codename": "Kawaii", "codename": "Mayu",
"description": "TheDesk is a Mastodon client for PC.", "description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk", "repository": "https://github.com/cutls/TheDesk",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"construct": "cd view/make && node make --automatic && cd ../../", "construct": "cd view/make && node make --automatic && cd ../../",
"dev": "npx electron ./ --dev", "dev": "npx electron ./ --dev",
"dist": "build --linux snap", "dist": "build --linux snap",
"watchview": "node view/make/make.js --automatic --watch", "watchview": "node view/make/make.js --automatic --watch",
"build:js": "node build.js", "build:js": "node build.js",
"build": "node view/make/make.js --automatic && npx electron-builder", "build": "node view/make/make.js --automatic && npx electron-builder",
"build:all": "npx electron-builder --win --linux", "build:all": "npx electron-builder --win --linux",
"build:win": "npx electron-builder --win", "build:win": "npx electron-builder --win",
"build:pwa": "node view/make/make.js --automatic --pwa" "build:pwa": "node view/make/make.js --automatic --pwa"
},
"keywords": [
"mastodon",
"client",
"electron",
"thedesk"
],
"bugs": {
"url": "https://github.com/cutls/TheDesk/issues",
"email": "web-pro@cutls.com"
},
"homepage": "https://thedesk.top",
"author": {
"name": "Cutls",
"url": "https://cutls.com/@Cutls",
"email": "web-pro@cutls.com"
},
"contributor": [
{
"name": "とねぢ",
"url": "https://minohdon.jp/@toneji",
"email": "solfa.tono@gmail.com"
}, },
{ "keywords": [
"name": "ぽぷんじゃ", "mastodon",
"url": "https://popon.pptdn.jp/@popn_ja", "client",
"email": "popn.ja@gmail.com" "electron",
}, "thedesk"
{
"name": "kPherox",
"url": "https://pl.kpherox.dev/kPherox",
"email": "admin@mail.kr-kp.com"
}
],
"license": "GPL-3.0",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.13.0",
"custom-electron-titlebar": "^3.2.2-hotfix62",
"electron-dl": "^3.0.0",
"jimp": "^0.10.1",
"jquery": "^3.4.1",
"jquery-ui-dist": "^1.12.1",
"json5": "^2.1.3",
"lodash": "^4.17.15",
"materialize-css": "git://github.com/cutls/materialize#v1-dev",
"sumchecker": "^3.0.1",
"sweetalert2": "^9.10.9",
"system-font-families": "^0.4.1",
"vue": "^2.6.11"
},
"optionalDependencies": {
"itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac"
},
"devDependencies": {
"chokidar": "^3.3.1",
"electron": "^8.0.0",
"electron-builder": "^22.4.1",
"electron-rebuild": "^1.10.1",
"readline-sync": "1.4.10"
},
"build": {
"productName": "TheDesk",
"appId": "top.thedesk",
"asarUnpack": [
"node_modules/itunes-nowplaying-mac"
], ],
"directories": { "bugs": {
"output": "../build" "url": "https://github.com/cutls/TheDesk/issues",
"email": "p@cutls.com"
}, },
"win": { "homepage": "https://thedesk.top",
"icon": "build/thedesk.ico", "author": {
"target": [ "name": "Cutls",
"nsis", "url": "https://cutls.dev",
"portable", "email": "p@cutls.com"
"appx"
]
}, },
"appx": { "contributor": [{
"identityName": "53491Cutls.TheDesk", "name": "とねぢ",
"applicationId": "Cutls.TheDesk", "url": "https://minohdon.jp/@toneji",
"publisherDisplayName": "Cutls", "email": "solfa.tono@gmail.com"
"publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1", },
"languages": [ {
"JA-JP", "name": "ぽぷんじゃ",
"EN-US" "url": "https://popon.pptdn.jp/@popn_ja",
] "email": "popn.ja@gmail.com"
},
{
"name": "kPherox",
"url": "https://pl.kpherox.dev/kPherox",
"email": "admin@mail.kr-kp.com"
}
],
"license": "GPL-3.0",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.13.1",
"custom-electron-titlebar": "^3.2.2-hotfix62",
"electron-dl": "^3.0.1",
"jimp": "^0.14.0",
"jquery": "^3.5.1",
"jquery-ui-dist": "^1.12.1",
"json5": "^2.1.3",
"lodash": "^4.17.15",
"materialize-css": "git://github.com/cutls/materialize#v1-dev",
"sumchecker": "^3.0.1",
"sweetalert2": "^9.15.2",
"system-font-families": "^0.4.1",
"vue": "^2.6.11"
}, },
"nsis": { "optionalDependencies": {
"oneClick": false, "itunes-nowplaying-mac": "0.3.1"
"allowToChangeInstallationDirectory": true,
"artifactName": "TheDesk-setup.${ext}"
}, },
"linux": { "devDependencies": {
"icon": "build/icons", "chokidar": "^3.4.0",
"target": [ "electron": "^9.0.5",
"zip", "electron-builder": "^22.7.0",
"snap", "electron-rebuild": "^1.11.0",
"deb" "readline-sync": "1.4.10"
],
"category": "Network"
}, },
"mac": { "build": {
"target": [ "productName": "TheDesk",
"dmg", "appId": "top.thedesk",
"zip" "asarUnpack": [
] "node_modules/itunes-nowplaying-mac"
}, ],
"electronDownload": { "directories": {
"version": "6.0.0" "output": "../build"
}, },
"electronVersion": "6.0.0" "win": {
} "icon": "build/thedesk.ico",
} "target": [
"nsis",
"portable",
"appx"
]
},
"appx": {
"identityName": "53491Cutls.TheDesk",
"applicationId": "Cutls.TheDesk",
"publisherDisplayName": "Cutls",
"publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
"languages": [
"JA-JP",
"EN-US"
]
},
"nsis": {
"oneClick": false,
"allowToChangeInstallationDirectory": true,
"artifactName": "TheDesk-setup.${ext}"
},
"linux": {
"icon": "build/icons",
"target": [
"zip",
"snap",
"deb"
],
"category": "Network"
},
"mac": {
"target": [
"dmg",
"zip"
]
},
"electronDownload": {
"version": "9.0.5"
},
"electronVersion": "9.0.5"
}
}

View File

@@ -1,5 +1,8 @@
{ {
"latest":[], "latest":[],
"3.1.4": [
"リモート限定の連合タイムライン"
],
"3.1.3": [], "3.1.3": [],
"3.1.2": [], "3.1.2": [],
"3.1.1": [], "3.1.1": [],

View File

@@ -29,7 +29,7 @@
@@pwa@@ @@pwa@@
</head> </head>
<body id="mainView"> <body id="mainView" class="@@pwaClass@@">
<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script> <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/first.js"></script>
<script <script
@@ -53,27 +53,33 @@
<div id="acct-list"></div> <div id="acct-list"></div>
<div class="divider"></div> <div class="divider"></div>
</div> </div>
<div class="hide-second">
<a href="setting.html">@@haveExported@@</a>
</div>
<div> <div>
<h5>@@add@@</h5> <h5>@@add@@</h5>
<br /> <br />
<div id="add"> <div id="add">
<div class="row"> <div class="row">
<div class="col s8"> <div class="col s8">
@@addAcct@@<br />
<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" /> <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
<div id="ins-suggest"></div> <div id="ins-suggest"></div>
@@codesetupwarn@@<br /> <button class="btn waves-effect" onclick="instance()">Login</button><br />
<label> <div class="pwa">
<input type="checkbox" class="filled-in" id="linux" /> @@codesetupwarn@@<br />
<span>@@codesetup@@</span> <label>
</label> <input type="checkbox" class="filled-in" id="linux" />
<br /> <span>@@codesetup@@</span>
</label>
<br />
</div>
<label> <label>
<input type="checkbox" class="filled-in" id="misskey" /> <input type="checkbox" class="filled-in" id="misskey" />
<span>@@thisismisskey@@</span> </label <span>@@thisismisskey@@</span> </label
><br /> ><br />
<button class="btn waves-effect" onclick="instance()">Login</button><br />
</div> </div>
<div class="col s4"> <div class="col s4 scr" aria-hidden="true">
<span style="font-family:Open Sans;">Supports</span> <span style="font-family:Open Sans;">Supports</span>
<div id="support" class="collection transparent"></div> <div id="support" class="collection transparent"></div>
</div> </div>
@@ -85,7 +91,7 @@
<button class="btn waves-effect" onclick="code()">Auth</button><br /> <button class="btn waves-effect" onclick="code()">Auth</button><br />
<br /> <br />
<a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a> <a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
<div id="compt" style="display:none"> <div id="compt" style="display:none" class="scr">
<h5>ログイン前に必ずご確認ください</h5> <h5>ログイン前に必ずご確認ください</h5>
<span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span <span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span
>のため以下の機能がご利用いただけません。 >のため以下の機能がご利用いただけません。
@@ -143,5 +149,6 @@
<script type="text/javascript" src="../../js/login/instance.js"></script> <script type="text/javascript" src="../../js/login/instance.js"></script>
<script type="text/javascript" src="../../js/login/manager.js"></script> <script type="text/javascript" src="../../js/login/manager.js"></script>
<script type="text/javascript" src="../../js/tl/date.js"></script> <script type="text/javascript" src="../../js/tl/date.js"></script>
<script>$('body').addClass(localStorage.getItem('platform'))</script>
</body> </body>
</html> </html>

View File

@@ -34,7 +34,7 @@
@@comment-end@@ @@pwa@@ @@comment-end@@ @@pwa@@
</head> </head>
<body> <body class="@@pwaClass@@">
<script> <script>
var ver = '@@versionLetter@@' var ver = '@@versionLetter@@'
var gitHash = '@@gitHash@@' var gitHash = '@@gitHash@@'
@@ -62,23 +62,23 @@
<div id="tl"> <div id="tl">
<!--TL--> <!--TL-->
<!--スターター--> <!--スターター-->
<div id="start"> <div id="start" class="scr">
<div id="start-content"> <div id="start-content">
<h3 class="center">@@demoBottomBtns@@</h3> <h3 class="center">@@demoBottomBtns@@</h3>
@@lookAtBottom@@ @@lookAtBottom@@
<div id="demobottom"> <div id="demobottom">
<button <button
class="btn waves-effect" class="btn waves-effect"
style="width: 300px;height: 2.5rem;line-height: 0;margin: 0; background-color: var(--accentbtn);" style="width: 23rem;height: 2.5rem;line-height: 0;margin: 0; background-color: var(--accentbtn);"
> >
<i <i
class="material-icons" class="material-icons"
style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;" style="position: relative; top: 0.4rem; font-size: 1.5rem; text-align: center; margin-right: 0.7rem;"
>edit</i >edit</i
>@@toot@@ >@@toot@@
</button> </button>
<div class="leftside reverse" id="demogroup"> <div class="leftside reverse" id="demogroup">
<div class="btnsgroup" style="margin-left: 5px;"> <div class="btnsgroup" style="margin-left: 0.4rem;">
<a href="#" class="nex waves-effect"> <a href="#" class="nex waves-effect">
<i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)" <i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)"
>account_circle</i >account_circle</i
@@ -138,11 +138,11 @@
id="acct-sel-prof" id="acct-sel-prof"
title="@@showSelectProf@@(Ctrl+Shift+P)" title="@@showSelectProf@@(Ctrl+Shift+P)"
data-trans-title="post_box_prof" data-trans-title="post_box_prof"
width="24px" style="width: 1.8rem"
/> />
</a> </a>
</div> </div>
<div class="input-field mize" style="float:left; width:calc(100% - 24px); margin-top:0;"> <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> <select id="post-acct-sel" class="acct-sel" onchange="mdCheck()"></select>
</div> </div>
<span class="cancel"> <span class="cancel">
@@ -260,7 +260,7 @@
> >
<input <input
id="size" id="size"
style="width: calc(50% - 20px); margin: 0; height: 24px;" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
value="12" value="12"
/>px />px
<i <i
@@ -271,7 +271,7 @@
> >
<input <input
id="colorhex" id="colorhex"
style="width: calc(50% - 50px); margin: 0; height: 24px;" style="width: calc(50% - 3.8rem); margin: 0; height: 1.8rem;"
type="color" type="color"
/> />
<br /> <br />
@@ -283,12 +283,12 @@
> >
<input <input
id="linkt" id="linkt"
style="width: calc(50% - 20px); margin: 0; height: 24px;" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
placeholder="リンクテキスト" placeholder="リンクテキスト"
/>&nbsp; />&nbsp;
<input <input
id="link2" id="link2"
style="width: calc(50% - 20px); margin: 0; height: 24px;" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
placeholder="リンクアドレス" placeholder="リンクアドレス"
/> />
<br /> <br />
@@ -300,12 +300,12 @@
> >
<input <input
id="image" id="image"
style="width: calc(50% - 20px); margin: 0; height: 24px;" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
placeholder="代替テキスト" placeholder="代替テキスト"
/>&nbsp; />&nbsp;
<input <input
id="image2" id="image2"
style="width: calc(50% - 20px); margin: 0; height: 24px;" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
placeholder="画像アドレス" placeholder="画像アドレス"
/> />
</div> </div>
@@ -356,7 +356,7 @@
<a class="waves-effect gray" id="cw" onclick="cw()" title="@@cwDes@@">CW</a> <a class="waves-effect gray" id="cw" onclick="cw()" title="@@cwDes@@">CW</a>
<span <span
><span id="imgup"></span ><span id="imgup"></span
><span id="imgsel" ><span id="imgsel" class="pwa"
><i ><i
class="waves-effect material-icons gray" class="waves-effect material-icons gray"
onclick="fileselect()" onclick="fileselect()"
@@ -383,13 +383,13 @@
>clear</i >clear</i
> >
</div> </div>
<div class="col s12 mize" style="margin-bottom:5px; padding:0;"> <div class="col s12 mize" style="margin-bottom:0.4rem; padding:0;">
<div id="taglist"></div> <div id="taglist"></div>
<div id="preview" class="mize"></div> <div id="preview" class="mize"></div>
<span class=" sml mize" <span class=" sml mize"
><span>@@replyMode@@</span>: <span id="rec">@@no@@</span>/<span>@@temp@@</span>: ><span>@@replyMode@@</span>: <span id="rec">@@no@@</span>/<span>@@temp@@</span>:
<span id="mec">@@nothing@@</span> <span id="mec">@@nothing@@</span>
<a onclick="stamp()" class="pointer" title="@@stampWarn@@" <a onclick="stamp()" class="pointer pwa" title="@@stampWarn@@"
>@@stamp@@: <span id="stamp">Off</span></a >@@stamp@@: <span id="stamp">Off</span></a
> >
/@@poll@@:<span id="pollsta">@@no@@</span> /@@poll@@:<span id="pollsta">@@no@@</span>
@@ -404,7 +404,7 @@
style="margin:0" style="margin:0"
/> />
<div id="sch-box"> <div id="sch-box">
@@postat@@<br /><span class="sml">@@scheduleWarn@@</span><br /> @@postat@@<br /><span class="sml">@@scheduleWarn@@</span><a onclick="expPostMode()">Expire mode(beta)</a><br />
<input <input
type="datetime-local" type="datetime-local"
id="sch-date" id="sch-date"
@@ -417,7 +417,7 @@
</div> </div>
<!-- 公開範囲 Dropdown Structure --> <!-- 公開範囲 Dropdown Structure -->
<ul id="dropdown1" class="dropdown-content"> <ul id="dropdown1" class="dropdown-content">
<li style="font-size: 16px; display: block; line-height: 22px; padding: 14px 16px;"> <li style="font-size: 1.2rem; display: block; line-height: 1.69rem; padding: 1.1rem 1.23rem;">
@@selectVis@@ @@selectVis@@
</li> </li>
<li> <li>
@@ -442,10 +442,13 @@
<!-- その他 Dropdown Structure --> <!-- その他 Dropdown Structure -->
<ul id="dropdown2" class="dropdown-content"> <ul id="dropdown2" class="dropdown-content">
<li> <li>
<a onclick="nowplaying('spotify');">@@NPSpotify@@</a> <a onclick="nowplaying('spotify');">NowPlaying (Spotify)</a>
</li>
<li class="mac">
<a onclick="nowplaying('itunes');">NowPlaying (iTunes macOS)</a>
</li> </li>
<li> <li>
<a onclick="nowplaying('itunes');">@@NPiTunes@@</a> <a onclick="nowplaying('lastFm');">NowPlaying (Last.fm)</a>
</li> </li>
<li> <li>
<a onclick="schedule();">@@schedule@@</a> <a onclick="schedule();">@@schedule@@</a>
@@ -764,7 +767,7 @@
<span id="his-follow"></span> <span id="his-follow"></span>
</span> </span>
<span class="cbadge">@@follower@@: <span id="his-follower"></span> </span><br /> <span class="cbadge">@@follower@@: <span id="his-follower"></span> </span><br />
<span class="cbadge" style="max-width:150px; width:150px; " <span class="cbadge" style="max-width:11.5rem; width:11.5rem; "
>Since: >Since:
<span id="his-since"></span> <span id="his-since"></span>
</span> </span>
@@ -889,19 +892,21 @@
><i class="material-icons">account_box</i>@@operateOtherAcct@@</a ><i class="material-icons">account_box</i>@@operateOtherAcct@@</a
> >
</li> </li>
<li class="anc-link" go="#his-matching-list">
<a href="#" title="@@likeUserDes@@"
><i class="material-icons">group_work</i>User Matching</a
>
</li>
</ul> </ul>
</div> </div>
<div id="his-tl" class="his-var-content"> <div id="his-tl" class="his-var-content">
<button
class="btn waves-effect grey"
style="width:100%; padding:0;"
onclick="utlAdd()"
>
@@utlColumn@@
</button>
<div id="his-tl-contents" class="cont-series"></div> <div id="his-tl-contents" class="cont-series"></div>
<button <button
class="btn waves-effect " class="btn waves-effect "
style="width:100%; padding:0;" style="width:100%; padding:0;"
onclick="utl('--now','more')" onclick="utlShow('--now','more')"
> >
@@more@@ @@more@@
</button> </button>
@@ -1037,19 +1042,6 @@
<div id="his-follow-recom-list" class="his-var-content"> <div id="his-follow-recom-list" class="his-var-content">
<div id="his-follow-recom-contents" class="cont-series"></div> <div id="his-follow-recom-contents" class="cont-series"></div>
</div> </div>
<div id="his-matching-list" class="his-var-content">
@@likeUserDes@@<br />
Powered by <a href="https://distsn.org/" target="_blank">Mastodon User Matching</a
><br />
<div id="his-matching-list-contents" class="cont-series"></div>
<button
class="btn waves-effect "
onclick="showMat()"
style="width:100%; padding:0;"
>
@@get@@
</button>
</div>
<div id="his-float-blocked"> <div id="his-float-blocked">
<div>@@blocked@@</div> <div>@@blocked@@</div>
</div> </div>
@@ -1080,7 +1072,7 @@
<br /> <br />
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div style="float: left;padding-top:3px;line-height: normal;"> <div style="float: left;padding-top:0.23rem;line-height: normal;">
<span id="imgprog"></span>% <br /> <span id="imgprog"></span>% <br />
<span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB <span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
</div> </div>
@@ -1128,76 +1120,24 @@
> >
</div> </div>
</div> </div>
<!--mstdn.jp useragent-->
<div
id="askjp_jp_ua"
class="hide"
style="z-index:505;width:100vw;height:100vh; background-color: #530f0f;color:white;padding:20px;overflow-y:scroll;position:absolute;"
>
<p style="font-size:300%">【緊急】mstdn.jpへのアクセスについて</p>
<br />
<p style="font-size:200%">問題の概要</p>
<p>
合同会社分散型ソーシャルネットワーク機構は非公開審査によってユーザーエージェントベースで個々のアプリに対してAPIへのアクセスを許可する方法を取っています。
</p>
<p>
TheDesk開発者はこれに強く反発し、TheDeskのユーザーエージェントをそのアプリからのアクセスであると特定することができない値にすることを決めました。
</p>
<p>具体的には、"Mastodon client: [起動毎に変わる100文字の英数記号]"と設定しました。</p>
<p style="font-size:200%">ユーザーによる対策</p>
<p>
このバージョンのTheDeskでは任意のユーザーエージェントを適用できます。「設定」内の「環境設定」で設定していただけます。<a
href="setting.html"
>設定</a
>
</p>
<p style="font-size:150%">1. 「TheDesk」を含む値に設定する</p>
<p>
「設定」内の「環境設定」、「ユーザーエージェント」に「TheDesk」を含む値を入れてください。大文字小文字に注意してください。
</p>
<p><b>懸念点</b></p>
<p>
TheDesk開発者は合同会社分散型ソーシャルネットワーク機構に対しこの件についてメールで問い合わせを行っています(抗議ではありません)。問い合わせの過程でアプリ許可が取り消され、使用不能になる可能性があります。
</p>
<p><u>ちなみに</u></p>
<p>
合同会社分散型ソーシャルネットワーク機構はmstdn.jpのお知らせアカウントに対するリプライに書かれたサードパーティクライアントを「審査」の後許可するとトゥートし、複数ユーザーがTheDeskの名前を挙げました。
事実、トゥートの翌日までにTheDeskに対してアクセス許可が出されました。しかし、許可を出す際にTheDeskの標準ユーザーエージェントを機構は一切確認せず、「TheDesk」という文字列が入ったユーザーエージェントを一律で許可する設定にしたようです。
結果として実際の標準ユーザーエージェントはそれに合致せず、不許可のままとなっていました。前バージョンまでの標準ユーザーエージェントは、パッケージ名の都合上全て小文字の「thedesk」を採用していました。
</p>
<p style="font-size:150%">2. 「認定済み」クライアントの名前を含む値に設定する</p>
<p>
「設定」内の「環境設定」、「ユーザーエージェント」に、<a href="https://mstdn.jp/about"
>mstdn.jpのトップページ</a
>記載のアプリ名を含む値を入れてください。大文字小文字やスペースに注意してください。
</p>
<p>
「Mastodon日本鯖です」と書かれた以降の一段を全てコピーして記載してもアクセス可能です。<u
>これほどまでにユーザーエージェント制限は「抜け道」が多いのです。</u
><a href="setting.html">設定</a>
</p>
<p><b>懸念点</b></p>
<p>
その記載されたアプリと合同会社分散型ソーシャルネットワーク機構になんの関係があるかは知りませんが、どちらにしろ他のクライアントの名を借りてアクセスの許可をいただくというあまり道徳的によろしくない方法です。
</p>
<button onclick="$('#askjp_jp_ua').addClass('hide')" class="btn waves-effect">閉じる</button>
</div>
<!-- Modal Structure Release Note--> <!-- Modal Structure Release Note-->
<div id="releasenote" class="modal modal-fixed-footer"> <div id="releasenote" class="modal modal-fixed-footer scr">
<div class="modal-content"> <div class="modal-content">
<h3>TheDesk</h3> <h3>TheDesk</h3>
<a href="https://thedesk.top" target="_blank">HP</a><br /> <a href="https://thedesk.top" target="_blank">HP</a><br />
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br /> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
<br /> <br />
<div id="release-20-3-2_Kawaii" class="release-do" style="display:none; "> <div id="release-21-0-4_Mayu" class="release-do" style="display:none; ">
<br /> <br />
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br /> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br />
Pixiv Pixiv
FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br /> FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note 20.3.2 (Kawaii)</h5> <h5>Release Note 21.0.4 (Mayu)</h5>
・Pleromaでメディアアップロードができない不具合 <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a><br> <!--上のdivのidも変えてね-->
・起動しないバグ <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
・引用可能なインスタンスで、すべてのトゥートがミュートされた引用になってしまうバグ heguro<br>
</div> </div>
<div id="release-en" style="display:none"> <div id="release-en" style="display:none">
<h5>Let's make it native!</h5> <h5>Let's make it native!</h5>
@@ -1264,30 +1204,30 @@
</span> </span>
<div id="menu-wrapper"> <div id="menu-wrapper">
<div id="left-menu"> <div id="left-menu">
<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"> <a class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu">
<i class="material-icons">add</i><span>@@addColumn@@</span> <i class="material-icons" aria-hidden="true">add</i><span>@@addColumn@@</span>
</div> </a>
<div class="waves-effect" onclick="sortMenu()" id="sortMenu"> <a class="waves-effect" onclick="sortMenu()" id="sortMenu">
<i class="material-icons">sort</i><span>@@sortColumns@@</span> <i class="material-icons" aria-hidden="true">sort</i><span>@@sortColumns@@</span>
</div> </a>
<div class="waves-effect" onclick="searchMenu()" id="searchMenu"> <a class="waves-effect" onclick="searchMenu()" id="searchMenu">
<i class="material-icons">search</i><span>@@search@@</span> <i class="material-icons" aria-hidden="true">search</i><span>@@search@@</span>
</div> </a>
<div class="waves-effect" onclick="listMenu()" id="listMenu"> <a class="waves-effect" onclick="listMenu()" id="listMenu">
<i class="material-icons">view_headline</i><span>@@list@@</span> <i class="material-icons" aria-hidden="true">view_headline</i><span>@@list@@</span>
</div> </a>
<div class="waves-effect" onclick="dirMenu()" id="dirMenu"> <a class="waves-effect" onclick="dirMenu()" id="dirMenu">
<i class="material-icons">recent_actors</i><span>@@directory@@</span> <i class="material-icons" aria-hidden="true">recent_actors</i><span>@@directory@@</span>
</div> </a>
<div class="waves-effect" onclick="filterMenu()" id="filterMenu"> <a class="waves-effect" onclick="filterMenu()" id="filterMenu">
<i class="material-icons">filter_list</i><span>@@filter@@</span> <i class="material-icons" aria-hidden="true">filter_list</i><span>@@filter@@</span>
</div> </a>
<div class="waves-effect" onclick="help()" id="helpMenu"> <a class="waves-effect" onclick="help()" id="helpMenu">
<i class="material-icons">help_outline</i><span>@@helpAndLogs@@</span> <i class="material-icons" aria-hidden="true">help_outline</i><span>@@helpAndLogs@@</span>
</div> </a>
<div class="waves-effect" onclick="location.href='index.html'"> <a class="waves-effect" onclick="location.href='index.html'">
<i class="material-icons">refresh</i><span>@@f5@@</span> <i class="material-icons" aria-hidden="true">refresh</i><span>@@f5@@</span>
</div> </a>
</div> </div>
<div id="right-menu"> <div id="right-menu">
<!--カラム追加--> <!--カラム追加-->
@@ -1308,46 +1248,46 @@
<input type="hidden" value="local" id="type-sel" /> <input type="hidden" value="local" id="type-sel" />
@@showThisTL@@ @@showThisTL@@
<div id="tltype"> <div id="tltype">
<div class="type waves-effect active" data-type="local"> <a class="type waves-effect active" data-type="local">
<div><i class="material-icons">people_outline</i></div> <div><i class="material-icons" aria-hidden="true">people_outline</i></div>
<span>@@local@@</span> <span>@@local@@</span>
</div> </a>
<div class="type waves-effect" data-type="local-media"> <a class="type waves-effect" data-type="local-media">
<div><i class="material-icons">perm_media</i></div> <div><i class="material-icons" aria-hidden="true">perm_media</i></div>
<span>@@localMedia@@</span> <span>@@localMedia@@</span>
</div> </a>
<div class="type waves-effect" data-type="home"> <a class="type waves-effect" data-type="home">
<div><i class="material-icons">home</i></div> <div><i class="material-icons" aria-hidden="true">home</i></div>
<span>@@home@@</span> <span>@@home@@</span>
</div> </a>
<div class="type waves-effect" data-type="pub"> <a class="type waves-effect" data-type="pub">
<div><i class="material-icons">language</i></div> <div><i class="material-icons" aria-hidden="true">language</i></div>
<span>@@fed@@</span> <span>@@fed@@</span>
</div> </a>
<div class="type waves-effect" data-type="pub-media"> <a class="type waves-effect" data-type="pub-media">
<div><i class="material-icons">perm_media</i></div> <div><i class="material-icons" aria-hidden="true">perm_media</i></div>
<span>@@fedMedia@@</span> <span>@@fedMedia@@</span>
</div> </a>
<div class="type waves-effect" data-type="dm"> <a class="type waves-effect" data-type="dm">
<div><i class="material-icons">mail_outline</i></div> <div><i class="material-icons" aria-hidden="true">mail_outline</i></div>
<span>@@dm@@</span> <span>@@dm@@</span>
</div> </a>
<div class="type waves-effect" data-type="mix"> <a class="type waves-effect" data-type="mix">
<div><i class="material-icons">merge_type</i></div> <div><i class="material-icons" aria-hidden="true">merge_type</i></div>
<span>@@integratedTLDes@@</span> <span>@@integratedTLDes@@</span>
</div> </a>
<div class="type waves-effect" data-type="plus"> <a class="type waves-effect" data-type="plus">
<div><i class="material-icons">reply</i></div> <div><i class="material-icons" aria-hidden="true">reply</i></div>
<span>@@localPlusDes@@</span> <span>@@localPlusDes@@</span>
</div> </a>
<div class="type waves-effect" data-type="notf"> <a class="type waves-effect" data-type="notf">
<div><i class="material-icons">notifications</i></div> <div><i class="material-icons" aria-hidden="true">notifications</i></div>
<span>@@notf@@</span> <span>@@notf@@</span>
</div> </a>
<div class="type waves-effect" data-type="bookmark"> <a class="type waves-effect" data-type="bookmark">
<div><i class="material-icons">bookmark</i></div> <div><i class="material-icons" aria-hidden="true">bookmark</i></div>
<span>@@bookmark@@</span> <span>@@bookmark@@</span>
</div> </a>
</div> </div>
</div> </div>
<div id="noauth" class="hide"> <div id="noauth" class="hide">
@@ -1356,7 +1296,7 @@
id="noauth-url" id="noauth-url"
type="text" type="text"
class="validate" class="validate"
style="width:calc( 70% - 40px);" style="width:calc( 70% - 3rem);"
placeholder="e.g:mstdn.jp" placeholder="e.g:mstdn.jp"
/> />
</div> </div>
@@ -1364,7 +1304,7 @@
</div> </div>
<button <button
class="btn waves-effect blue " class="btn waves-effect blue "
style="width:calc( 100% - 10px);" style="width:calc( 100% - 0.7rem);"
onclick="addColumn()" onclick="addColumn()"
data-trans-i="add" data-trans-i="add"
> >
@@ -1379,11 +1319,11 @@
<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select> <select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
</div> </div>
<div class="input-field"> <div class="input-field">
<input id="src" type="text" class="validate" style="width:60%" /> <input id="src" type="text" class="validate" style="width:57%" />
<label for="src" data-trans="src">@@search@@</label> <label for="src" data-trans="src">@@search@@</label>
<button <button
class="btn waves-effect indigo" class="btn waves-effect indigo"
style="width: 36%;padding: 0;padding-left: 15px;" style="width: 36%;padding: 0;padding-left: 1.15rem;"
onclick="src()" onclick="src()"
data-trans-i="src" data-trans-i="src"
> >
@@ -1406,12 +1346,12 @@
id="dirNoAuth-url" id="dirNoAuth-url"
type="text" type="text"
class="validate" class="validate"
style="width:calc( 70% - 40px);" style="width:calc( 70% - 3rem);"
placeholder="e.g:mastodon.social" placeholder="e.g:mastodon.social"
/> />
<button <button
class="btn waves-effect indigo" class="btn waves-effect indigo"
style="width: 120px;padding: 0;padding-left: 15px;" style="width: 9.23rem;padding: 0;padding-left: 1.15rem;"
onclick="directory()" onclick="directory()"
> >
<i class="material-icons left" style="margin:0">search</i>@@show@@ <i class="material-icons left" style="margin:0">search</i>@@show@@
@@ -1531,6 +1471,10 @@
<input type="checkbox" class="filled-in" id="conv_filter" value="thread" /> <input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
<span>@@conver@@</span> <span>@@conver@@</span>
</label> </label>
<label>
<input type="checkbox" class="filled-in" id="prof_filter" value="profiles" />
<span>@@prof@@</span>
</label><br />
@@option@@<br /> @@option@@<br />
<label> <label>
<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" /> <input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
@@ -1594,7 +1538,7 @@
</div> </div>
</div> </div>
</div> </div>
<a onclick="about()" class="nex waves-effect"> <a onclick="about()" class="nex waves-effect pwa">
<i class="material-icons" style="font-size: 1rem;">info</i>@@about@@ </a <i class="material-icons" style="font-size: 1rem;">info</i>@@about@@ </a
>&nbsp;|&nbsp; >&nbsp;|&nbsp;
<a onclick="bottomReverse()" class="nex waves-effect"> <a onclick="bottomReverse()" class="nex waves-effect">
@@ -1628,7 +1572,7 @@
> >
<i <i
class="material-icons" class="material-icons"
style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;" style="position: relative; top: 0.38rem; font-size: 1.5rem; text-align: center; margin-right: 0.76rem;"
>edit</i >edit</i
>@@toot@@ >@@toot@@
</button> </button>
@@ -1643,7 +1587,7 @@
<a href="setting.html" class="nex waves-effect"> <a href="setting.html" class="nex waves-effect">
<i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i> <i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
</a> </a>
<a onclick="nano()" class="nex waves-effect"> <a onclick="nano()" class="nex waves-effect pwa">
<i class="material-icons" title="@@nanoDes@@TheDesk Nano" data-trans-title="nano_desp" <i class="material-icons" title="@@nanoDes@@TheDesk Nano" data-trans-title="nano_desp"
>remove_from_queue</i >remove_from_queue</i
> >
@@ -1666,7 +1610,7 @@
</div> </div>
<div> <div>
<div id="tips-menu"> <div id="tips-menu">
<div class="btnsgroup" style="height:34px"> <div class="btnsgroup" style="height:2.61rem">
<span class="grouptitle">Tips:</span> <span class="grouptitle">Tips:</span>
<a onclick="tips('ver')" class="nex waves-effect"> <a onclick="tips('ver')" class="nex waves-effect">
<i class="material-icons nex" title="@@verTips@@" data-trans-title="ver">info</i> <i class="material-icons nex" title="@@verTips@@" data-trans-title="ver">info</i>
@@ -1676,7 +1620,7 @@
>access_time</i >access_time</i
> >
</a> </a>
<a onclick="tips('memory')" class="nex waves-effect"> <a onclick="tips('memory')" class="nex waves-effect pwa">
<i class="material-icons nex" title="@@ramTips@@" data-trans-title="memory">memory</i> <i class="material-icons nex" title="@@ramTips@@" data-trans-title="memory">memory</i>
</a> </a>
<a onclick="tips('trend')" class="nex waves-effect imasonly" style="display:none;"> <a onclick="tips('trend')" class="nex waves-effect imasonly" style="display:none;">
@@ -1698,12 +1642,12 @@
>bubble_chart</i >bubble_chart</i
> >
</a> </a>
<div id="tips-text" style="width:300px;"></div> <div id="tips-text" style="width:23rem;"></div>
</div> </div>
</div> </div>
</div> </div>
<!--Support me--> <!--Support me-->
<div id="support-btm" class="z-depth-4 hide"> <div id="support-btm" class="z-depth-4 hide scr">
<div id="support-btm-ja"> <div id="support-btm-ja">
<h5>ご支援いただけませんか?</h5> <h5>ご支援いただけませんか?</h5>
(これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br /> (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br />

View File

@@ -2,6 +2,7 @@
"list": "List of accounts", "list": "List of accounts",
"back": "Back", "back": "Back",
"add": "Add an account", "add": "Add an account",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)", "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
"codesetup": "Code setup", "codesetup": "Code setup",
"mainacct": "Main an account", "mainacct": "Main an account",
@@ -19,5 +20,6 @@
"thisismisskey": "Login as Misskey", "thisismisskey": "Login as Misskey",
"misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.", "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
"nodata": "No data", "nodata": "No data",
"accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)" "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"
} }

View File

@@ -11,8 +11,6 @@
"cwDes": "Hide text behind warning", "cwDes": "Hide text behind warning",
"selfile": "Attach..", "selfile": "Attach..",
"insertEmoji": "Emojis", "insertEmoji": "Emojis",
"NPSpotify": "NowPlaying(Spotify)",
"NPiTunes": "NowPlaying(macOS)",
"schedule": "Scheduled toot", "schedule": "Scheduled toot",
"postat": "Post at", "postat": "Post at",
"scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
"follower": "Follower", "follower": "Follower",
"utlColumn": "Show as a column",
"timeline": "Timeline", "timeline": "Timeline",
"operateOtherAcct": "Cross-account", "operateOtherAcct": "Cross-account",
"list": "List", "list": "List",
@@ -140,6 +139,7 @@
"filterWord": "Filtering words", "filterWord": "Filtering words",
"degree": "Filter contexts", "degree": "Filter contexts",
"conver": "Conversations", "conver": "Conversations",
"prof": "Profiles",
"option": "Options", "option": "Options",
"matchWord": "Whole word", "matchWord": "Whole word",
"warnMatchWord": "Nice for Latin language", "warnMatchWord": "Nice for Latin language",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Click to add description, right-click to delete this", "lang_postimg_delete": "Click to add description, right-click to delete this",
"lang_postimg_desc": "Description", "lang_postimg_desc": "Description",
"lang_postimg_leadContext": "right-click the thumbnail to delete this", "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": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?", "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
"lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.", "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
"lang_post_cwtitle": "Auto CW Alert", "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Cancel (will not post)", "lang_post_btn1": "Cancel (will not post)",
"lang_post_btn2": "Make text hidden automatically", "lang_post_btn2": "Make text hidden automatically",
"lang_post_btn3": "Continue to post", "lang_post_btn3": "Continue to post",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "It will take a miunte to favourite a remote toot.", "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_btWarn": "It will take a miunte to boost a remote toot.",
"lang_status_follow": "Follow", "lang_status_follow": "Follow",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "Remove this column", "lang_layout_delthis": "Remove this column",
"lang_layout_setthis": "Preferences of this column", "lang_layout_setthis": "Preferences of this column",
"lang_layout_mediafil": "Media filtering", "lang_layout_mediafil": "Media filtering",
"lang_layout_remoteOnly": "Remote only",
"lang_layout_linkana": "Auto Link Analyzer", "lang_layout_linkana": "Auto Link Analyzer",
"lang_layout_linkanades": "Auto link analyzer", "lang_layout_linkanades": "Auto link analyzer",
"lang_layout_tts": "Text to speech ", "lang_layout_tts": "Text to speech ",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "Domain ", "lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.", "lang_showontl_listwarn": "Follow to add this user to lists.",
"lang_showontl_verified": "This website is verified by owner at ", "lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " replied to you", "lang_parse_mentioned": " replied to you",
"lang_parse_faved": " favourited your toot", "lang_parse_faved": " favourited your toot",
"lang_parse_bted": " boosted your toot", "lang_parse_bted": " boosted your toot",
@@ -168,6 +174,7 @@
"lang_parse_polled": "'s poll", "lang_parse_polled": "'s poll",
"lang_parse_notftime": "Actioned at", "lang_parse_notftime": "Actioned at",
"lang_parse_cwshow": "Show", "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_fulltext": "Full size text:",
"lang_parse_autofold": "Auto folded", "lang_parse_autofold": "Auto folded",
"lang_parse_more": "More", "lang_parse_more": "More",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "sensitive media", "lang_parse_nsfw": "sensitive media",
"lang_parse_html": "Show embed HTML", "lang_parse_html": "Show embed HTML",
"lang_parse_notffilter": "Show this user's notifications", "lang_parse_notffilter": "Show this user's notifications",
"lang_parse_hidden": "Unvisible quoted toot",
"lang_misskeyparse_renote": "Repost", "lang_misskeyparse_renote": "Repost",
"lang_misskeyparse_renoteqt": "Renote", "lang_misskeyparse_renoteqt": "Renote",
"lang_misskeyparse_reaction": "Reaction", "lang_misskeyparse_reaction": "Reaction",

View File

@@ -167,12 +167,15 @@
"linkwarn": "TheDesk save your data on thedesk.top server.", "linkwarn": "TheDesk save your data on thedesk.top server.",
"connect": "Connect", "connect": "Connect",
"disconnect": "Disconnect", "disconnect": "Disconnect",
"lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
"templateedit": "Edit a template", "templateedit": "Edit a template",
"templateeditwarn": "", "templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "", "template3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect", "bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -2,6 +2,7 @@
"list": "List of accounts", "list": "List of accounts",
"back": "Back", "back": "Back",
"add": "Add an account", "add": "Add an account",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)", "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
"codesetup": "Code setup", "codesetup": "Code setup",
"mainacct": "Main an account", "mainacct": "Main an account",
@@ -19,5 +20,6 @@
"thisismisskey": "Login as Misskey", "thisismisskey": "Login as Misskey",
"misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.", "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
"nodata": "No data", "nodata": "No data",
"accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)" "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"
} }

View File

@@ -11,8 +11,6 @@
"cwDes": "Hide text behind warning", "cwDes": "Hide text behind warning",
"selfile": "Attach..", "selfile": "Attach..",
"insertEmoji": "Emojis", "insertEmoji": "Emojis",
"NPSpotify": "NowPlaying(Spotify)",
"NPiTunes": "NowPlaying(macOS)",
"schedule": "Scheduled toot", "schedule": "Scheduled toot",
"postat": "Post at", "postat": "Post at",
"scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
"follower": "Follower", "follower": "Follower",
"utlColumn": "Show as a column",
"timeline": "Timeline", "timeline": "Timeline",
"operateOtherAcct": "Cross-account", "operateOtherAcct": "Cross-account",
"list": "List", "list": "List",
@@ -140,6 +139,7 @@
"filterWord": "Filtering words", "filterWord": "Filtering words",
"degree": "Filter contexts", "degree": "Filter contexts",
"conver": "Conversations", "conver": "Conversations",
"prof": "Profiles",
"option": "Options", "option": "Options",
"matchWord": "Whole word", "matchWord": "Whole word",
"warnMatchWord": "Nice for Latin language", "warnMatchWord": "Nice for Latin language",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Click to add description, right-click to delete this", "lang_postimg_delete": "Click to add description, right-click to delete this",
"lang_postimg_desc": "Description", "lang_postimg_desc": "Description",
"lang_postimg_leadContext": "right-click the thumbnail to delete this", "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": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?", "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
"lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.", "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
"lang_post_cwtitle": "Auto CW Alert", "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Cancel (will not post)", "lang_post_btn1": "Cancel (will not post)",
"lang_post_btn2": "Make text hidden automatically", "lang_post_btn2": "Make text hidden automatically",
"lang_post_btn3": "Continue to post", "lang_post_btn3": "Continue to post",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "It will take a miunte to favourite a remote toot.", "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_btWarn": "It will take a miunte to boost a remote toot.",
"lang_status_follow": "Follow", "lang_status_follow": "Follow",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "Remove this column", "lang_layout_delthis": "Remove this column",
"lang_layout_setthis": "Preferences of this column", "lang_layout_setthis": "Preferences of this column",
"lang_layout_mediafil": "Media filtering", "lang_layout_mediafil": "Media filtering",
"lang_layout_remoteOnly": "Remote only",
"lang_layout_linkana": "Auto Link Analyzer", "lang_layout_linkana": "Auto Link Analyzer",
"lang_layout_linkanades": "Auto link analyzer", "lang_layout_linkanades": "Auto link analyzer",
"lang_layout_tts": "Text to speech ", "lang_layout_tts": "Text to speech ",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "Domain ", "lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.", "lang_showontl_listwarn": "Follow to add this user to lists.",
"lang_showontl_verified": "This website is verified by owner at ", "lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " replied to you", "lang_parse_mentioned": " replied to you",
"lang_parse_faved": " favourited your toot", "lang_parse_faved": " favourited your toot",
"lang_parse_bted": " boosted your toot", "lang_parse_bted": " boosted your toot",
@@ -168,6 +174,7 @@
"lang_parse_polled": "'s poll", "lang_parse_polled": "'s poll",
"lang_parse_notftime": "Actioned at", "lang_parse_notftime": "Actioned at",
"lang_parse_cwshow": "Show", "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_fulltext": "Full size text:",
"lang_parse_autofold": "Auto folded", "lang_parse_autofold": "Auto folded",
"lang_parse_more": "More", "lang_parse_more": "More",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "sensitive media", "lang_parse_nsfw": "sensitive media",
"lang_parse_html": "Show embed HTML", "lang_parse_html": "Show embed HTML",
"lang_parse_notffilter": "Show this user's notifications", "lang_parse_notffilter": "Show this user's notifications",
"lang_parse_hidden": "Unvisible quoted toot",
"lang_misskeyparse_renote": "Repost", "lang_misskeyparse_renote": "Repost",
"lang_misskeyparse_renoteqt": "Renote", "lang_misskeyparse_renoteqt": "Renote",
"lang_misskeyparse_reaction": "Reaction", "lang_misskeyparse_reaction": "Reaction",

View File

@@ -167,12 +167,15 @@
"linkwarn": "TheDesk save your data on thedesk.top server.", "linkwarn": "TheDesk save your data on thedesk.top server.",
"connect": "Connect", "connect": "Connect",
"disconnect": "Disconnect", "disconnect": "Disconnect",
"lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
"templateedit": "Edit a template", "templateedit": "Edit a template",
"templateeditwarn": "", "templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "", "template3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect", "bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -2,6 +2,7 @@
"list": "Списък на профилите", "list": "Списък на профилите",
"back": "Назад", "back": "Назад",
"add": "Добавяне на профил", "add": "Добавяне на профил",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Премахнете отметката за да пропуснете влизането с код. (Вход в Mastodon от Windows или macOS) (Препоръчително: pcheck)", "codesetupwarn": "Премахнете отметката за да пропуснете влизането с код. (Вход в Mastodon от Windows или macOS) (Препоръчително: pcheck)",
"codesetup": "Настройка на код", "codesetup": "Настройка на код",
"mainacct": "Основен профил", "mainacct": "Основен профил",
@@ -19,5 +20,6 @@
"thisismisskey": "Влезте като Misskey", "thisismisskey": "Влезте като Misskey",
"misskeylogin": "Прочетете <a href=\"https://thedesk.top/how-to-misskey-login.html\">Документацията</a>, за да влезете в Misskey.", "misskeylogin": "Прочетете <a href=\"https://thedesk.top/how-to-misskey-login.html\">Документацията</a>, за да влезете в Misskey.",
"nodata": "Няма данни", "nodata": "Няма данни",
"accessTokenSetup": "Използвайте маркера за достъп и вход (щракнете след попълване, но не код, а знак за достъп в поле: Разширено)" "accessTokenSetup": "Използвайте маркера за достъп и вход (щракнете след попълване, но не код, а знак за достъп в поле: Разширено)",
"haveExported": "Having the exported file of TheDesk, click here to jump setting page"
} }

View File

@@ -11,8 +11,6 @@
"cwDes": "Скриване на текста зад предупреждение", "cwDes": "Скриване на текста зад предупреждение",
"selfile": "Прикачи..", "selfile": "Прикачи..",
"insertEmoji": "Емотикони", "insertEmoji": "Емотикони",
"NPSpotify": "Възпроизвеждане сега (Spotify)",
"NPiTunes": "Възпроизвеждане сега (macOS)",
"schedule": "Планиран тоот", "schedule": "Планиран тоот",
"postat": "Публикация в", "postat": "Публикация в",
"scheduleWarn": "2.7.0 ~ Минимален интервал от време:5мин. (часовникът на сървъра може да не е точен.)", "scheduleWarn": "2.7.0 ~ Минимален интервал от време:5мин. (часовникът на сървъра може да не е точен.)",
@@ -77,6 +75,7 @@
"toots": "Тоот", "toots": "Тоот",
"follow": "Следвам", "follow": "Следвам",
"follower": "Последователи", "follower": "Последователи",
"utlColumn": "Show as a column",
"timeline": "Времева линия", "timeline": "Времева линия",
"operateOtherAcct": "Свързан-профил", "operateOtherAcct": "Свързан-профил",
"list": "Списък", "list": "Списък",
@@ -140,6 +139,7 @@
"filterWord": "Филтриране на думи", "filterWord": "Филтриране на думи",
"degree": "Контекстно филтриране", "degree": "Контекстно филтриране",
"conver": "Разговори", "conver": "Разговори",
"prof": "Profiles",
"option": "Настройки", "option": "Настройки",
"matchWord": "Цяла дума", "matchWord": "Цяла дума",
"warnMatchWord": "Ница на латински език", "warnMatchWord": "Ница на латински език",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Кликнете за да добавите описание, щракнете с десния бутон за да го изтриете", "lang_postimg_delete": "Кликнете за да добавите описание, щракнете с десния бутон за да го изтриете",
"lang_postimg_desc": "Описание", "lang_postimg_desc": "Описание",
"lang_postimg_leadContext": "щракнете с десния бутон върху миниатюрата за да изтриете това", "lang_postimg_leadContext": "щракнете с десния бутон върху миниатюрата за да изтриете това",
"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": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?", "lang_post_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
"lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.", "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
"lang_post_cwtitle": "Авто CW Сигнал", "lang_post_cwtitle": "Авто CW Сигнал",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Отказ (няма да се публикува)", "lang_post_btn1": "Отказ (няма да се публикува)",
"lang_post_btn2": "Текстът да се скрива автоматично", "lang_post_btn2": "Текстът да се скрива автоматично",
"lang_post_btn3": "Продължете към публикуването", "lang_post_btn3": "Продължете към публикуването",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "Ще отнеме минута раздумката отдалечено да стане любима.", "lang_status_favWarn": "Ще отнеме минута раздумката отдалечено да стане любима.",
"lang_status_btWarn": "Ще отнеме минута раздумката отдалечено да бъде подсилена.", "lang_status_btWarn": "Ще отнеме минута раздумката отдалечено да бъде подсилена.",
"lang_status_follow": "Следване", "lang_status_follow": "Следване",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "Премахване на тази колона", "lang_layout_delthis": "Премахване на тази колона",
"lang_layout_setthis": "Предпочитания за тази колона", "lang_layout_setthis": "Предпочитания за тази колона",
"lang_layout_mediafil": "Филтриране на медиите", "lang_layout_mediafil": "Филтриране на медиите",
"lang_layout_remoteOnly": "Remote only",
"lang_layout_linkana": "Автоматичен анализатор на връзки", "lang_layout_linkana": "Автоматичен анализатор на връзки",
"lang_layout_linkanades": "Автоматичен анализатор на връзки", "lang_layout_linkanades": "Автоматичен анализатор на връзки",
"lang_layout_tts": "Текст към говор ", "lang_layout_tts": "Текст към говор ",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "Domain ", "lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Следвайте, за да добавите този потребител към списъците.", "lang_showontl_listwarn": "Следвайте, за да добавите този потребител към списъците.",
"lang_showontl_verified": "This website is verified by owner at ", "lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " replied to you", "lang_parse_mentioned": " replied to you",
"lang_parse_faved": " favourited your toot", "lang_parse_faved": " favourited your toot",
"lang_parse_bted": " boosted your toot", "lang_parse_bted": " boosted your toot",
@@ -168,6 +174,7 @@
"lang_parse_polled": "'s poll", "lang_parse_polled": "'s poll",
"lang_parse_notftime": "Actioned at", "lang_parse_notftime": "Actioned at",
"lang_parse_cwshow": "Покажи", "lang_parse_cwshow": "Покажи",
"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_fulltext": "Full size text:",
"lang_parse_autofold": "Auto folded", "lang_parse_autofold": "Auto folded",
"lang_parse_more": "Още", "lang_parse_more": "Още",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "NSFW media", "lang_parse_nsfw": "NSFW media",
"lang_parse_html": "Показване на вграденият HTML код", "lang_parse_html": "Показване на вграденият HTML код",
"lang_parse_notffilter": "Показване на известията от този потребител", "lang_parse_notffilter": "Показване на известията от този потребител",
"lang_parse_hidden": "Unvisible quoted toot",
"lang_misskeyparse_renote": "Повторно публикуване", "lang_misskeyparse_renote": "Повторно публикуване",
"lang_misskeyparse_renoteqt": "Повторна бележка", "lang_misskeyparse_renoteqt": "Повторна бележка",
"lang_misskeyparse_reaction": "Реакция", "lang_misskeyparse_reaction": "Реакция",

View File

@@ -167,12 +167,15 @@
"linkwarn": "TheDesk save your data on thedesk.top server.", "linkwarn": "TheDesk save your data on thedesk.top server.",
"connect": "Connect", "connect": "Connect",
"disconnect": "Disconnect", "disconnect": "Disconnect",
"lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
"templateedit": "Edit a template", "templateedit": "Edit a template",
"templateeditwarn": "", "templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "", "template3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect", "bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -2,6 +2,7 @@
"list": "List of accounts", "list": "List of accounts",
"back": "Back", "back": "Back",
"add": "Add an account", "add": "Add an account",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)", "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
"codesetup": "Code setup", "codesetup": "Code setup",
"mainacct": "Main an account", "mainacct": "Main an account",
@@ -19,5 +20,6 @@
"thisismisskey": "Login as Misskey", "thisismisskey": "Login as Misskey",
"misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.", "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
"nodata": "No data", "nodata": "No data",
"accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)" "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"
} }

View File

@@ -11,8 +11,6 @@
"cwDes": "Hide text behind warning", "cwDes": "Hide text behind warning",
"selfile": "Attach..", "selfile": "Attach..",
"insertEmoji": "Emojis", "insertEmoji": "Emojis",
"NPSpotify": "NowPlaying(Spotify)",
"NPiTunes": "NowPlaying(macOS)",
"schedule": "Scheduled toot", "schedule": "Scheduled toot",
"postat": "Post at", "postat": "Post at",
"scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
"follower": "Follower", "follower": "Follower",
"utlColumn": "Show as a column",
"timeline": "Timeline", "timeline": "Timeline",
"operateOtherAcct": "Cross-account", "operateOtherAcct": "Cross-account",
"list": "List", "list": "List",
@@ -140,6 +139,7 @@
"filterWord": "Filtering words", "filterWord": "Filtering words",
"degree": "Filter contexts", "degree": "Filter contexts",
"conver": "Conversations", "conver": "Conversations",
"prof": "Profiles",
"option": "Options", "option": "Options",
"matchWord": "Whole word", "matchWord": "Whole word",
"warnMatchWord": "Nice for Latin language", "warnMatchWord": "Nice for Latin language",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Click to add description, right-click to delete this", "lang_postimg_delete": "Click to add description, right-click to delete this",
"lang_postimg_desc": "Description", "lang_postimg_desc": "Description",
"lang_postimg_leadContext": "right-click the thumbnail to delete this", "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": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?", "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
"lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.", "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
"lang_post_cwtitle": "Auto CW Alert", "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Cancel (will not post)", "lang_post_btn1": "Cancel (will not post)",
"lang_post_btn2": "Make text hidden automatically", "lang_post_btn2": "Make text hidden automatically",
"lang_post_btn3": "Continue to post", "lang_post_btn3": "Continue to post",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "It will take a miunte to favourite a remote toot.", "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_btWarn": "It will take a miunte to boost a remote toot.",
"lang_status_follow": "Follow", "lang_status_follow": "Follow",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "Remove this column", "lang_layout_delthis": "Remove this column",
"lang_layout_setthis": "Preferences of this column", "lang_layout_setthis": "Preferences of this column",
"lang_layout_mediafil": "Media filtering", "lang_layout_mediafil": "Media filtering",
"lang_layout_remoteOnly": "Remote only",
"lang_layout_linkana": "Auto Link Analyzer", "lang_layout_linkana": "Auto Link Analyzer",
"lang_layout_linkanades": "Auto link analyzer", "lang_layout_linkanades": "Auto link analyzer",
"lang_layout_tts": "Text to speech ", "lang_layout_tts": "Text to speech ",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "Domain ", "lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.", "lang_showontl_listwarn": "Follow to add this user to lists.",
"lang_showontl_verified": "This website is verified by owner at ", "lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " replied to you", "lang_parse_mentioned": " replied to you",
"lang_parse_faved": " favourited your toot", "lang_parse_faved": " favourited your toot",
"lang_parse_bted": " boosted your toot", "lang_parse_bted": " boosted your toot",
@@ -168,6 +174,7 @@
"lang_parse_polled": "'s poll", "lang_parse_polled": "'s poll",
"lang_parse_notftime": "Actioned at", "lang_parse_notftime": "Actioned at",
"lang_parse_cwshow": "Show", "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_fulltext": "Full size text:",
"lang_parse_autofold": "Auto folded", "lang_parse_autofold": "Auto folded",
"lang_parse_more": "More", "lang_parse_more": "More",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "sensitive media", "lang_parse_nsfw": "sensitive media",
"lang_parse_html": "Show embed HTML", "lang_parse_html": "Show embed HTML",
"lang_parse_notffilter": "Show this user's notifications", "lang_parse_notffilter": "Show this user's notifications",
"lang_parse_hidden": "Unvisible quoted toot",
"lang_misskeyparse_renote": "Repost", "lang_misskeyparse_renote": "Repost",
"lang_misskeyparse_renoteqt": "Renote", "lang_misskeyparse_renoteqt": "Renote",
"lang_misskeyparse_reaction": "Reaction", "lang_misskeyparse_reaction": "Reaction",

View File

@@ -167,12 +167,15 @@
"linkwarn": "TheDesk save your data on thedesk.top server.", "linkwarn": "TheDesk save your data on thedesk.top server.",
"connect": "Connect", "connect": "Connect",
"disconnect": "Disconnect", "disconnect": "Disconnect",
"lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
"templateedit": "Edit a template", "templateedit": "Edit a template",
"templateeditwarn": "", "templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "", "template3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect", "bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -2,6 +2,7 @@
"list": "Seznam účtů", "list": "Seznam účtů",
"back": "Zpět", "back": "Zpět",
"add": "Přidat účet", "add": "Přidat účet",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)", "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
"codesetup": "Nastavení kódu", "codesetup": "Nastavení kódu",
"mainacct": "Hlavní účet", "mainacct": "Hlavní účet",
@@ -19,5 +20,6 @@
"thisismisskey": "Přihlásit jako Misskey", "thisismisskey": "Přihlásit jako Misskey",
"misskeylogin": "Pro přihlášení do Misskey si přečtěte <a href=\"https://thedesk.top/how-to-misskey-login.html\">dokumentaci (ja)</a>.", "misskeylogin": "Pro přihlášení do Misskey si přečtěte <a href=\"https://thedesk.top/how-to-misskey-login.html\">dokumentaci (ja)</a>.",
"nodata": "No data", "nodata": "No data",
"accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)" "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"
} }

View File

@@ -11,8 +11,6 @@
"cwDes": "Skrýt text za varováním", "cwDes": "Skrýt text za varováním",
"selfile": "Přiložit...", "selfile": "Přiložit...",
"insertEmoji": "Emoji", "insertEmoji": "Emoji",
"NPSpotify": "NowPlaying(Spotify)",
"NPiTunes": "NowPlaying(macOS)",
"schedule": "Plánovaný toot", "schedule": "Plánovaný toot",
"postat": "Odeslat jak", "postat": "Odeslat jak",
"scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
"toots": "Tooty", "toots": "Tooty",
"follow": "Sledovat", "follow": "Sledovat",
"follower": "Sledující", "follower": "Sledující",
"utlColumn": "Show as a column",
"timeline": "Časová osa", "timeline": "Časová osa",
"operateOtherAcct": "Cross-account", "operateOtherAcct": "Cross-account",
"list": "Seznam", "list": "Seznam",
@@ -140,6 +139,7 @@
"filterWord": "Filtrované slova", "filterWord": "Filtrované slova",
"degree": "Filter contexts", "degree": "Filter contexts",
"conver": "Konverzace", "conver": "Konverzace",
"prof": "Profiles",
"option": "Možnosti", "option": "Možnosti",
"matchWord": "Celé slovo", "matchWord": "Celé slovo",
"warnMatchWord": "Dobré pro jazyky v latince", "warnMatchWord": "Dobré pro jazyky v latince",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Click to add description, right-click to delete this", "lang_postimg_delete": "Click to add description, right-click to delete this",
"lang_postimg_desc": "Popis", "lang_postimg_desc": "Popis",
"lang_postimg_leadContext": "right-click the thumbnail to delete this", "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": "Tento toot neobsahuje výchozí hashtag. Tento toot nebude zobrazen na výchozí časové ose. Pokračovat?", "lang_post_tagTL": "Tento toot neobsahuje výchozí hashtag. Tento toot nebude zobrazen na výchozí časové ose. Pokračovat?",
"lang_post_tagVis": "Tento toot (ne „veřejný“ toot) není zobrazen na časové ose tohoto hashtagu.", "lang_post_tagVis": "Tento toot (ne „veřejný“ toot) není zobrazen na časové ose tohoto hashtagu.",
"lang_post_cwtitle": "Automatické varování o obsahu", "lang_post_cwtitle": "Automatické varování o obsahu",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Zrušit (příspěvek nebude publikován)", "lang_post_btn1": "Zrušit (příspěvek nebude publikován)",
"lang_post_btn2": "Skrýt text automaticky", "lang_post_btn2": "Skrýt text automaticky",
"lang_post_btn3": "Pokračovat k přispívání", "lang_post_btn3": "Pokračovat k přispívání",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "Oblíbení vzdáleného tootu bude chvíli trvat.", "lang_status_favWarn": "Oblíbení vzdáleného tootu bude chvíli trvat.",
"lang_status_btWarn": "Boostnutí vzdáleného tootu bude chvíli trvat.", "lang_status_btWarn": "Boostnutí vzdáleného tootu bude chvíli trvat.",
"lang_status_follow": "Sledovat", "lang_status_follow": "Sledovat",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "Odstranit tento sloupec", "lang_layout_delthis": "Odstranit tento sloupec",
"lang_layout_setthis": "Nastavení tohoto sloupce", "lang_layout_setthis": "Nastavení tohoto sloupce",
"lang_layout_mediafil": "Filtrování médií", "lang_layout_mediafil": "Filtrování médií",
"lang_layout_remoteOnly": "Remote only",
"lang_layout_linkana": "Automatický analyzátor odkazů", "lang_layout_linkana": "Automatický analyzátor odkazů",
"lang_layout_linkanades": "Automatický analyzátor odkazů", "lang_layout_linkanades": "Automatický analyzátor odkazů",
"lang_layout_tts": "Převod textu na řeč ", "lang_layout_tts": "Převod textu na řeč ",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "Doména ", "lang_showontl_domain": "Doména ",
"lang_showontl_listwarn": "Follow to add this user to lists.", "lang_showontl_listwarn": "Follow to add this user to lists.",
"lang_showontl_verified": "This website is verified by owner at ", "lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " vám odpověděl/a", "lang_parse_mentioned": " vám odpověděl/a",
"lang_parse_faved": " si oblíbil/a váš toot", "lang_parse_faved": " si oblíbil/a váš toot",
"lang_parse_bted": " boostnul/a váš toot", "lang_parse_bted": " boostnul/a váš toot",
@@ -168,6 +174,7 @@
"lang_parse_polled": "'s poll", "lang_parse_polled": "'s poll",
"lang_parse_notftime": "Provedeno", "lang_parse_notftime": "Provedeno",
"lang_parse_cwshow": "Zobrazit", "lang_parse_cwshow": "Zobrazit",
"lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
"lang_parse_fulltext": "Celý text:", "lang_parse_fulltext": "Celý text:",
"lang_parse_autofold": "Auto folded", "lang_parse_autofold": "Auto folded",
"lang_parse_more": "Více", "lang_parse_more": "Více",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "NSFW media", "lang_parse_nsfw": "NSFW media",
"lang_parse_html": "Show embed HTML", "lang_parse_html": "Show embed HTML",
"lang_parse_notffilter": "Show this user's notifications", "lang_parse_notffilter": "Show this user's notifications",
"lang_parse_hidden": "Unvisible quoted toot",
"lang_misskeyparse_renote": "Znovusdílení", "lang_misskeyparse_renote": "Znovusdílení",
"lang_misskeyparse_renoteqt": "Renotování", "lang_misskeyparse_renoteqt": "Renotování",
"lang_misskeyparse_reaction": "Reakce", "lang_misskeyparse_reaction": "Reakce",

View File

@@ -167,12 +167,15 @@
"linkwarn": "TheDesk save your data on thedesk.top server.", "linkwarn": "TheDesk save your data on thedesk.top server.",
"connect": "Connect", "connect": "Connect",
"disconnect": "Disconnect", "disconnect": "Disconnect",
"lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
"templateedit": "Edit a template", "templateedit": "Edit a template",
"templateeditwarn": "", "templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "", "template3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect", "bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -2,6 +2,7 @@
"list": "List of accounts", "list": "List of accounts",
"back": "Back", "back": "Back",
"add": "Add an account", "add": "Add an account",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)", "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
"codesetup": "Code setup", "codesetup": "Code setup",
"mainacct": "Main an account", "mainacct": "Main an account",
@@ -19,5 +20,6 @@
"thisismisskey": "Login as Misskey", "thisismisskey": "Login as Misskey",
"misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.", "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
"nodata": "No data", "nodata": "No data",
"accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)" "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"
} }

View File

@@ -11,8 +11,6 @@
"cwDes": "Hide text behind warning", "cwDes": "Hide text behind warning",
"selfile": "Attach..", "selfile": "Attach..",
"insertEmoji": "Emojis", "insertEmoji": "Emojis",
"NPSpotify": "NowPlaying(Spotify)",
"NPiTunes": "NowPlaying(macOS)",
"schedule": "Scheduled toot", "schedule": "Scheduled toot",
"postat": "Post at", "postat": "Post at",
"scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
"follower": "Follower", "follower": "Follower",
"utlColumn": "Show as a column",
"timeline": "Timeline", "timeline": "Timeline",
"operateOtherAcct": "Cross-account", "operateOtherAcct": "Cross-account",
"list": "List", "list": "List",
@@ -140,6 +139,7 @@
"filterWord": "Filtering words", "filterWord": "Filtering words",
"degree": "Filter contexts", "degree": "Filter contexts",
"conver": "Conversations", "conver": "Conversations",
"prof": "Profiles",
"option": "Options", "option": "Options",
"matchWord": "Whole word", "matchWord": "Whole word",
"warnMatchWord": "Nice for Latin language", "warnMatchWord": "Nice for Latin language",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Click to add description, right-click to delete this", "lang_postimg_delete": "Click to add description, right-click to delete this",
"lang_postimg_desc": "Description", "lang_postimg_desc": "Description",
"lang_postimg_leadContext": "right-click the thumbnail to delete this", "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": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?", "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
"lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.", "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
"lang_post_cwtitle": "Auto CW Alert", "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Cancel (will not post)", "lang_post_btn1": "Cancel (will not post)",
"lang_post_btn2": "Make text hidden automatically", "lang_post_btn2": "Make text hidden automatically",
"lang_post_btn3": "Continue to post", "lang_post_btn3": "Continue to post",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "It will take a miunte to favourite a remote toot.", "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_btWarn": "It will take a miunte to boost a remote toot.",
"lang_status_follow": "Follow", "lang_status_follow": "Follow",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "Remove this column", "lang_layout_delthis": "Remove this column",
"lang_layout_setthis": "Preferences of this column", "lang_layout_setthis": "Preferences of this column",
"lang_layout_mediafil": "Media filtering", "lang_layout_mediafil": "Media filtering",
"lang_layout_remoteOnly": "Remote only",
"lang_layout_linkana": "Auto Link Analyzer", "lang_layout_linkana": "Auto Link Analyzer",
"lang_layout_linkanades": "Auto link analyzer", "lang_layout_linkanades": "Auto link analyzer",
"lang_layout_tts": "Text to speech ", "lang_layout_tts": "Text to speech ",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "Domain ", "lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.", "lang_showontl_listwarn": "Follow to add this user to lists.",
"lang_showontl_verified": "This website is verified by owner at ", "lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " replied to you", "lang_parse_mentioned": " replied to you",
"lang_parse_faved": " favourited your toot", "lang_parse_faved": " favourited your toot",
"lang_parse_bted": " boosted your toot", "lang_parse_bted": " boosted your toot",
@@ -168,6 +174,7 @@
"lang_parse_polled": "'s poll", "lang_parse_polled": "'s poll",
"lang_parse_notftime": "Actioned at", "lang_parse_notftime": "Actioned at",
"lang_parse_cwshow": "Show", "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_fulltext": "Full size text:",
"lang_parse_autofold": "Auto folded", "lang_parse_autofold": "Auto folded",
"lang_parse_more": "More", "lang_parse_more": "More",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "sensitive media", "lang_parse_nsfw": "sensitive media",
"lang_parse_html": "Show embed HTML", "lang_parse_html": "Show embed HTML",
"lang_parse_notffilter": "Show this user's notifications", "lang_parse_notffilter": "Show this user's notifications",
"lang_parse_hidden": "Unvisible quoted toot",
"lang_misskeyparse_renote": "Repost", "lang_misskeyparse_renote": "Repost",
"lang_misskeyparse_renoteqt": "Renote", "lang_misskeyparse_renoteqt": "Renote",
"lang_misskeyparse_reaction": "Reaction", "lang_misskeyparse_reaction": "Reaction",

View File

@@ -167,12 +167,15 @@
"linkwarn": "TheDesk save your data on thedesk.top server.", "linkwarn": "TheDesk save your data on thedesk.top server.",
"connect": "Connect", "connect": "Connect",
"disconnect": "Disconnect", "disconnect": "Disconnect",
"lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
"templateedit": "Edit a template", "templateedit": "Edit a template",
"templateeditwarn": "", "templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "", "template3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect", "bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -2,6 +2,7 @@
"list": "Accountliste", "list": "Accountliste",
"back": "Zurück", "back": "Zurück",
"add": "Konto hinzufügen", "add": "Konto hinzufügen",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.", "codesetupwarn": "Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
"codesetup": "Code-Setup", "codesetup": "Code-Setup",
"mainacct": "Hauptkonto", "mainacct": "Hauptkonto",
@@ -19,5 +20,6 @@
"thisismisskey": "Als Misskey anmelden", "thisismisskey": "Als Misskey anmelden",
"misskeylogin": "Lies die <a href=\"https://thedesk.top/how-to-misskey-login.html\">Doku (japanisch)</a> um dich bei Misskey einzuloggen.", "misskeylogin": "Lies die <a href=\"https://thedesk.top/how-to-misskey-login.html\">Doku (japanisch)</a> um dich bei Misskey einzuloggen.",
"nodata": "Keine Daten", "nodata": "Keine Daten",
"accessTokenSetup": "Benutze Zugangs-Token zum Anmelden (Klicke nach Ausfüllen nicht den Code, sondern den Access-Token im Kästchen: Erweitert)" "accessTokenSetup": "Benutze Zugangs-Token zum Anmelden (Klicke nach Ausfüllen nicht den Code, sondern den Access-Token im Kästchen: Erweitert)",
"haveExported": "Having the exported file of TheDesk, click here to jump setting page"
} }

View File

@@ -2,7 +2,7 @@
"draghere": "Zum Hochladen hier her ziehen", "draghere": "Zum Hochladen hier her ziehen",
"close": "Schließen", "close": "Schließen",
"webSrc": "Suche im Internet", "webSrc": "Suche im Internet",
"tsSrc": "Search on tootsearch", "tsSrc": "Bei Tootsearch suchen",
"showSelectProf": "Ausgewähltes Konto anzeigen", "showSelectProf": "Ausgewähltes Konto anzeigen",
"closethisbox": "Diesen Dialog schließen", "closethisbox": "Diesen Dialog schließen",
"toot": "Tröt", "toot": "Tröt",
@@ -11,8 +11,6 @@
"cwDes": "Text hinter Warnung verstecken", "cwDes": "Text hinter Warnung verstecken",
"selfile": "Anhängen...", "selfile": "Anhängen...",
"insertEmoji": "Emojis", "insertEmoji": "Emojis",
"NPSpotify": "Wird gerade gespielt (Spotify)",
"NPiTunes": "Wird gerade wiedergegeben(macOS)",
"schedule": "Geplanter Tröt", "schedule": "Geplanter Tröt",
"postat": "Senden um", "postat": "Senden um",
"scheduleWarn": "2.7.0~ Mindestzeitabstand: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)", "scheduleWarn": "2.7.0~ Mindestzeitabstand: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)",
@@ -77,6 +75,7 @@
"toots": "Tröts", "toots": "Tröts",
"follow": "Folgen", "follow": "Folgen",
"follower": "Abonnenten", "follower": "Abonnenten",
"utlColumn": "Show as a column",
"timeline": "Verlauf", "timeline": "Verlauf",
"operateOtherAcct": "Cross-Account", "operateOtherAcct": "Cross-Account",
"list": "Liste", "list": "Liste",
@@ -140,6 +139,7 @@
"filterWord": "Filterwörter", "filterWord": "Filterwörter",
"degree": "Kontexte filtern", "degree": "Kontexte filtern",
"conver": "Gespräche", "conver": "Gespräche",
"prof": "Profiles",
"option": "Einstellungen", "option": "Einstellungen",
"matchWord": "Ganze Wörter", "matchWord": "Ganze Wörter",
"warnMatchWord": "Schön für lateinische Sprachen", "warnMatchWord": "Schön für lateinische Sprachen",
@@ -178,11 +178,11 @@
"active": "Kürzlich aktiv", "active": "Kürzlich aktiv",
"newcomer": "Neu eingetroffen", "newcomer": "Neu eingetroffen",
"local_only": "Nur lokal", "local_only": "Nur lokal",
"menu": "Menu", "menu": "Menü",
"demoBottomBtns": "Willkommensguide", "demoBottomBtns": "Willkommensguide",
"lookAtBottom": "Schauen Sie sich den unteren Teil des Fensters an. Hier sind einige Tipps darüber.", "lookAtBottom": "Schauen Sie sich den unteren Teil des Fensters an. Hier sind einige Tipps darüber.",
"acctManDesc": "Fügen Sie weitere Konten hinzu und loggen Sie sie aus.", "acctManDesc": "Fügen Sie weitere Konten hinzu und loggen Sie sie aus.",
"settingDesc": "Many and many preferences here. You will couldn't check it all!", "settingDesc": "Hier sind sehr, sehr viele Einstellungen. Du könntest gar nicht alles ausprobieren!",
"nanoDescPlus": "Mini-Fenster-Klient (experimentell)", "nanoDescPlus": "Mini-Fenster-Klient (experimentell)",
"menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>." "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
} }

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Klicken, um Beschreibung hinzuzufügen, Rechtsklick zum Löschen", "lang_postimg_delete": "Klicken, um Beschreibung hinzuzufügen, Rechtsklick zum Löschen",
"lang_postimg_desc": "Beschreibung", "lang_postimg_desc": "Beschreibung",
"lang_postimg_leadContext": "right-click the thumbnail to delete this", "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_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.", "lang_post_tagVis": "Dieser Tröt (nicht 'öffentlicher' Tröt) wird nicht in diesem Tag-Verlauf angezeigt.",
"lang_post_cwtitle": "Auto CW Alert", "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Abbrechen (wird nicht gesendet)", "lang_post_btn1": "Abbrechen (wird nicht gesendet)",
"lang_post_btn2": "Text automatisch ausblenden", "lang_post_btn2": "Text automatisch ausblenden",
"lang_post_btn3": "Weiter mit Senden", "lang_post_btn3": "Weiter mit Senden",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "Es braucht einen Moment, um ein entferntes Tröt zu favorisieren.", "lang_status_favWarn": "Es braucht einen Moment, um ein entferntes Tröt zu favorisieren.",
"lang_status_btWarn": "Es braucht einen Moment, um ein entferntes Tröt zu verstärken.", "lang_status_btWarn": "Es braucht einen Moment, um ein entferntes Tröt zu verstärken.",
"lang_status_follow": "Folgen", "lang_status_follow": "Folgen",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "Diese Spalte löschen", "lang_layout_delthis": "Diese Spalte löschen",
"lang_layout_setthis": "Einstellungen dieser Spalte", "lang_layout_setthis": "Einstellungen dieser Spalte",
"lang_layout_mediafil": "Medien filtern", "lang_layout_mediafil": "Medien filtern",
"lang_layout_remoteOnly": "Remote only",
"lang_layout_linkana": "Automatische Link-Analyse", "lang_layout_linkana": "Automatische Link-Analyse",
"lang_layout_linkanades": "Automatische Link-Analyse", "lang_layout_linkanades": "Automatische Link-Analyse",
"lang_layout_tts": "Sprachausgabe ", "lang_layout_tts": "Sprachausgabe ",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "Domäne ", "lang_showontl_domain": "Domäne ",
"lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.", "lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
"lang_showontl_verified": "This website is verified by owner at ", "lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " hat dir geantwortet", "lang_parse_mentioned": " hat dir geantwortet",
"lang_parse_faved": " favorisierte deinen Tröt", "lang_parse_faved": " favorisierte deinen Tröt",
"lang_parse_bted": " hat deinen Tröt verstärkt", "lang_parse_bted": " hat deinen Tröt verstärkt",
@@ -168,6 +174,7 @@
"lang_parse_polled": "'s Umfrage", "lang_parse_polled": "'s Umfrage",
"lang_parse_notftime": "Bearbeitet am", "lang_parse_notftime": "Bearbeitet am",
"lang_parse_cwshow": "Anzeigen", "lang_parse_cwshow": "Anzeigen",
"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_fulltext": "Full size text:",
"lang_parse_autofold": "Automatisches Zusammenfalten", "lang_parse_autofold": "Automatisches Zusammenfalten",
"lang_parse_more": "Mehr", "lang_parse_more": "Mehr",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "NSFW Medien", "lang_parse_nsfw": "NSFW Medien",
"lang_parse_html": "Show embed HTML", "lang_parse_html": "Show embed HTML",
"lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen", "lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen",
"lang_parse_hidden": "Unvisible quoted toot",
"lang_misskeyparse_renote": "Weiterleiten", "lang_misskeyparse_renote": "Weiterleiten",
"lang_misskeyparse_renoteqt": "Renote", "lang_misskeyparse_renoteqt": "Renote",
"lang_misskeyparse_reaction": "Reaktion", "lang_misskeyparse_reaction": "Reaktion",

View File

@@ -167,12 +167,15 @@
"linkwarn": "TheDesk speichert Ihre Daten auf dem thedesk.top Server.", "linkwarn": "TheDesk speichert Ihre Daten auf dem thedesk.top Server.",
"connect": "Verbinden", "connect": "Verbinden",
"disconnect": "Trennen", "disconnect": "Trennen",
"lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
"templateedit": "Edit a template", "templateedit": "Edit a template",
"templateeditwarn": "", "templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "", "template3": "",
"postartwork": "Das Artwork von Spotify anhängen", "postartwork": "Das Artwork von Spotify anhängen",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "Einstellungen Vorlesefunktion", "tts": "Einstellungen Vorlesefunktion",
"bouyomi": "BouyomiChan connect", "bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -2,6 +2,7 @@
"list": "List of accounts", "list": "List of accounts",
"back": "Back", "back": "Back",
"add": "Add an account", "add": "Add an account",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)", "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
"codesetup": "Code setup", "codesetup": "Code setup",
"mainacct": "Main an account", "mainacct": "Main an account",
@@ -19,5 +20,6 @@
"thisismisskey": "Login as Misskey", "thisismisskey": "Login as Misskey",
"misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.", "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
"nodata": "No data", "nodata": "No data",
"accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)" "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"
} }

View File

@@ -11,8 +11,6 @@
"cwDes": "Hide text behind warning", "cwDes": "Hide text behind warning",
"selfile": "Attach..", "selfile": "Attach..",
"insertEmoji": "Emojis", "insertEmoji": "Emojis",
"NPSpotify": "NowPlaying(Spotify)",
"NPiTunes": "NowPlaying(macOS)",
"schedule": "Scheduled toot", "schedule": "Scheduled toot",
"postat": "Post at", "postat": "Post at",
"scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
"follower": "Follower", "follower": "Follower",
"utlColumn": "Show as a column",
"timeline": "Timeline", "timeline": "Timeline",
"operateOtherAcct": "Cross-account", "operateOtherAcct": "Cross-account",
"list": "List", "list": "List",
@@ -140,6 +139,7 @@
"filterWord": "Filtering words", "filterWord": "Filtering words",
"degree": "Filter contexts", "degree": "Filter contexts",
"conver": "Conversations", "conver": "Conversations",
"prof": "Profiles",
"option": "Options", "option": "Options",
"matchWord": "Whole word", "matchWord": "Whole word",
"warnMatchWord": "Nice for Latin language", "warnMatchWord": "Nice for Latin language",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "Click to add description, right-click to delete this", "lang_postimg_delete": "Click to add description, right-click to delete this",
"lang_postimg_desc": "Description", "lang_postimg_desc": "Description",
"lang_postimg_leadContext": "right-click the thumbnail to delete this", "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": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?", "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
"lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.", "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
"lang_post_cwtitle": "Auto CW Alert", "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
"lang_post_btn1": "Cancel (will not post)", "lang_post_btn1": "Cancel (will not post)",
"lang_post_btn2": "Make text hidden automatically", "lang_post_btn2": "Make text hidden automatically",
"lang_post_btn3": "Continue to post", "lang_post_btn3": "Continue to post",
"lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
"lang_post_retry": "Retry",
"lang_status_favWarn": "It will take a miunte to favourite a remote toot.", "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_btWarn": "It will take a miunte to boost a remote toot.",
"lang_status_follow": "Follow", "lang_status_follow": "Follow",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "Remove this column", "lang_layout_delthis": "Remove this column",
"lang_layout_setthis": "Preferences of this column", "lang_layout_setthis": "Preferences of this column",
"lang_layout_mediafil": "Media filtering", "lang_layout_mediafil": "Media filtering",
"lang_layout_remoteOnly": "Remote only",
"lang_layout_linkana": "Auto Link Analyzer", "lang_layout_linkana": "Auto Link Analyzer",
"lang_layout_linkanades": "Auto link analyzer", "lang_layout_linkanades": "Auto link analyzer",
"lang_layout_tts": "Text to speech ", "lang_layout_tts": "Text to speech ",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "Domain ", "lang_showontl_domain": "Domain ",
"lang_showontl_listwarn": "Follow to add this user to lists.", "lang_showontl_listwarn": "Follow to add this user to lists.",
"lang_showontl_verified": "This website is verified by owner at ", "lang_showontl_verified": "This website is verified by owner at ",
"lang_status_requesting": "Requesting",
"lang_parse_mentioned": " replied to you", "lang_parse_mentioned": " replied to you",
"lang_parse_faved": " favourited your toot", "lang_parse_faved": " favourited your toot",
"lang_parse_bted": " boosted your toot", "lang_parse_bted": " boosted your toot",
@@ -168,6 +174,7 @@
"lang_parse_polled": "'s poll", "lang_parse_polled": "'s poll",
"lang_parse_notftime": "Actioned at", "lang_parse_notftime": "Actioned at",
"lang_parse_cwshow": "Show", "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_fulltext": "Full size text:",
"lang_parse_autofold": "Auto folded", "lang_parse_autofold": "Auto folded",
"lang_parse_more": "More", "lang_parse_more": "More",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "sensitive media", "lang_parse_nsfw": "sensitive media",
"lang_parse_html": "Show embed HTML", "lang_parse_html": "Show embed HTML",
"lang_parse_notffilter": "Show this user's notifications", "lang_parse_notffilter": "Show this user's notifications",
"lang_parse_hidden": "Unvisible quoted toot",
"lang_misskeyparse_renote": "Repost", "lang_misskeyparse_renote": "Repost",
"lang_misskeyparse_renoteqt": "Renote", "lang_misskeyparse_renoteqt": "Renote",
"lang_misskeyparse_reaction": "Reaction", "lang_misskeyparse_reaction": "Reaction",

View File

@@ -167,12 +167,15 @@
"linkwarn": "TheDesk save your data on thedesk.top server.", "linkwarn": "TheDesk save your data on thedesk.top server.",
"connect": "Connect", "connect": "Connect",
"disconnect": "Disconnect", "disconnect": "Disconnect",
"lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
"templateedit": "Edit a template", "templateedit": "Edit a template",
"templateeditwarn": "", "templateeditwarn": "",
"template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
"template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
"template3": "", "template3": "",
"postartwork": "Attach an Artwork of Spotify", "postartwork": "Attach an Artwork of Spotify",
"searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
"searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
"tts": "TTS(text to speech) Preferences", "tts": "TTS(text to speech) Preferences",
"bouyomi": "BouyomiChan connect", "bouyomi": "BouyomiChan connect",
"bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

View File

@@ -2,6 +2,7 @@
"list": "crwdns3018:0crwdne3018:0", "list": "crwdns3018:0crwdne3018:0",
"back": "crwdns3020:0crwdne3020:0", "back": "crwdns3020:0crwdne3020:0",
"add": "crwdns3022:0crwdne3022:0", "add": "crwdns3022:0crwdne3022:0",
"addAcct": "crwdns4484:0crwdne4484:0",
"codesetupwarn": "crwdns3024:0crwdne3024:0", "codesetupwarn": "crwdns3024:0crwdne3024:0",
"codesetup": "crwdns3026:0crwdne3026:0", "codesetup": "crwdns3026:0crwdne3026:0",
"mainacct": "crwdns3028:0crwdne3028:0", "mainacct": "crwdns3028:0crwdne3028:0",
@@ -19,5 +20,6 @@
"thisismisskey": "crwdns3052:0crwdne3052:0", "thisismisskey": "crwdns3052:0crwdne3052:0",
"misskeylogin": "crwdns3054:0crwdne3054:0", "misskeylogin": "crwdns3054:0crwdne3054:0",
"nodata": "crwdns3056:0crwdne3056:0", "nodata": "crwdns3056:0crwdne3056:0",
"accessTokenSetup": "crwdns4362:0crwdne4362:0" "accessTokenSetup": "crwdns4362:0crwdne4362:0",
"haveExported": "crwdns4500:0crwdne4500:0"
} }

View File

@@ -11,8 +11,6 @@
"cwDes": "crwdns3072:0crwdne3072:0", "cwDes": "crwdns3072:0crwdne3072:0",
"selfile": "crwdns3074:0crwdne3074:0", "selfile": "crwdns3074:0crwdne3074:0",
"insertEmoji": "crwdns3076:0crwdne3076:0", "insertEmoji": "crwdns3076:0crwdne3076:0",
"NPSpotify": "crwdns3078:0crwdne3078:0",
"NPiTunes": "crwdns3080:0crwdne3080:0",
"schedule": "crwdns3082:0crwdne3082:0", "schedule": "crwdns3082:0crwdne3082:0",
"postat": "crwdns3084:0crwdne3084:0", "postat": "crwdns3084:0crwdne3084:0",
"scheduleWarn": "crwdns3086:0crwdne3086:0", "scheduleWarn": "crwdns3086:0crwdne3086:0",
@@ -77,6 +75,7 @@
"toots": "crwdns3198:0crwdne3198:0", "toots": "crwdns3198:0crwdne3198:0",
"follow": "crwdns3200:0crwdne3200:0", "follow": "crwdns3200:0crwdne3200:0",
"follower": "crwdns3202:0crwdne3202:0", "follower": "crwdns3202:0crwdne3202:0",
"utlColumn": "crwdns4492:0crwdne4492:0",
"timeline": "crwdns3204:0crwdne3204:0", "timeline": "crwdns3204:0crwdne3204:0",
"operateOtherAcct": "crwdns3206:0crwdne3206:0", "operateOtherAcct": "crwdns3206:0crwdne3206:0",
"list": "crwdns3208:0crwdne3208:0", "list": "crwdns3208:0crwdne3208:0",
@@ -140,6 +139,7 @@
"filterWord": "crwdns3322:0crwdne3322:0", "filterWord": "crwdns3322:0crwdne3322:0",
"degree": "crwdns3324:0crwdne3324:0", "degree": "crwdns3324:0crwdne3324:0",
"conver": "crwdns3326:0crwdne3326:0", "conver": "crwdns3326:0crwdne3326:0",
"prof": "crwdns4488:0crwdne4488:0",
"option": "crwdns3328:0crwdne3328:0", "option": "crwdns3328:0crwdne3328:0",
"matchWord": "crwdns3330:0crwdne3330:0", "matchWord": "crwdns3330:0crwdne3330:0",
"warnMatchWord": "crwdns3332:0crwdne3332:0", "warnMatchWord": "crwdns3332:0crwdne3332:0",

View File

@@ -60,6 +60,8 @@
"lang_postimg_delete": "crwdns4350:0crwdne4350:0", "lang_postimg_delete": "crwdns4350:0crwdne4350:0",
"lang_postimg_desc": "crwdns4352:0crwdne4352:0", "lang_postimg_desc": "crwdns4352:0crwdne4352:0",
"lang_postimg_leadContext": "crwdns4354:0crwdne4354:0", "lang_postimg_leadContext": "crwdns4354:0crwdne4354:0",
"lang_post_syncDetail": "crwdns4476:0crwdne4476:0",
"lang_post_syncDetailText": "crwdns4478:0crwdne4478:0",
"lang_post_tagTL": "crwdns3526:0crwdne3526:0", "lang_post_tagTL": "crwdns3526:0crwdne3526:0",
"lang_post_tagVis": "crwdns3528:0crwdne3528:0", "lang_post_tagVis": "crwdns3528:0crwdne3528:0",
"lang_post_cwtitle": "crwdns3530:0crwdne3530:0", "lang_post_cwtitle": "crwdns3530:0crwdne3530:0",
@@ -67,6 +69,8 @@
"lang_post_btn1": "crwdns3534:0crwdne3534:0", "lang_post_btn1": "crwdns3534:0crwdne3534:0",
"lang_post_btn2": "crwdns3536:0crwdne3536:0", "lang_post_btn2": "crwdns3536:0crwdne3536:0",
"lang_post_btn3": "crwdns3538:0crwdne3538:0", "lang_post_btn3": "crwdns3538:0crwdne3538:0",
"lang_post_unfinishedMedia": "crwdns4480:0crwdne4480:0",
"lang_post_retry": "crwdns4482:0crwdne4482:0",
"lang_status_favWarn": "crwdns3540:0crwdne3540:0", "lang_status_favWarn": "crwdns3540:0crwdne3540:0",
"lang_status_btWarn": "crwdns3542:0crwdne3542:0", "lang_status_btWarn": "crwdns3542:0crwdne3542:0",
"lang_status_follow": "crwdns3544:0crwdne3544:0", "lang_status_follow": "crwdns3544:0crwdne3544:0",
@@ -123,6 +127,7 @@
"lang_layout_delthis": "crwdns3640:0crwdne3640:0", "lang_layout_delthis": "crwdns3640:0crwdne3640:0",
"lang_layout_setthis": "crwdns3642:0crwdne3642:0", "lang_layout_setthis": "crwdns3642:0crwdne3642:0",
"lang_layout_mediafil": "crwdns3644:0crwdne3644:0", "lang_layout_mediafil": "crwdns3644:0crwdne3644:0",
"lang_layout_remoteOnly": "crwdns4494:0crwdne4494:0",
"lang_layout_linkana": "crwdns3646:0crwdne3646:0", "lang_layout_linkana": "crwdns3646:0crwdne3646:0",
"lang_layout_linkanades": "crwdns3648:0crwdne3648:0", "lang_layout_linkanades": "crwdns3648:0crwdne3648:0",
"lang_layout_tts": "crwdns3650:0crwdne3650:0", "lang_layout_tts": "crwdns3650:0crwdne3650:0",
@@ -161,6 +166,7 @@
"lang_showontl_domain": "crwdns3710:0crwdne3710:0", "lang_showontl_domain": "crwdns3710:0crwdne3710:0",
"lang_showontl_listwarn": "crwdns3712:0crwdne3712:0", "lang_showontl_listwarn": "crwdns3712:0crwdne3712:0",
"lang_showontl_verified": "crwdns3714:0crwdne3714:0", "lang_showontl_verified": "crwdns3714:0crwdne3714:0",
"lang_status_requesting": "crwdns4496:0crwdne4496:0",
"lang_parse_mentioned": "crwdns3716:0crwdne3716:0", "lang_parse_mentioned": "crwdns3716:0crwdne3716:0",
"lang_parse_faved": "crwdns3718:0crwdne3718:0", "lang_parse_faved": "crwdns3718:0crwdne3718:0",
"lang_parse_bted": "crwdns3720:0crwdne3720:0", "lang_parse_bted": "crwdns3720:0crwdne3720:0",
@@ -168,6 +174,7 @@
"lang_parse_polled": "crwdns3724:0crwdne3724:0", "lang_parse_polled": "crwdns3724:0crwdne3724:0",
"lang_parse_notftime": "crwdns3726:0crwdne3726:0", "lang_parse_notftime": "crwdns3726:0crwdne3726:0",
"lang_parse_cwshow": "crwdns3728:0crwdne3728:0", "lang_parse_cwshow": "crwdns3728:0crwdne3728:0",
"lang_parse_cwshow_acc": "crwdns4486:0crwdne4486:0",
"lang_parse_fulltext": "crwdns3730:0crwdne3730:0", "lang_parse_fulltext": "crwdns3730:0crwdne3730:0",
"lang_parse_autofold": "crwdns3732:0crwdne3732:0", "lang_parse_autofold": "crwdns3732:0crwdne3732:0",
"lang_parse_more": "crwdns3734:0crwdne3734:0", "lang_parse_more": "crwdns3734:0crwdne3734:0",
@@ -214,6 +221,7 @@
"lang_parse_nsfw": "crwdns3800:0crwdne3800:0", "lang_parse_nsfw": "crwdns3800:0crwdne3800:0",
"lang_parse_html": "crwdns4388:0crwdne4388:0", "lang_parse_html": "crwdns4388:0crwdne4388:0",
"lang_parse_notffilter": "crwdns3802:0crwdne3802:0", "lang_parse_notffilter": "crwdns3802:0crwdne3802:0",
"lang_parse_hidden": "crwdns4498:0crwdne4498:0",
"lang_misskeyparse_renote": "crwdns3804:0crwdne3804:0", "lang_misskeyparse_renote": "crwdns3804:0crwdne3804:0",
"lang_misskeyparse_renoteqt": "crwdns3806:0crwdne3806:0", "lang_misskeyparse_renoteqt": "crwdns3806:0crwdne3806:0",
"lang_misskeyparse_reaction": "crwdns3808:0crwdne3808:0", "lang_misskeyparse_reaction": "crwdns3808:0crwdne3808:0",

View File

@@ -167,12 +167,15 @@
"linkwarn": "crwdns4194:0crwdne4194:0", "linkwarn": "crwdns4194:0crwdne4194:0",
"connect": "crwdns4196:0crwdne4196:0", "connect": "crwdns4196:0crwdne4196:0",
"disconnect": "crwdns4198:0crwdne4198:0", "disconnect": "crwdns4198:0crwdne4198:0",
"lastFmWarn": "crwdns4490:0crwdne4490:0",
"templateedit": "crwdns4340:0crwdne4340:0", "templateedit": "crwdns4340:0crwdne4340:0",
"templateeditwarn": "crwdns4342:0crwdne4342:0", "templateeditwarn": "crwdns4342:0crwdne4342:0",
"template1": "crwdns4344:0{song}crwdnd4344:0{album}crwdnd4344:0{artist}crwdnd4344:0{url}crwdne4344:0", "template1": "crwdns4344:0{song}crwdnd4344:0{album}crwdnd4344:0{artist}crwdnd4344:0{url}crwdne4344:0",
"template2": "crwdns4346:0{song}crwdnd4346:0{album}crwdnd4346:0{artist}crwdnd4346:0{composer}crwdnd4346:0{hz}crwdnd4346:0{bitRate}crwdnd4346:0{genre}crwdne4346:0", "template2": "crwdns4346:0{song}crwdnd4346:0{album}crwdnd4346:0{artist}crwdnd4346:0{composer}crwdnd4346:0{hz}crwdnd4346:0{bitRate}crwdnd4346:0{genre}crwdne4346:0",
"template3": "crwdns4348:0crwdne4348:0", "template3": "crwdns4348:0crwdne4348:0",
"postartwork": "crwdns4210:0crwdne4210:0", "postartwork": "crwdns4210:0crwdne4210:0",
"searchArtwork": "crwdns4472:0crwdne4472:0",
"searchArtworkWarn": "crwdns4474:0crwdne4474:0",
"tts": "crwdns4212:0crwdne4212:0", "tts": "crwdns4212:0crwdne4212:0",
"bouyomi": "crwdns4214:0crwdne4214:0", "bouyomi": "crwdns4214:0crwdne4214:0",
"bouyomiWarn": "crwdns4216:0crwdne4216:0", "bouyomiWarn": "crwdns4216:0crwdne4216:0",

View File

@@ -2,6 +2,7 @@
"list":"List of accounts", "list":"List of accounts",
"back":"Back", "back":"Back",
"add":"Add an account", "add":"Add an account",
"addAcct": "Fill the instance domain (like mastodon.social)",
"codesetupwarn":"Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)", "codesetupwarn":"Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
"codesetup":"Code setup", "codesetup":"Code setup",
"mainacct":"Main an account", "mainacct":"Main an account",
@@ -19,5 +20,6 @@
"thisismisskey":"Login as Misskey", "thisismisskey":"Login as Misskey",
"misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.", "misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
"nodata":"No data", "nodata":"No data",
"accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)" "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"
} }

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