Compare commits

..

90 Commits

Author SHA1 Message Date
cutls
679151e8ea TheDesk 22.3.0 2021-06-18 17:06:45 +09:00
cutls
da76c6732d Merge branch 'master' of https://github.com/cutls/TheDesk 2021-06-18 16:29:07 +09:00
Cutls
b108f0e09d Update README.md 2021-06-18 16:29:01 +09:00
cutls
8d30d5d6dc dependabot 2021-06-18 16:22:32 +09:00
cutls
8b5a9520b2 git 2021-06-18 16:21:51 +09:00
Cutls
0f99a1098e Merge pull request #509 from cutls/dependabot/npm_and_yarn/app/dotenv-10.0.0
Bump dotenv from 9.0.2 to 10.0.0 in /app
2021-06-18 16:21:25 +09:00
Cutls
a773315bf6 Merge branch 'master' into dependabot/npm_and_yarn/app/dotenv-10.0.0 2021-06-18 16:21:19 +09:00
Cutls
6e247502da Merge pull request #519 from cutls/dependabot/npm_and_yarn/app/eslint-7.28.0
Bump eslint from 7.27.0 to 7.28.0 in /app
2021-06-18 16:20:49 +09:00
Cutls
3151ed383e Merge branch 'master' into dependabot/npm_and_yarn/app/eslint-7.28.0 2021-06-18 16:20:42 +09:00
Cutls
607a6a204b Merge pull request #520 from cutls/dependabot/npm_and_yarn/app/vue-2.6.14
Bump vue from 2.6.12 to 2.6.14 in /app
2021-06-18 16:20:18 +09:00
Cutls
0dae100c84 Merge pull request #521 from cutls/dependabot/npm_and_yarn/app/electron-13.1.2
Bump electron from 13.0.1 to 13.1.2 in /app
2021-06-18 16:20:09 +09:00
Cutls
d011c94ea2 Merge branch 'master' into dependabot/npm_and_yarn/app/electron-13.1.2 2021-06-18 16:20:04 +09:00
Cutls
cd59a644a5 Merge pull request #522 from cutls/dependabot/npm_and_yarn/app/normalize-url-4.5.1
Bump normalize-url from 4.5.0 to 4.5.1 in /app
2021-06-18 16:19:39 +09:00
Cutls
31ebb2df3f Merge pull request #524 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.11.7
Bump electron-builder from 22.11.5 to 22.11.7 in /app
2021-06-18 16:19:30 +09:00
Cutls
9c49a78318 New Crowdin updates (#527)
* New translations index.json (Romanian)

* New translations index.json (Polish)

* New translations index.json (Cornish)

* New translations index.json (Sinhala)

* New translations index.json (Spanish, Argentina)

* New translations index.json (Portuguese, Brazilian)

* New translations index.json (Vietnamese)

* New translations index.json (Chinese Traditional)

* New translations index.json (Chinese Simplified)

* 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)

* New translations index.json (Norwegian)

* New translations index.json (French)

* New translations index.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 (Greek)

* New translations index.json (German)

* New translations index.json (Danish)

* New translations index.json (Czech)

* New translations index.json (Catalan)

* New translations index.json (Bulgarian)

* New translations index.json (Arabic)

* New translations index.json (Afrikaans)

* New translations index.json (Spanish)

* New translations index.json (English)
2021-06-18 16:19:19 +09:00
Cutls
e3c10550d5 Merge pull request #525 from cutls/dependabot/npm_and_yarn/app/sweetalert2-11.0.17
Bump sweetalert2 from 11.0.12 to 11.0.17 in /app
2021-06-18 16:19:08 +09:00
Cutls
75dd9174a8 Merge pull request #526 from cutls/dependabot/npm_and_yarn/app/chokidar-3.5.2
Bump chokidar from 3.5.1 to 3.5.2 in /app
2021-06-18 16:18:58 +09:00
cutls
d62bc57368 add new fi 2021-06-18 16:16:37 +09:00
dependabot[bot]
184a2bf3aa Bump chokidar from 3.5.1 to 3.5.2 in /app
Bumps [chokidar](https://github.com/paulmillr/chokidar) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/paulmillr/chokidar/releases)
- [Commits](https://github.com/paulmillr/chokidar/compare/3.5.1...3.5.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-15 20:04:49 +00:00
dependabot[bot]
49c4c3f23f Bump sweetalert2 from 11.0.12 to 11.0.17 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.0.12 to 11.0.17.
- [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/v11.0.12...v11.0.17)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-14 20:03:35 +00:00
dependabot[bot]
aa377b78e0 Bump electron-builder from 22.11.5 to 22.11.7 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.11.5 to 22.11.7.
- [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.11.5...v22.11.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-11 20:03:24 +00:00
dependabot[bot]
a64813d2d9 Bump normalize-url from 4.5.0 to 4.5.1 in /app
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-10 10:31:59 +00:00
dependabot[bot]
ffcbe71ecb Bump electron from 13.0.1 to 13.1.2 in /app
Bumps [electron](https://github.com/electron/electron) from 13.0.1 to 13.1.2.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v13.0.1...v13.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 20:02:54 +00:00
dependabot[bot]
f9462ad5ae Bump vue from 2.6.12 to 2.6.14 in /app
Bumps [vue](https://github.com/vuejs/vue) from 2.6.12 to 2.6.14.
- [Release notes](https://github.com/vuejs/vue/releases)
- [Commits](https://github.com/vuejs/vue/compare/v2.6.12...v2.6.14)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-07 20:05:18 +00:00
dependabot[bot]
bb73a7eda7 Bump eslint from 7.27.0 to 7.28.0 in /app
Bumps [eslint](https://github.com/eslint/eslint) from 7.27.0 to 7.28.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.27.0...v7.28.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-07 20:04:47 +00:00
cutls
36ad187296 with acct lookup 2021-06-02 15:59:36 +09:00
cutls
5621ffbe42 fix and merge 2021-06-02 15:20:31 +09:00
cutls
9758a2a7d8 Merge branch 'master' of https://github.com/cutls/TheDesk 2021-06-02 15:20:09 +09:00
cutls
d6fd519086 fix keyboard layout 2021-06-02 15:19:58 +09:00
dependabot[bot]
b9ff0ec817 Bump dotenv from 9.0.2 to 10.0.0 in /app
Bumps [dotenv](https://github.com/motdotla/dotenv) from 9.0.2 to 10.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v9.0.2...v10.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-30 19:29:30 +00:00
Cutls
3601bfc664 Merge pull request #508 from cutls/dependabot/npm_and_yarn/app/sanitize-html-2.4.0
Bump sanitize-html from 2.3.3 to 2.4.0 in /app
2021-05-31 04:27:48 +09:00
Cutls
73a8a117b0 Merge pull request #512 from cutls/dependabot/npm_and_yarn/app/eslint-7.27.0
Bump eslint from 7.26.0 to 7.27.0 in /app
2021-05-31 04:27:30 +09:00
Cutls
4af29e0caa Merge pull request #513 from cutls/dependabot/npm_and_yarn/app/electron-13.0.1
Bump electron from 12.0.8 to 13.0.1 in /app
2021-05-31 04:27:19 +09:00
Cutls
8519980638 Merge pull request #514 from cutls/dependabot/npm_and_yarn/app/sweetalert2-11.0.12
Bump sweetalert2 from 11.0.8 to 11.0.12 in /app
2021-05-31 04:27:09 +09:00
Cutls
c7df190d79 New Crowdin updates (#506)
* 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 (Italian)

* New translations main.json (Hungarian)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Ukrainian)

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

* New translations main.json (Turkish)

* New translations main.json (Swedish)

* New translations main.json (Hebrew)

* 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 (Catalan)

* New translations main.json (Finnish)

* New translations main.json (Greek)

* New translations main.json (German)

* New translations main.json (Czech)

* New translations main.json (Danish)

* New translations main.json (Cornish)

* New translations main.json (Sinhala)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Vietnamese)

* New translations main.json (English)

* New translations index.json (Italian)

* New translations main.json (Italian)
2021-05-31 04:26:46 +09:00
dependabot[bot]
9290c146e3 Bump sweetalert2 from 11.0.8 to 11.0.12 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.0.8 to 11.0.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/v11.0.8...v11.0.12)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-27 20:04:32 +00:00
dependabot[bot]
7769113b3c Bump electron from 12.0.8 to 13.0.1 in /app
Bumps [electron](https://github.com/electron/electron) from 12.0.8 to 13.0.1.
- [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/v12.0.8...v13.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-25 20:03:03 +00:00
dependabot[bot]
dafc36b01d Bump eslint from 7.26.0 to 7.27.0 in /app
Bumps [eslint](https://github.com/eslint/eslint) from 7.26.0 to 7.27.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.26.0...v7.27.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-24 20:06:14 +00:00
dependabot[bot]
55a3571edd Bump sanitize-html from 2.3.3 to 2.4.0 in /app
Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.3.3 to 2.4.0.
- [Release notes](https://github.com/apostrophecms/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.3.3...2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-20 20:03:30 +00:00
cutls
bdae21bd12 plist resolutions to take xmldom's security fix 2021-05-20 15:26:42 +09:00
cutls
ac26f2ca6b Merge branch 'master' of https://github.com/cutls/TheDesk 2021-05-20 15:17:02 +09:00
cutls
723ff59a21 improve some styles with rounded-button 2021-05-20 15:16:58 +09:00
Cutls
c3feca504c Merge pull request #503 from cutls/dependabot/npm_and_yarn/app/electron-12.0.8
Bump electron from 12.0.7 to 12.0.8 in /app
2021-05-20 15:14:56 +09:00
Cutls
a294b1143b Merge branch 'master' into dependabot/npm_and_yarn/app/electron-12.0.8 2021-05-20 15:14:52 +09:00
Cutls
541826f2fd Merge pull request #504 from cutls/dependabot/npm_and_yarn/app/sweetalert2-11.0.8
Bump sweetalert2 from 10.16.7 to 11.0.8 in /app
2021-05-20 15:14:08 +09:00
Cutls
aa6c2ad186 Merge pull request #505 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.11.5
Bump electron-builder from 22.11.2 to 22.11.5 in /app
2021-05-20 15:13:59 +09:00
dependabot[bot]
c51dae6d60 Bump electron-builder from 22.11.2 to 22.11.5 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.11.2 to 22.11.5.
- [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.11.2...v22.11.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-19 20:04:58 +00:00
dependabot[bot]
b2a87ae99d Bump sweetalert2 from 10.16.7 to 11.0.8 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 10.16.7 to 11.0.8.
- [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/v10.16.7...v11.0.8)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-19 20:04:17 +00:00
dependabot[bot]
5230c6d672 Bump electron from 12.0.7 to 12.0.8 in /app
Bumps [electron](https://github.com/electron/electron) from 12.0.7 to 12.0.8.
- [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/v12.0.7...v12.0.8)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-18 20:04:44 +00:00
Cutls
29d0e80f24 Merge pull request #497 from cutls/dependabot/npm_and_yarn/app/dotenv-9.0.2
Bump dotenv from 9.0.1 to 9.0.2 in /app
2021-05-12 01:26:44 +09:00
Cutls
4b147593ca Merge pull request #498 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.11.2
Bump electron-builder from 22.11.1 to 22.11.2 in /app
2021-05-12 01:26:34 +09:00
dependabot[bot]
b1137d175a Bump electron-builder from 22.11.1 to 22.11.2 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.11.1 to 22.11.2.
- [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.11.1...v22.11.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 20:06:15 +00:00
dependabot[bot]
bbc90b6d6f Bump dotenv from 9.0.1 to 9.0.2 in /app
Bumps [dotenv](https://github.com/motdotla/dotenv) from 9.0.1 to 9.0.2.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v9.0.1...v9.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 20:05:34 +00:00
Cutls
9fe9bcd04e Merge pull request #495 from cutls/dependabot/npm_and_yarn/app/eslint-7.26.0
Bump eslint from 7.23.0 to 7.26.0 in /app
2021-05-11 03:13:57 +09:00
dependabot[bot]
79ae11aea8 Bump eslint from 7.23.0 to 7.26.0 in /app
Bumps [eslint](https://github.com/eslint/eslint) from 7.23.0 to 7.26.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.23.0...v7.26.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 18:12:40 +00:00
Cutls
50582d49f0 New Crowdin updates (#478)
* New translations index.json (German)

* New translations setting.json (Russian)

* New translations setting.json (Turkish)

* New translations setting.json (Swedish)

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

* New translations setting.json (Portuguese)

* New translations setting.json (Polish)

* New translations setting.json (Norwegian)

* New translations setting.json (Dutch)

* New translations setting.json (Cornish)

* New translations setting.json (Sinhala)

* New translations setting.json (Spanish, Argentina)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Ukrainian)

* New translations setting.json (Vietnamese)

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations setting.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations setting.json (Spanish)

* New translations setting.json (Romanian)

* New translations setting.json (French)

* New translations setting.json (Catalan)

* New translations setting.json (Italian)

* New translations setting.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations setting.json (Finnish)

* New translations setting.json (Greek)

* New translations setting.json (German)

* New translations setting.json (Danish)

* New translations setting.json (Czech)

* New translations setting.json (English)

* New translations setting.json (Russian)

* New translations setting.json (Turkish)

* New translations setting.json (Swedish)

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

* New translations setting.json (Portuguese)

* New translations setting.json (Polish)

* New translations setting.json (Norwegian)

* New translations setting.json (Dutch)

* New translations setting.json (Cornish)

* New translations setting.json (Sinhala)

* New translations setting.json (Spanish, Argentina)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Ukrainian)

* New translations setting.json (Vietnamese)

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations setting.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations setting.json (Spanish)

* New translations setting.json (Romanian)

* New translations setting.json (French)

* New translations setting.json (Catalan)

* New translations setting.json (Italian)

* New translations setting.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations setting.json (Finnish)

* New translations setting.json (Greek)

* New translations setting.json (German)

* New translations setting.json (Danish)

* New translations setting.json (Czech)

* New translations setting.json (English)

* New translations index.json (Catalan)

* New translations index.json (Bulgarian)

* New translations index.json (Arabic)

* New translations index.json (Afrikaans)

* New translations index.json (Romanian)

* New translations index.json (French)

* New translations index.json (Spanish)

* New translations index.json (Chinese Simplified)

* 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 (Chinese Traditional)

* New translations index.json (Cornish)

* New translations index.json (Sinhala)

* New translations index.json (Spanish, Argentina)

* New translations index.json (Portuguese, Brazilian)

* New translations index.json (Vietnamese)

* New translations index.json (Russian)

* New translations index.json (Finnish)

* New translations index.json (Greek)

* New translations index.json (German)

* New translations index.json (Danish)

* New translations index.json (Czech)

* New translations index.json (Hebrew)

* New translations index.json (Portuguese)

* New translations index.json (Norwegian)

* New translations index.json (Dutch)

* New translations index.json (Polish)

* New translations index.json (Italian)

* New translations index.json (Hungarian)

* New translations index.json (English)

* New translations main.json (Russian)

* New translations setting.json (Russian)

* New translations main.json (Russian)

* New translations main.json (Russian)

* New translations setting.json (Russian)

* New translations index.json (Spanish, Argentina)

* New translations setting.json (Spanish, Argentina)
2021-05-11 03:11:28 +09:00
Cutls
897fb3082d Merge pull request #494 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.11.1
Bump electron-builder from 22.10.5 to 22.11.1 in /app
2021-05-11 03:10:55 +09:00
Cutls
947d0b77bd Merge pull request #496 from cutls/dependabot/npm_and_yarn/app/dotenv-9.0.1
Bump dotenv from 8.2.0 to 9.0.1 in /app
2021-05-11 03:10:45 +09:00
dependabot[bot]
e07e79a918 Bump dotenv from 8.2.0 to 9.0.1 in /app
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.2.0 to 9.0.1.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.2.0...v9.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 18:05:46 +00:00
dependabot[bot]
cdc3b22752 Bump electron-builder from 22.10.5 to 22.11.1 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.10.5 to 22.11.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/compare/v22.10.5...v22.11.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 18:04:57 +00:00
Cutls
0988728bb2 Merge pull request #491 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.11.1
Bump electron-builder from 22.10.5 to 22.11.1 in /app
2021-05-11 03:04:12 +09:00
dependabot-preview[bot]
0ad628b259 Bump electron-builder from 22.10.5 to 22.11.1 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.10.5 to 22.11.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/compare/v22.10.5...v22.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-10 18:03:22 +00:00
Cutls
44af72f9e6 Merge pull request #486 from cutls/dependabot/npm_and_yarn/app/eslint-7.25.0
Bump eslint from 7.23.0 to 7.25.0 in /app
2021-05-11 03:02:51 +09:00
Cutls
2d0316035f Merge pull request #489 from cutls/dependabot/npm_and_yarn/app/sweetalert2-10.16.7
Bump sweetalert2 from 10.15.7 to 10.16.7 in /app
2021-05-11 03:02:36 +09:00
Cutls
735c2e153e Merge pull request #487 from cutls/dependabot/add-v2-config-file
Upgrade to GitHub-native Dependabot
2021-05-11 03:02:27 +09:00
Cutls
6f9d6cb35f Merge pull request #473 from cutls/dependabot/npm_and_yarn/app/sanitize-html-2.3.3
Bump sanitize-html from 2.3.2 to 2.3.3 in /app
2021-05-11 03:02:09 +09:00
Cutls
de796db39a Merge pull request #474 from cutls/dependabot/npm_and_yarn/app/fortawesome/fontawesome-free-5.15.3
Bump @fortawesome/fontawesome-free from 5.15.2 to 5.15.3 in /app
2021-05-11 03:02:01 +09:00
Cutls
88cb706ff5 Merge pull request #492 from cutls/dependabot/npm_and_yarn/app/electron-12.0.7
Bump electron from 12.0.2 to 12.0.7 in /app
2021-05-11 03:01:34 +09:00
Cutls
6bc19354c9 Merge pull request #493 from cutls/dependabot/npm_and_yarn/app/postcss-8.2.14
[Security] Bump postcss from 8.2.3 to 8.2.14 in /app
2021-05-11 03:01:22 +09:00
dependabot-preview[bot]
c70b69d043 [Security] Bump postcss from 8.2.3 to 8.2.14 in /app
Bumps [postcss](https://github.com/postcss/postcss) from 8.2.3 to 8.2.14. **This update includes a security fix.**
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.2.3...8.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-10 15:35:46 +00:00
dependabot-preview[bot]
f53e0f4550 Bump electron from 12.0.2 to 12.0.7 in /app
Bumps [electron](https://github.com/electron/electron) from 12.0.2 to 12.0.7.
- [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/v12.0.2...v12.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-07 20:14:15 +00:00
dependabot-preview[bot]
672de930ce Bump sweetalert2 from 10.15.7 to 10.16.7 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 10.15.7 to 10.16.7.
- [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/v10.15.7...v10.16.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-03 20:15:58 +00:00
dependabot-preview[bot]
d3d3d6a0aa Upgrade to GitHub-native Dependabot 2021-04-29 15:09:09 +00:00
dependabot-preview[bot]
2ba4d2303a Bump eslint from 7.23.0 to 7.25.0 in /app
Bumps [eslint](https://github.com/eslint/eslint) from 7.23.0 to 7.25.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.23.0...v7.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-27 23:37:00 +00:00
cutls
8acf86d9cb fetch the data with dialog 2021-04-18 19:11:39 +09:00
cutls
5de0ede4e1 font select 2021-04-18 18:47:30 +09:00
cutls
7db8989cd8 add dialog dropdown for hashtag and suggestion, add custom emojis suggestion 2021-04-18 16:14:41 +09:00
cutls
b047c80768 some design improve 2021-04-18 04:28:10 +09:00
cutls
d224e597fd fediversearch 2021-04-18 04:25:10 +09:00
cutls
f5956fed06 right click 2021-04-18 04:24:52 +09:00
cutls
28f6ccbfee second instance to customurl 2021-04-18 04:23:45 +09:00
cutls
e9aa22f5cf test 2021-04-16 21:14:00 +09:00
cutls
2c3fc66b0f animation 2021-04-15 16:33:34 +09:00
cutls
d2ac0f8421 readme 2021-04-15 15:47:41 +09:00
cutls
d20d7c622f readme 2021-04-15 15:43:52 +09:00
cutls
297306491e readme 2021-04-15 15:41:42 +09:00
cutls
70f5fefeab DL from TheDesk 2021-04-15 15:29:56 +09:00
cutls
da054f0a2e arm64 2021-04-15 15:08:24 +09:00
dependabot-preview[bot]
7feea86cf7 Bump @fortawesome/fontawesome-free from 5.15.2 to 5.15.3 in /app
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.15.2 to 5.15.3.
- [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.15.2...5.15.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-01 20:14:49 +00:00
dependabot-preview[bot]
269405a40f Bump sanitize-html from 2.3.2 to 2.3.3 in /app
Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/apostrophecms/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.3.2...2.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-01 20:14:23 +00:00
153 changed files with 11381 additions and 9649 deletions

49
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,49 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/app"
schedule:
interval: daily
time: "20:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: font-manager
versions:
- "> 0.3.0, < 0.4"
- dependency-name: sweetalert2
versions:
- 10.14.1
- 10.15.0
- 10.15.1
- 10.15.2
- 10.15.3
- 10.15.5
- 10.15.6
- 10.16.0
- 10.16.2
- 10.16.5
- dependency-name: electron
versions:
- 11.2.1
- 12.0.2
- 12.0.3
- 12.0.4
- dependency-name: eslint
versions:
- 7.18.0
- 7.19.0
- 7.20.0
- 7.21.0
- 7.22.0
- 7.24.0
- dependency-name: itunes-nowplaying-mac
versions:
- 0.4.0
- dependency-name: electron-dl
versions:
- 3.0.3
- 3.1.0
- 3.2.0
- dependency-name: electron-rebuild
versions:
- 2.3.4

1
.gitignore vendored
View File

@@ -21,6 +21,7 @@ app/view/cs
app/view/ps app/view/ps
app/view/es-AR app/view/es-AR
app/view/it-IT app/view/it-IT
app/view/pl-PL
app/git app/git
*.code-workspace *.code-workspace
releasenote.md releasenote.md

8
.prettierrc Normal file
View File

@@ -0,0 +1,8 @@
{
"tabWidth": 4,
"useTabs": true,
"semi": false,
"singleQuote": true,
"printWidth": 200,
"jsxBracketSameLine": true
}

View File

@@ -16,7 +16,7 @@
Mastodon/Misskey client for PC(Windows/Linux/macOS) Mastodon/Misskey client for PC(Windows/Linux/macOS)
オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md) オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)
Download:[TheDesk](https://thedesk.top) [![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
</div> </div>
@@ -44,9 +44,7 @@ Please write issues to improve TheDesk affinity with Pleroma.
## Contributors ## Contributors
* <img src="https://user-images.githubusercontent.com/17561618/66582029-162df380-ebbc-11e9-8a6f-1832b3a35d89.png" width="20">[toneji](https://minohdon.jp/@toneji) Build for macOS(Now: Travis CI) [![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
* <img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4" width="20">[popn_ja](https://popon.pptdn.jp/@popn_ja) Build for Linux(Now: Travis CI)
* <img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png" width="20">[kPherox](https://pl.kpherox.dev/kPherox) Fellow coder
## Support ## Support

View File

@@ -15,7 +15,8 @@
![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk) ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)
Mastodon/Misskey client for PC(Windows/Linux/macOS) Mastodon/Misskey client for PC(Windows/Linux/macOS)
オープンソースSNSマストドン/MisskeyのPC向けクライアント オープンソースSNSマストドン/MisskeyのPC向けクライアント
Download:[TheDesk](https://thedesk.top)
[![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
</div> </div>

View File

@@ -1,139 +1,134 @@
<!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;
}
a, <head>
button { <title>TheDesk</title>
-webkit-app-region: no-drag; <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;
}
a,
button {
-webkit-app-region: no-drag;
}
.container {
width: 100%;
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 {
grid-area: name1;
}
.area-data1 {
grid-area: data1;
}
.area-name2 {
grid-area: name2;
}
.area-data2 {
grid-area: data2;
}
.area-name3 {
grid-area: name3;
}
.area-data3 {
grid-area: data3;
}
.area-name4 {
grid-area: name4;
}
.area-data4 {
grid-area: data4;
}
.area-name5 {
grid-area: name5;
}
.area-data5 {
grid-area: data5;
}
.area-name6 {
grid-area: name6;
}
.area-data6 {
grid-area: data6;
}
</style>
</head>
.container { <body class="center" style="overflow: hidden;">
width: 100%; <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
display: grid; <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
grid-template-columns: 1fr 1fr; <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
grid-template-rows: 1fr 1fr 1fr 1fr 1fr; <img src="./img/desk.svg" style="max-width: 58%;" />
grid-template-areas: 'name1 data1' 'name2 data2' 'name3 data3' 'name4 data4' 'name5 data5' 'name6 data6'; <h5>TheDesk</h5>
text-align: left; <div class="container">
margin: 5px; <div class="area-name1">Display version</div>
} <div class="area-data1" id="now"></div>
<div class="area-name2">Internal version</div>
<div class="area-data2" id="ver"></div>
<div class="area-name3">Commit(7chars)</div>
<div class="area-data3" id="hash"></div>
<div class="area-name4">Chromium</div>
<div class="area-data4" id="chrome"></div>
<div class="area-name5">Electron</div>
<div class="area-data5" id="electron"></div>
<div class="area-name6">Node.js</div>
<div class="area-data6" id="node"></div>
</div>
<div class="cp">
Copyright &copy; TheDesk 2018<br /> Main developer(author): <a href="https://1m.cutls.com/@Cutls" target="_blank">Cutls P</a><br />
<a href="https://github.com/cutls/TheDesk/graphs/contributors" style="text-align: center; user-select: none;"><img src="https://opencollective.com/TheDesk/contributors.svg?width=700&button=false" style="width: 100%"></a>
<br /><a href="https://thedesk.top" target="_blank">Web site</a>
</div>
<button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
<script type="text/javascript" src="./js/ui/theme.js"></script>
<script>
var about = JSON.parse(localStorage.getItem('about'))
$('#now').text(localStorage.getItem('ver'))
$('#node').text(about[0])
$('#chrome').text(about[1])
$('#electron').text(about[2])
if (location.search) {
var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
var ver = m[1]
$('#ver').text(ver)
}
$('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
$(document).on('click', 'a', (e) => {
var url = $(e.target).attr('href')
postMessage(['openUrl', url], '*')
return false
})
</script>
</body>
.area-name1 { </html>
grid-area: name1;
}
.area-data1 {
grid-area: data1;
}
.area-name2 {
grid-area: name2;
}
.area-data2 {
grid-area: data2;
}
.area-name3 {
grid-area: name3;
}
.area-data3 {
grid-area: data3;
}
.area-name4 {
grid-area: name4;
}
.area-data4 {
grid-area: data4;
}
.area-name5 {
grid-area: name5;
}
.area-data5 {
grid-area: data5;
}
.area-name6 {
grid-area: name6;
}
.area-data6 {
grid-area: data6;
}
</style>
</head>
<body class="center" style="overflow: hidden;">
<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
<script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
<img src="./img/desk.svg" style="max-width: 62%;" />
<h5>TheDesk</h5>
<div class="container">
<div class="area-name1">Display version</div>
<div class="area-data1" id="now"></div>
<div class="area-name2">Internal version</div>
<div class="area-data2" id="ver"></div>
<div class="area-name3">Commit(7chars)</div>
<div class="area-data3" id="hash"></div>
<div class="area-name4">Chromium</div>
<div class="area-data4" id="chrome"></div>
<div class="area-name5">Electron</div>
<div class="area-data5" id="electron"></div>
<div class="area-name6">Node.js</div>
<div class="area-data6" id="node"></div>
</div>
<div class="cp">
Copyright &copy; TheDesk 2018<br />
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 href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a
href="https://pl.kpherox.dev/kPherox"
target="_blank"
>kPherox</a
>
and all users
<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" />
<br /><a href="https://thedesk.top" target="_blank">Web site</a>
</div>
<button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
<script type="text/javascript" src="./js/ui/theme.js"></script>
<script>
var about = JSON.parse(localStorage.getItem('about'))
$('#now').text(localStorage.getItem('ver'))
$('#node').text(about[0])
$('#chrome').text(about[1])
$('#electron').text(about[2])
if (location.search) {
var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
var ver = m[1]
$('#ver').text(ver)
}
$('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
$(document).on('click', 'a', (e) => {
var url = $(e.target).attr('href')
postMessage(['openUrl', url], '*')
return false
})
</script>
</body>
</html>

View File

@@ -1,4 +1,6 @@
const { AiScript, parse, values, utils } = require('@syuilo/aiscript') const { AiScript, parse, values, utils } = require('@syuilo/aiscript')
const gcc = require('textarea-caret')
global.getCaretCoordinates = gcc
global.sanitizeHtml = require('sanitize-html') global.sanitizeHtml = require('sanitize-html')
global.asValue = values global.asValue = values
global.AiScript = AiScript global.AiScript = AiScript

View File

@@ -139,6 +139,7 @@ async function cmd(options) {
) )
} }
if ((isTrue(options, 'withArm64') && arch == 'x64') || arch == 'arm64') { if ((isTrue(options, 'withArm64') && arch == 'x64') || arch == 'arm64') {
config.nsis.artifactName = artifactName.replace('${arch}', 'arm64')
await build(Platform.WINDOWS, Arch.arm64, config) await build(Platform.WINDOWS, Arch.arm64, config)
fs.renameSync( fs.renameSync(
`../build/TheDesk ${version}.exe`, `../build/TheDesk ${version}.exe`,

View File

@@ -91,4 +91,19 @@ i.left {
} }
.text-line-icon { .text-line-icon {
font-size: 1rem; font-size: 1rem;
}
.loginBtnWrap {
padding-top: 10px !important;
}
#add {
max-width: 1000px;
}
.autocomplete-content {
min-width: 450px;
}
.autocomplete-content li {
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-word;
overflow: hidden;
} }

View File

@@ -28,7 +28,9 @@ html {
text-transform: none; text-transform: none;
height: 2.76rem; height: 2.76rem;
line-height: 2.76rem; line-height: 2.76rem;
border-radius: 0.5rem;
} }
.markdown { .markdown {
display: none; display: none;
} }
@@ -88,16 +90,16 @@ option {
#imagewrap { #imagewrap {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 4px);
} }
#imagewrap img.rotate-90 { #imagewrap img.rotate-90 {
transform: rotate(-90deg) transform: rotate(-90deg);
} }
#imagewrap img.rotate-180 { #imagewrap img.rotate-180 {
transform: rotate(-180deg) transform: rotate(-180deg);
} }
#imagewrap img.rotate-270 { #imagewrap img.rotate-270 {
transform: rotate(-270deg) transform: rotate(-270deg);
} }
.pointer { .pointer {
cursor: pointer; cursor: pointer;
@@ -234,6 +236,12 @@ blockquote:before,
right: 0; right: 0;
top: 0; top: 0;
} }
.menu-icon {
font-size: 1.4rem !important;
top: 0.3rem;
line-height: 1rem !important;
position: relative;
}
#start { #start {
display: none; display: none;
position: fixed; position: fixed;
@@ -329,8 +337,26 @@ blockquote:before,
.collapsible-header:focus { .collapsible-header:focus {
background-color: var(--thirdColor) !important; background-color: var(--thirdColor) !important;
} }
.modal-footer { .modal .modal-footer {
background-color: var(--modalfooter) !important; background-color: var(--modalfooter) !important;
border-radius: 0;
padding: 0;
}
.modal {
border-radius: 1.5rem;
}
.progress .determinate,
.progress .indeterminate {
background-color: var(--active);
}
.nomargin {
margin: 0;
}
#imginfo {
float: left;
padding-top: 0.23rem;
line-height: normal;
padding-left: 1rem;
} }
.font { .font {
font-size: 1.5rem; font-size: 1.5rem;
@@ -342,7 +368,8 @@ blockquote:before,
.release-do { .release-do {
border: solid 2px; border: solid 2px;
border-color: var(--text); border-color: var(--text);
padding: 5px; padding: 1.5rem;
border-radius: 0.5rem;
} }
#pickers { #pickers {
display: flex; display: flex;
@@ -392,7 +419,8 @@ input[type='color']::-webkit-color-swatch {
color: var(--text); color: var(--text);
} }
#left-menu a:hover { #left-menu a:hover {
background-color: var(--beforehover); background-color: var(--emphasized);
filter: brightness(80%);
} }
#left-menu span { #left-menu span {
margin-left: 0.4rem; margin-left: 0.4rem;
@@ -401,7 +429,9 @@ input[type='color']::-webkit-color-swatch {
background-color: var(--emphasized); background-color: var(--emphasized);
} }
#left-menu a.active span { #left-menu a.active span {
text-decoration: underline; text-decoration: none;
border-bottom: 1px solid;
padding-bottom: 0.5px;
} }
#right-menu { #right-menu {
width: 100%; width: 100%;
@@ -417,16 +447,27 @@ input[type='color']::-webkit-color-swatch {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
width: 13rem; min-width: 150px;
height: 3.1rem; width: 50%;
height: 2.5rem;
cursor: pointer; cursor: pointer;
color: var(--text); color: var(--text);
} }
#tltype .type div {
margin-left: 5px;
margin-right: 5px;
margin-top: 3px;
}
#tltype .type span { #tltype .type span {
width: calc(100% - 2.3rem); width: calc(100% - 4rem);
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-word;
overflow: hidden;
} }
#tltype .type:hover { #tltype .type:hover {
background-color: var(--beforehover); background-color: var(--emphasized);
filter: brightness(80%);
} }
#tltype .active { #tltype .active {
background-color: var(--emphasized); background-color: var(--emphasized);
@@ -498,7 +539,8 @@ textarea {
font-size: 1rem !important; font-size: 1rem !important;
font-family: inherit; font-family: inherit;
} }
.swal2-popup, .swal2-header { .swal2-popup,
.swal2-header {
background-color: var(--subcolor) !important; background-color: var(--subcolor) !important;
} }
.swal2-title, .swal2-title,
@@ -510,7 +552,7 @@ h2.swal2-title {
line-height: 100%; line-height: 100%;
} }
.swal2-close:focus { .swal2-close:focus {
background-color: inherit !important; background-color: inherit !important;
box-shadow: none !important; box-shadow: none !important;
} }
.swal2-actions { .swal2-actions {
@@ -558,6 +600,7 @@ h2.swal2-title {
background-color: var(--emphasized); background-color: var(--emphasized);
} }
#pageSrc { #pageSrc {
border-radius: 10px;
position: absolute; position: absolute;
top: 0; top: 0;
left: calc(50vw - 11.53rem); left: calc(50vw - 11.53rem);
@@ -565,10 +608,22 @@ h2.swal2-title {
max-width: 100%; max-width: 100%;
background-color: var(--subcolor); background-color: var(--subcolor);
z-index: 501; z-index: 501;
padding: 0.4rem;
} }
#pageSrcInput { .pageSrcBtn:hover {
width: 12.3rem; background-color: var(--selected);
}
.srcQ {
margin-top: 0.4rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
border-bottom: 1px solid;
}
.lastPSB {
margin-bottom: 0.4rem;
}
.pageSrcBtn {
padding-left: 0.5rem;
padding-right: 0.5rem;
} }
.voice { .voice {
clip: rect(1px, 1px, 1px, 1px); clip: rect(1px, 1px, 1px, 1px);
@@ -689,10 +744,19 @@ button {
} }
.pluginNex { .pluginNex {
width: 2rem; width: 2rem;
text-align: center; text-align: center;
} }
.pluginNex span { .pluginNex span {
font-size: 2rem; font-size: 2rem;
position: relative; position: relative;
top: -4px; top: -4px;
} }
#fonts {
overflow-y: scroll;
width: 22rem;
height: 40rem;
position: absolute;
background-color: var(--bg);
z-index: 2;
padding: 5px;
}

View File

@@ -69,6 +69,20 @@ textarea {
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
} }
#suggest {
position: absolute;
top: 0;
left: 0;
background-color: var(--bg);
z-index: 2;
border-radius: 0.5rem;
display: none;
max-height: 10rem;
}
#suggest a {
margin-left: 0.5rem;
margin-right: 0.5rem;
}
#emoji-list { #emoji-list {
width: 100%; width: 100%;
height: 15.4rem; height: 15.4rem;

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -359,8 +359,8 @@ iframe,
grid-area: actions; grid-area: actions;
} }
.area-actions .btn-flat { .area-actions .btn-flat {
height: 1rem; height: 1.3rem;
line-height: 1rem; line-height: 1.3rem;
} }
.area-actions .btn-flat, .area-actions .btn-flat,
.area-vis i, .area-vis i,
@@ -384,7 +384,16 @@ iframe,
margin: 0.15rem; margin: 0.15rem;
grid-area: side; grid-area: side;
} }
.notf-udg-text {
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-word;
overflow: hidden;
max-width: calc(100% - 150px);
display: inline-block;
position: relative;
top: 0.2rem;
}
.cusr { .cusr {
user-select: text; user-select: text;
padding-left: 0.4rem; padding-left: 0.4rem;
@@ -409,6 +418,12 @@ iframe,
margin-top: 0.46rem; margin-top: 0.46rem;
margin-left: 0.46rem; margin-left: 0.46rem;
} }
.landing {
text-align: center;
display: flex;
flex-direction: column;
align-items: center;
}
.quote-inline { .quote-inline {
display: none; display: none;
@@ -442,6 +457,12 @@ iframe,
.btn-flat { .btn-flat {
color: var(--text); color: var(--text);
} }
.sublink {
font-size: 1.4rem !important;
position: relative;
top: 0.4rem;
cursor: pointer;
}
.area-side i { .area-side i {
margin-left: 0.75rem; margin-left: 0.75rem;
} }
@@ -452,6 +473,9 @@ iframe,
font-size: 1.2rem; font-size: 1.2rem;
margin-right: 0.15rem; margin-right: 0.15rem;
} }
.action li i {
margin-right: 0.5rem;
}
.action .fa-quote-right { .action .fa-quote-right {
margin-top: 0.15rem; margin-top: 0.15rem;
} }
@@ -561,7 +585,9 @@ p:not(:last-child) {
font-weight: bold; font-weight: bold;
text-decoration: underline; text-decoration: underline;
} }
.rotate-90 {
transform: rotate(90deg);
}
.area-notice { .area-notice {
grid-area: notice; grid-area: notice;
} }
@@ -578,13 +604,32 @@ p:not(:last-child) {
width: 8rem; width: 8rem;
display: flex; display: flex;
} }
.area-sta .hide {
display: inline-block !important;
}
.small-header .area-sta::-webkit-scrollbar { .small-header .area-sta::-webkit-scrollbar {
height: 5px; height: 5px;
} }
#tagContextMenu {
position: absolute;
top: 0;
left: 0;
background-color: var(--subcolor);
z-index: 2;
border-radius: 0.4rem;
}
#tagContextMenu a {
display: block;
color: var(--text);
padding-left: 0.5rem;
padding-right: 0.5rem;
}
#tagContextMenu a:hover {
background-color: var(--selected);
}
.firstTCM {
margin-top: 0.4rem;
}
.lastTCM {
margin-bottom: 0.4rem;
}
.area-notice_name { .area-notice_name {
grid-area: notice_name; grid-area: notice_name;
overflow: hidden; overflow: hidden;
@@ -676,13 +721,24 @@ p:not(:last-child) {
padding-left: 23px !important; padding-left: 23px !important;
margin-right: 5px; margin-right: 5px;
} }
.columnSettings {
display: flex;
flex-wrap: wrap;
}
.notf-indv-box .setting { .notf-indv-box .setting {
font-size: 1rem; font-size: 1rem;
width: calc(25% - 3px); width: calc(25% - 6px);
text-align: left; margin: 3px;
padding: 5px; height: 100px;
height: 70px;
text-align: center; text-align: center;
display: flex;
flex-direction: column;
padding-top: 17px;
border: 1px solid;
border-radius: 5px;
}
.notf-indv-box .setting:hover {
color: var(--text);
} }
.notf-exclude-btn { .notf-exclude-btn {
border: 1px solid; border: 1px solid;
@@ -721,6 +777,9 @@ p:not(:last-child) {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.dropdown-content li {
padding-top: 0.4rem;
}
.fa-2x > .emoji-img { .fa-2x > .emoji-img {
width: 2.3rem !important; width: 2.3rem !important;
height: 2.3rem !important; height: 2.3rem !important;

View File

@@ -24,21 +24,20 @@
} }
#his-float-data { #his-float-data {
height: 100%; height: 100%;
overflow-y: hidden; overflow-y: hidden;
} }
#his-leftside { #his-leftside {
width: 28.4rem; width: 28.4rem;
max-width: 30vw; max-width: 30vw;
} }
#his-float-timeline { #his-float-timeline {
max-width: 47.5rem; max-width: 47.5rem;
min-width: calc(100% - 29.4rem); width: calc(100% - 28.4rem);
height: 100%; height: 100%;
overflow-y: hidden; overflow-y: hidden;
} }
#his-basic-prof { #his-basic-prof {
display: flex; display: flex;
min-height: 10rem; min-height: 10rem;
} }
#his-field { #his-field {
@@ -150,13 +149,24 @@
background-color: var(--bg); background-color: var(--bg);
} }
#hisdropdown li a { #hisdropdown li a {
color: white; color: var(--text);
} }
#hisdropdown li:hover { #hisdropdown li:hover {
background-color: var(--active); background-color: var(--active);
} }
#his-data-title { #his-data-title-wrap {
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 1.5rem; font-size: 1.5rem;
display: flex;
justify-content: center;
align-items: center;
} }
#his-data-title .material-icons {
position: relative;
top: 5px;
margin-right: 3px;
}
#his-data-title a {
color: white;
}

View File

@@ -5,20 +5,6 @@ function verck(ver, jp) {
$('body').addClass(localStorage.getItem('platform')) $('body').addClass(localStorage.getItem('platform'))
var date = new Date() var date = new Date()
var showVer = false var showVer = false
//Spotify
if (localStorage.getItem('spotify')) {
localStorage.removeItem('spotify')
localStorage.removeItem('spotify-refresh')
var spDc = 'Spotify NowPlaying sysytem was changed, please re-login to Spotify'
if(lang.language == 'ja') {
spDc = 'Spotify NowPlayingの機能が変更されたため、もう一度ログインしてください'
}
Swal.fire({
type: 'info',
title: spDc,
})
}
//Spotify(e)
if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) { if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
showVer = 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%;')
@@ -44,10 +30,7 @@ function verck(ver, jp) {
localStorage.setItem('ver', ver) localStorage.setItem('ver', ver)
if (!showVer) { if (!showVer) {
console.log(showVer) console.log(showVer)
if ( if (!localStorage.getItem('showSupportMe')) {
date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
!localStorage.getItem('showSupportMe')
) {
if (date.getMonth() == 11) { if (date.getMonth() == 11) {
var yrs = date.getFullYear() + 1 var yrs = date.getFullYear() + 1
var nextmonth = yrs * 100 + 1 var nextmonth = yrs * 100 + 1
@@ -55,21 +38,35 @@ function verck(ver, jp) {
var yrs = date.getFullYear() var yrs = date.getFullYear()
var nextmonth = yrs * 100 + date.getMonth() + 2 var nextmonth = yrs * 100 + date.getMonth() + 2
} }
if (lang.language != 'ja') {
$('#support-btm-ja').addClass('hide')
$('#support-btm-en').removeClass('hide')
}
localStorage.setItem('showSupportMe', nextmonth) localStorage.setItem('showSupportMe', nextmonth)
$('#support-btm').removeClass('hide') } else {
$('#support-btm').animate( if (
{ date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe')
bottom: '0' ) {
}, if (date.getMonth() == 11) {
{ var yrs = date.getFullYear() + 1
duration: 300 var nextmonth = yrs * 100 + 1
} else {
var yrs = date.getFullYear()
var nextmonth = yrs * 100 + date.getMonth() + 2
} }
) localStorage.setItem('showSupportMe', nextmonth)
if (lang.language != 'ja') {
$('#support-btm-ja').addClass('hide')
$('#support-btm-en').removeClass('hide')
}
$('#support-btm').removeClass('hide')
$('#support-btm').animate(
{
bottom: '0'
},
{
duration: 300
}
)
}
} }
} }
var platform = localStorage.getItem('platform') var platform = localStorage.getItem('platform')
console.log('Your platform:' + platform) console.log('Your platform:' + platform)
@@ -114,11 +111,6 @@ function verck(ver, jp) {
.then(function(mess) { .then(function(mess) {
console.table(mess) console.table(mess)
if (mess) { if (mess) {
//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
localStorage.setItem('askjp_jp_ua', true)
$('#askjp_jp_ua').removeClass('hide')
}
var platform = localStorage.getItem('platform') var platform = localStorage.getItem('platform')
if (platform == 'darwin') { if (platform == 'darwin') {
var newest = mess.desk_mac var newest = mess.desk_mac

View File

@@ -423,10 +423,6 @@ function login(url) {
versionChecker(url) versionChecker(url)
$('#add').hide() $('#add').hide()
postMessage(['openUrl', auth], '*') postMessage(['openUrl', auth], '*')
if ($('#linux:checked').val() == 'on') {
} else {
postMessage(['sendSinmpleIpc', 'quit'], '*')
}
} }
} }
} }
@@ -625,15 +621,16 @@ function misskeyAuth(url, mkc) {
//テキストボックスにURL入れた //テキストボックスにURL入れた
function instance() { function instance() {
var url = $('#url').val() var url = $('#autocomplete-input').val()
if (url.indexOf('@') != -1 || url.indexOf('https') != -1) { if (url.indexOf('@') != -1 || url.indexOf('https') != -1) {
alert('入力形式が違います。(Cutls@mstdn.jpにログインする場合、入力するのは"mstdn.jp"です。)') alert('入力形式が違います。(Cutls@mstdn.jpにログインする場合、入力するのは"mstdn.jp"です。)')
return false return false
} }
login(url) login(url)
} }
//コード入れてAccessTokenゲット //コード入れてAccessTokenゲット
function code(code) { function code(code) {
var red = localStorage.getItem('redirect')
localStorage.removeItem('redirect') localStorage.removeItem('redirect')
if (!code) { if (!code) {
var code = $('#code').val() var code = $('#code').val()
@@ -696,7 +693,7 @@ function code(code) {
} }
return return
} else { } else {
var red = 'urn:ietf:wg:oauth:2.0:oob' if (!red) red = 'urn:ietf:wg:oauth:2.0:oob'
if (~url.indexOf('pixelfed')) { if (~url.indexOf('pixelfed')) {
red = 'https://thedesk.top/hello.html' red = 'https://thedesk.top/hello.html'
} }
@@ -720,6 +717,7 @@ function code(code) {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
M.toast({ html: lang.lang_fatalerroroccured + 'Error: cannot complete', displayLength: 5000 })
setLog(start, this.status, json) setLog(start, this.status, json)
} }
if (json['access_token']) { if (json['access_token']) {
@@ -1089,15 +1087,14 @@ function coloradd(key, bg, txt) {
//入力時にハッシュタグと@をサジェスト //入力時にハッシュタグと@をサジェスト
var timer = null var timer = null
var input = document.getElementById('url') var input = document.getElementById('autocomplete-input')
var prev_val = input.value var prev_val = input.value
var oldSuggest var oldSuggest
var suggest var suggest
input.addEventListener( input.addEventListener(
'focus', 'focus',
function () { function () {
$('#ins-suggest').html('') const instance = M.Autocomplete.getInstance(input)
window.clearInterval(timer) window.clearInterval(timer)
timer = window.setInterval(function () { timer = window.setInterval(function () {
var new_val = input.value var new_val = input.value
@@ -1108,7 +1105,7 @@ input.addEventListener(
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) {
@@ -1125,21 +1122,20 @@ input.addEventListener(
}) })
.then(function (json) { .then(function (json) {
if (!json.error) { if (!json.error) {
var urls = 'Suggest:' let data = {}
Object.keys(json.data).forEach(function (key) { Object.keys(json.data).forEach(function (key) {
var url = json.data[key] var url = json.data[key]
urls = data[url.uri] = escapeHTML(url.title ? url.title : url.uri)
urls +
`<a onclick="login('${url.uri}')" class="pointer" title="${url.uri}">${escapeHTML(url.title ? url.title : url.uri)}</a>, `
}) })
$('#ins-suggest').html(urls) instance.updateData(data)
instance.open()
} else { } else {
console.error(json.error) console.error(json.error)
} }
}) })
} }
oldSuggest = suggest oldSuggest = suggest
prev_value = new_val prev_val = new_val
} }
}, 1000) }, 1000)
}, },
@@ -1157,3 +1153,12 @@ input.addEventListener(
function asReadEnd() { function asReadEnd() {
postMessage(['asReadComp', ''], '*') postMessage(['asReadComp', ''], '*')
} }
// Or with jQuery
$(document).ready(function(){
$('input.autocomplete').autocomplete({
data: {},
});
});

View File

@@ -29,7 +29,7 @@ $(document).on('click', 'a', e => {
acct_id = 0 acct_id = 0
} }
$a.parent().addClass('loadp') $a.parent().addClass('loadp')
$a.parent().text('Loading...')
detEx(url, acct_id) detEx(url, acct_id)
} }
} else if (tags) { } else if (tags) {
@@ -186,7 +186,7 @@ onmessage = function (e) {
} else if (e.data[0] == 'asReadEnd') { } else if (e.data[0] == 'asReadEnd') {
asReadEnd() asReadEnd()
} else if (e.data[0] == 'accessibility') { } else if (e.data[0] == 'accessibility') {
console.log('atrue') console.log('accessibility mode')
$('body').addClass('accessibility') $('body').addClass('accessibility')
$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>') $('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
} else if (e.data[0] == 'logData') { } else if (e.data[0] == 'logData') {
@@ -200,6 +200,22 @@ onmessage = function (e) {
}) })
} else if (e.data[0] == 'twitterLoginComplete') { } else if (e.data[0] == 'twitterLoginComplete') {
location.reload() location.reload()
} else if (e.data[0] == 'customUrl') {
const mode = e.data[1][0]
const codex = e.data[1][1]
if (mode === 'share') {
$('textarea').focus()
$('#textarea').val(decodeURI(codex))
show()
$('body').removeClass('mini-post')
$('.mini-btn').text('expand_less')
} else if (mode === 'manager' || mode === 'login') {
code(codex)
} else if (mode === 'spotify') {
var coder = codex.split(':')
localStorage.setItem('spotify', coder[0])
localStorage.setItem('spotify-refresh', coder[1])
}
} }
} }
/* PWA */ /* PWA */
@@ -236,3 +252,34 @@ const connection = function (event) {
} }
window.onoffline = connection window.onoffline = connection
window.ononline = connection window.ononline = connection
let lastSelection = null
let isSame = true
$(document).on('keyup mouseup', function (e) {
lastSelection = (window.getSelection().toString() !== '') ? window.getSelection().getRangeAt(0) : null
if (!isSame) $('#pageSrc').addClass('hide')
})
// カスタム右クリックメニュー
$(document).on('contextmenu', function (e) {
// テキスト選択中であれば何もしない
if (lastSelection !== null) {
const currentSelection = window.getSelection().getRangeAt(0)
for (let key in currentSelection) {
if (currentSelection[key] != lastSelection[key]) {
isSame = false
break
}
}
if (isSame && currentSelection != '') {
$('#pageSrc').removeClass('hide')
$('#pageSrc').css('left', e.pageX)
$('#pageSrc').css('top', e.pageY)
$('.srcQ').text(currentSelection)
}
}
})
$('textarea, input').on('contextmenu', function (e) {
postMessage(['textareaContextMenu', { x: e.pageX, y: e.pageY }], '*')
})

View File

@@ -83,6 +83,8 @@ onmessage = function(e) {
ipc.send('log', e.data[1]) ipc.send('log', e.data[1])
} else if (e.data[0] == 'twitterLogin') { } else if (e.data[0] == 'twitterLogin') {
ipc.send('twitterLogin', e.data[1]) ipc.send('twitterLogin', e.data[1])
} else if (e.data[0] == 'textareaContextMenu') {
ipc.send('textareaContextMenu', e.data[1])
} }
} }
//version.js //version.js
@@ -236,3 +238,9 @@ ipc.on('accessibility', function(event, arg) {
ipc.on('twitterLoginComplete', function(event, arg) { ipc.on('twitterLoginComplete', function(event, arg) {
postMessage(['twitterLoginComplete', ''], '*') postMessage(['twitterLoginComplete', ''], '*')
}) })
ipc.on('alert', function(event, arg) {
postMessage(['alert', arg], '*')
})
ipc.on('customUrl', function(event, args) {
postMessage(['customUrl', args], '*')
})

View File

@@ -19,7 +19,7 @@ function emojiToggle(reaction) {
if (width) { if (width) {
width = width.replace('px', '') * 1 + 300 width = width.replace('px', '') * 1 + 300
} else { } else {
width = 600 width = reaction ? 300 : 600
} }
$('#post-box').css('width', width + 'px') $('#post-box').css('width', width + 'px')
$('#suggest').html('') $('#suggest').html('')
@@ -126,8 +126,10 @@ function emojiGet(parse, started) {
md['if_categorized'] = if_categorized md['if_categorized'] = if_categorized
localStorage.setItem('emojis_' + acct_id, JSON.stringify(md)) localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
localStorage.setItem(`emojis_raw_${acct_id}`, JSON.stringify(json))
} else { } else {
localStorage.setItem('emojis_' + acct_id, JSON.stringify(md)) localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
localStorage.setItem(`emojis_raw_${acct_id}`, JSON.stringify(json))
} }
localStorage.setItem('emojiseek', 0) localStorage.setItem('emojiseek', 0)
if (!started) { if (!started) {

File diff suppressed because it is too large Load Diff

View File

@@ -9,183 +9,162 @@ var suggest
input.addEventListener( input.addEventListener(
'focus', 'focus',
function() { function () {
localStorage.removeItem('cursor') localStorage.removeItem('cursor')
var acct_id = $('#post-acct-sel').val() var acct_id = $('#post-acct-sel').val()
$('#suggest').html('') $('#suggest').html('')
$('#suggest').hide()
window.clearInterval(timer) window.clearInterval(timer)
timer = window.setInterval(function() { timer = window.setInterval(function () {
var new_val = input.value var new_val = input.value
if (new_val == '') { if (new_val == '') {
$('#suggest').html('') $('#suggest').html('')
if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) { $('#suggest').hide()
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width + 'px')
}
return return
} }
if (prev_val != new_val) { if (prev_val != new_val) {
var tag = new_val.match(/#(\S{3,})/) const pos = input.selectionStart
var acct = new_val.match(/@(\S{3,})/) let startI = pos - 1
if (tag && tag[1]) { let hasDomain = false
var q = tag[1] let hasDomainOnce = false
} else if (acct && acct[1]) { for (startI = pos - 1; startI >= 0; startI--) {
var q = acct[1] if (new_val[startI].match(/\./)) hasDomain = true
if (new_val[startI].match(/#|@|:/) && !hasDomain) break
if (new_val[startI].match(/@/) && hasDomainOnce) break
if (new_val[startI].match(/@/) && !hasDomainOnce) hasDomainOnce = true
}
const target = new_val.substr(startI, pos - startI)
var tag = target.match(/#(\S{3,})/g)
var acct = target.match(/@(\S{3,})(@(\S{3,}))?/g)
var emoji = target.match(/:(\S{1,})/g)
if (emoji && emoji[0]) {
const l = emoji[0]
const emojis = localStorage.getItem('emojis_raw_' + acct_id)
const json = emojis ? JSON.parse(emojis) : []
const reg = new RegExp(`${emoji[0]}`)
let listHtml = ''
for (const emoji of json) {
const { shortcode, url } = emoji
if (`:${shortcode}`.match(reg)) {
listHtml = listHtml + `${listHtml ? `<br>` : ``}<a onclick="tagInsert(':${shortcode}:','${l}')" class="pointer"><img src="${url}" width="15">:${shortcode}:</a>`
}
}
$('#suggest').html(listHtml)
$('#suggest').show()
} else if (tag && tag[0]) {
var q = tag[0]
} else if (acct && acct[0]) {
var q = acct[0]
} else { } else {
$('#suggest').html('') $('#suggest').html('')
if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) { $('#suggest').hide()
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width + 'px')
}
return return
} }
var domain = localStorage.getItem('domain_' + acct_id) if (q) {
var at = localStorage.getItem('acct_' + acct_id + '_at') var domain = localStorage.getItem('domain_' + acct_id)
suggest = 'https://' + domain + '/api/v2/search?q=' + q var at = localStorage.getItem('acct_' + acct_id + '_at')
if (suggest != oldSuggest) { suggest = 'https://' + domain + '/api/v2/search?q=' + encodeURIComponent(q)
console.log('Try to get suggest at ' + suggest) if (suggest != oldSuggest) {
fetch(suggest, { console.log('Try to get suggest at ' + suggest)
method: 'GET', fetch(suggest, {
headers: { method: 'GET',
'content-type': 'application/json', headers: {
Authorization: 'Bearer ' + at 'content-type': 'application/json',
} Authorization: 'Bearer ' + at
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
} }
return response.json()
}) })
.catch(function(error) { .then(function (response) {
todo(error) if (!response.ok) {
setLog(start, 'JSON', error) response.text().then(function (text) {
console.error(error) setLog(response.url, response.status, text)
}) })
.then(function(json) { }
console.log(['Search', json]) return response.json()
//ハッシュタグ })
if (json.hashtags[0] && tag) { .catch(function (error) {
if (tag[1]) { todo(error)
var tags = [] setLog(start, 'JSON', error)
Object.keys(json.hashtags).forEach(function(key4) { console.error(error)
var tag = json.hashtags[key4] })
var his = tag.history .then(function (json) {
var uses = console.log(['Search', json])
his[0].uses * 1 + //ハッシュタグ
his[1].uses * 1 + if (json.hashtags[0] && tag) {
his[2].uses * 1 + if (tag[0]) {
his[3].uses * 1 + var tags = []
his[4].uses * 1 + Object.keys(json.hashtags).forEach(function (key4) {
his[5].uses * 1 + var tag = json.hashtags[key4]
his[6].uses * 1 var his = tag.history
tagHTML = `<br><a onclick="tagInsert('#${escapeHTML( var uses =
tag.name his[0].uses * 1 +
)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)` his[1].uses * 1 +
his[2].uses * 1 +
his[3].uses * 1 +
his[4].uses * 1 +
his[5].uses * 1 +
his[6].uses * 1
tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
tag.name
)}','${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
var item = { var item = {
uses: uses, uses: uses,
html: tagHTML html: tagHTML
} }
tags.push(item) tags.push(item)
}) })
var num_a = -1 var num_a = -1
var num_b = 1 var num_b = 1
tags = tags.sort(function(a, b) { tags = tags.sort(function (a, b) {
var x = a['uses'] var x = a['uses']
var y = b['uses'] var y = b['uses']
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 ins = '' var ins = ''
var nev = false var nev = false
Object.keys(tags).forEach(function(key7) { Object.keys(tags).forEach(function (key7) {
ins = ins + tags[key7].html ins = ins + tags[key7].html
if (key7 <= 0 && !nev) { if (key7 <= 0 && !nev) {
ins = ins + '<br>' //ins = ins + '<br>'
nev = true nev = true
} }
}) })
$('#suggest').html(ins) $('#suggest').html(ins)
$('#right-side').show() $('#suggest').show()
$('#right-side').css('width', '200px')
$('#left-side').css('width', 'calc(100% - 200px)')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1 + 200
} else {
width = 500
} }
$('#post-box').css('width', width + 'px') } else if (json.accounts[0] && acct[0]) {
$('#poll').addClass('hide') var accts = ''
$('#emoji').addClass('hide') Object.keys(json.accounts).forEach(function (key3) {
$('#draft').addClass('hide') var acct = json.accounts[key3]
} if (acct.acct != q) {
} else if (json.accounts[0] && acct[1]) { //Instance Actorって…
var accts = '' if (acct.username.indexOf('.') < 0) {
Object.keys(json.accounts).forEach(function(key3) { accts =
var acct = json.accounts[key3] accts +
if (acct.acct != q) { `<a onclick="tagInsert('@${acct.acct}','${q}')" class="pointer">@${acct.acct}</a><br>`
//Instance Actorって… }
if (acct.username.indexOf('.') < 0) {
accts =
accts +
`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
} }
} })
}) $('#suggest').html(accts)
$('#right-side').show() $('#suggest').show()
$('#right-side').css('width', '200px')
$('#left-side').css('width', 'calc(100% - 200px)')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1 + 200
} else { } else {
width = 500
} }
$('#post-box').css('width', width + 'px') })
$('#suggest').html(accts) }
$('#poll').addClass('hide')
$('#emoji').addClass('hide')
$('#draft').addClass('hide')
} else {
if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width + 'px')
}
}
})
} }
} }
oldSuggest = suggest oldSuggest = suggest
prev_value = new_val prev_val = new_val
const rectTextarea = document.querySelector('#textarea')
const rect = rectTextarea.getBoundingClientRect()
const caret = getCaretCoordinates(rectTextarea, rectTextarea.selectionEnd)
$('#suggest').css('top', `calc(${caret.top}px + 1rem)`)
const left = rect.width / 2 < caret.left ? rect.width / 2 : caret.left
$('#suggest').css('left', left)
}, 1000) }, 1000)
}, },
false false
@@ -193,15 +172,20 @@ input.addEventListener(
input.addEventListener( input.addEventListener(
'blur', 'blur',
function() { function () {
window.clearInterval(timer) window.clearInterval(timer)
favTag() favTag()
}, },
false false
) )
function tagInsert(code, del) { function tagInsert(code, del, emoji) {
var blankBefore = ' ' if (localStorage.getItem('emoji-zero-width') == 'yes' && emoji) {
var blankAfter = ' ' var blankBefore = ''
var blankAfter = ''
} else {
var blankBefore = ' '
var blankAfter = ' '
}
var textarea = document.querySelector('#textarea') var textarea = document.querySelector('#textarea')
var sentence = textarea.value var sentence = textarea.value
var len = sentence.length var len = sentence.length
@@ -217,10 +201,10 @@ function tagInsert(code, del) {
var after = sentence.substr(pos, len) var after = sentence.substr(pos, len)
var start = after.substr(0, 1) var start = after.substr(0, 1)
if (start == ' ') blankAfter = '' if (start == ' ') blankAfter = ''
if (len == 0) { if (len === delLen) {
var word = code var word = code + blankAfter
} else if (len == pos) { } else if (len == pos) {
var word = blankBefore + code var word = blankBefore + code + blankAfter
} else if (pos == 0) { } else if (pos == 0) {
var word = code + blankAfter var word = code + blankAfter
} else { } else {
@@ -228,17 +212,9 @@ function tagInsert(code, del) {
} }
sentence = before + word + after sentence = before + word + after
textarea.value = sentence textarea.value = sentence
if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '50%')
var width = localStorage.getItem('postbox-width').replace('px', '') * 1
if (!width) {
width = 300
}
$('#post-box').css('width', width + 'px')
}
$('#suggest').html('') $('#suggest').html('')
$('#suggest').hide()
$('#textarea').focus()
} }
function cgNPs(q) { function cgNPs(q) {
suggest = 'https://cg.toot.app/api/v1/search/light?q=' + q suggest = 'https://cg.toot.app/api/v1/search/light?q=' + q
@@ -250,23 +226,23 @@ function cgNPs(q) {
'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) {
if (json[0]) { if (json[0]) {
var tags = '' var tags = ''
Object.keys(json).forEach(function(key4) { Object.keys(json).forEach(function (key4) {
var tag = json[key4] var tag = json[key4]
tags = tags =
tags + tags +

View File

@@ -17,7 +17,8 @@ function additional(acct_id, tlid) {
} }
if (tagThis) { if (tagThis) {
$(this).attr('href', "javascript:tagShow('" + tagThis + "')") $(this).attr('href', "#")
$(this).attr('onclick', "tagShow('" + tagThis + "', this)")
} }
}) })

View File

@@ -637,42 +637,48 @@ function brws() {
postMessage(['openUrl', url], '*') postMessage(['openUrl', url], '*')
} }
//外部からトゥート開く //外部からトゥート開く
function detEx(url, acct_id) { async function detEx(url, acct_id) {
if (acct_id == 'main') { if (acct_id == 'main') {
acct_id = localStorage.getItem('main') acct_id = localStorage.getItem('main')
} }
var domain = localStorage.getItem('domain_' + acct_id) Swal.fire({
var at = localStorage.getItem('acct_' + acct_id + '_at') title: 'Loading...',
var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url) html: lang.lang_details_fetch,
fetch(start, { showConfirmButton: false,
showCloseButton: true,
onBeforeOpen: () => {
Swal.showLoading()
},
onClose: () => { },
}).then((result) => { })
const json = await detExCore(url, acct_id)
Swal.close()
if (!json.statuses) {
postMessage(['openUrl', url], '*')
} else {
var id = json.statuses[0].id
$('.loadp').text($('.loadp').attr('href'))
$('.loadp').removeClass('loadp')
details(id, acct_id, 0)
}
return
}
async function detExCore(url, acct_id) {
const domain = localStorage.getItem('domain_' + acct_id)
const start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
const at = localStorage.getItem('acct_' + acct_id + '_at')
let promise = await fetch(start, {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at
} }
}) })
.then(function(response) {
if (!response.ok) { const json = await promise.json()
response.text().then(function(text) { if (json) {
setLog(response.url, response.status, text) return json
}) } else {
} return false
return response.json() }
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (!json.statuses) {
postMessage(['openUrl', url], '*')
} else {
var id = json.statuses[0].id
$('.loadp').text($('.loadp').attr('href'))
$('.loadp').removeClass('loadp')
details(id, acct_id, 0)
}
})
return
} }

View File

@@ -1,76 +1,96 @@
//ディレクトリ //ディレクトリ
//ディレクトリトグル //ディレクトリトグル
function dirMenu() { function dirMenu() {
$("#dir-contents").html("") $('#dir-contents').html('')
directory() directory('directory')
$("#left-menu a").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')
} }
function dirselCk() { function dirselCk() {
var acct = $("#dir-acct-sel").val() var acct = $('#dir-acct-sel').val()
if (acct == "noauth") { if (acct == 'noauth') {
$("#dirNoAuth").removeClass("hide") $('#dirNoAuth').removeClass('hide')
} else { } else {
$("#dirNoAuth").addClass("hide") $('#dirNoAuth').addClass('hide')
directory() directory('check')
} }
} }
function directory(isMore) {
var order = $("[name=sort]:checked").val() function dirChange(mode) {
if (!order) { if (mode === 'directory') $('#directoryConfig').removeClass('hide')
order = "active" if (mode === 'suggest') $('#directoryConfig').addClass('hide')
} directory(mode)
var local_only = $("#local_only:checked").val()
if (local_only) {
local_only = "true"
} else {
local_only = "false"
}
var acct_id = $("#dir-acct-sel").val()
if (acct_id == "noauth") {
var domain = $("#dirNoAuth-url").val()
var at = ""
} else {
var domain = localStorage.getItem("domain_" + acct_id)
var at = localStorage.getItem("acct_" + acct_id + "_at")
}
if (isMore) {
var addOffset = $("#dir-contents .cvo").length
} else {
var addOffset = 0
$("#dir-contents").html("")
}
var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
console.log(start)
fetch(start, {
method: "GET",
headers: {
"content-type": "application/json",
Authorization: "Bearer " + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
setLog(start, "JSON", error)
console.error(error)
})
.then(function(json) {
if (json) {
$("#moreDir").removeClass("disabled")
var html = userparse(json, null, acct_id, "dir", null)
$("#dir-contents").append(html)
jQuery("time.timeago").timeago()
} else {
$("#moreDir").addClass("disabled")
}
})
} }
function directory(modeRaw, isMore) {
const mode = modeRaw === 'check' ? $('[name=dirsug]:checked').val() : modeRaw
var order = $('[name=sort]:checked').val()
if (!order) {
order = 'active'
}
var local_only = $('#local_only:checked').val()
if (local_only) {
local_only = 'true'
} else {
local_only = 'false'
}
var acct_id = $('#dir-acct-sel').val()
if (acct_id == 'noauth') {
var domain = $('#dirNoAuth-url').val()
var at = ''
} else {
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
}
if (isMore) {
var addOffset = $('#dir-contents .cvo').length
$('#dir-contents').append(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
} else {
var addOffset = 0
$('#dir-contents').html(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
}
let start = `https://${domain}/api/v1/directory?order=${order}&local=${local_only}&offset=${addOffset}`
if (mode === 'suggest') start = `https://${domain}/api/v2/suggestions`
console.log(start)
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at,
},
})
.then(function(response) {
$('#dir-contents .progress').remove()
if (!response.ok) {
$('#dir-contents').html(`v2 follow suggestion is supported by Mastodon 3.4.0 or above.`)
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
$('#moreDir').removeClass('disabled')
let obj = []
if (mode === 'suggest') {
$('#moreDir').addClass('disabled')
for (const suggest of json) obj.push(suggest.account)
} else {
obj = json
}
var html = userparse(obj, null, acct_id, 'dir', null)
$('#dir-contents').append(html)
jQuery('time.timeago').timeago()
} else {
$('#moreDir').addClass('disabled')
}
})
}

File diff suppressed because it is too large Load Diff

View File

@@ -89,7 +89,7 @@ function list() {
</a>/ </a>/
<a onclick="listUser('${list.id}','${acct_id}')" class="pointer"> <a onclick="listUser('${list.id}','${acct_id}')" class="pointer">
${lang.lang_list_users} ${lang.lang_list_users}
'</a><br>` </a><br>`
}) })
$('#lists').html(lists) $('#lists').html(lists)
} else { } else {

View File

@@ -518,7 +518,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if (tagck) { if (tagck) {
Object.keys(toot.tags).forEach(function (key4) { Object.keys(toot.tags).forEach(function (key4) {
var tag = toot.tags[key4] var tag = toot.tags[key4]
var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="'+tag.toLowerCase()+'">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id + var tags = '<a onclick="tagShow(\'' + tag + '\', this)" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="'+tag.toLowerCase()+'">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
',\'add\')" class="pointer parsed" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a> <a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a> ' + ',\'add\')" class="pointer parsed" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a> <a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a> ' +
'<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag) + '">Pin</a></span> ' '<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag) + '">Pin</a></span> '
content = content.replace("#" + tag, tags) content = content.replace("#" + tag, tags)

View File

@@ -1,432 +1,437 @@
//通知 //通知
//取得+Streaming接続 //取得+Streaming接続
function notf(acct_id, tlid, sys) { function notf(acct_id, tlid, sys) {
if (sys == 'direct') { if (sys == 'direct') {
notfColumn(acct_id, tlid, sys) notfColumn(acct_id, tlid, sys)
} else { } else {
notfCommon(acct_id, tlid, sys) notfCommon(acct_id, tlid, sys)
} }
} }
function notfColumn(acct_id, tlid, sys) { function notfColumn(acct_id, tlid, sys) {
todo('Notifications Loading...') todo('Notifications Loading...')
var native = localStorage.getItem('nativenotf') var native = localStorage.getItem('nativenotf')
var at = localStorage.getItem('acct_' + acct_id + '_at') var at = localStorage.getItem('acct_' + acct_id + '_at')
if (!native) { if (!native) {
native = 'yes' native = 'yes'
} }
var domain = localStorage.getItem('domain_' + acct_id) var domain = localStorage.getItem('domain_' + acct_id)
var httpreq = new XMLHttpRequest() var httpreq = new XMLHttpRequest()
if (localStorage.getItem('mode_' + domain) == 'misskey') { if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true var misskey = true
var start = 'https://' + domain + '/api/i/notifications' var start = 'https://' + domain + '/api/i/notifications'
httpreq.open('POST', start, true) httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json') httpreq.setRequestHeader('Content-Type', 'application/json')
var body = JSON.stringify({ var body = JSON.stringify({
i: at i: at,
}) })
} else { } else {
var misskey = false var misskey = false
if (localStorage.getItem('exclude-' + tlid)) { if (localStorage.getItem('exclude-' + tlid)) {
var exc = localStorage.getItem('exclude-' + tlid) var exc = localStorage.getItem('exclude-' + tlid)
} else { } else {
var exc = '' var exc = ''
} }
var start = 'https://' + domain + '/api/v1/notifications' + exc var start = 'https://' + domain + '/api/v1/notifications' + exc
httpreq.open('GET', start, true) httpreq.open('GET', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json') httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
var body = '' var body = ''
} }
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send(body) httpreq.send(body)
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) {
setLog(start, this.status, this.response) $('#landing_' + tlid).append(`<div>${this.status}</div><div>${escapeHTML(this.response)}`)
} setLog(start, this.status, this.response)
var max_id = httpreq.getResponseHeader('link') }
if (max_id) { var max_id = httpreq.getResponseHeader('link')
max_id = max_id.match(/[?&]{1}max_id=([0-9]+)/)[1] if (max_id) {
} max_id = max_id.match(/[?&]{1}max_id=([0-9]+)/)[1]
if (json[0]) { }
var templete = '' if (json[0]) {
var lastnotf = localStorage.getItem('lastnotf_' + acct_id) var templete = ''
localStorage.setItem('lastnotf_' + acct_id, json[0].id) var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
Object.keys(json).forEach(function(key) { localStorage.setItem('lastnotf_' + acct_id, json[0].id)
var obj = json[key] Object.keys(json).forEach(function(key) {
if (lastnotf == obj.id && key > 0 && native == 'yes') { var obj = json[key]
var ct = key if (lastnotf == obj.id && key > 0 && native == 'yes') {
if (key > 14) { var ct = key
ct = '15+' if (key > 14) {
} ct = '15+'
var os = localStorage.getItem('platform') }
var options = { var os = localStorage.getItem('platform')
body: ct + lang.lang_notf_new, var options = {
icon: localStorage.getItem('prof_' + acct_id) body: ct + lang.lang_notf_new,
} icon: localStorage.getItem('prof_' + acct_id),
var n = new Notification('TheDesk:' + domain, options) }
} var n = new Notification('TheDesk:' + domain, options)
var mute = getFilterTypeByAcct(acct_id, 'notif') }
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ var mute = getFilterTypeByAcct(acct_id, 'notif')
if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') { //Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (misskey) { if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute) if (misskey) {
} else { templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute) } else {
} templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
} else if (obj.type == 'follow_request') { }
templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1) } else if (obj.type == 'follow_request') {
} else { templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1)
if (misskey) { } else {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute) if (misskey) {
} else { templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1) } else {
} templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
} }
}) }
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>' })
$('#timeline_' + tlid).html(templete) templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#landing_' + tlid).hide() $('#timeline_' + tlid).html(templete)
jQuery('time.timeago').timeago() // $('#landing_' + tlid).hide()
} jQuery('time.timeago').timeago()
$('#notf-box').addClass('fetched') }
todc() $('#notf-box').addClass('fetched')
//Markers todc()
var markers = localStorage.getItem('markers') //Markers
if (markers == 'yes') { var markers = localStorage.getItem('markers')
markers = true if (markers == 'yes') {
} else { markers = true
markers = false } else {
} markers = false
if (markers) { }
getMarker(tlid, 'notf', acct_id) if (markers) {
} getMarker(tlid, 'notf', acct_id)
} }
} }
if (!misskey) { }
if (localStorage.getItem('streaming_' + acct_id)) { if (!misskey) {
var wss = localStorage.getItem('streaming_' + acct_id) if (localStorage.getItem('streaming_' + acct_id)) {
} else { var wss = localStorage.getItem('streaming_' + acct_id)
var wss = 'wss://' + domain } else {
} var wss = 'wss://' + domain
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at }
} else { var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
var start = 'wss://' + domain + '/?i=' + at } else {
} var start = 'wss://' + domain + '/?i=' + at
}
} }
function notfCommon(acct_id, tlid, sys, stream) { function notfCommon(acct_id, tlid, sys, stream) {
todo('Notifications Loading...') todo('Notifications Loading...')
var native = localStorage.getItem('nativenotf') var native = localStorage.getItem('nativenotf')
var at = localStorage.getItem('acct_' + acct_id + '_at') var at = localStorage.getItem('acct_' + acct_id + '_at')
if (!native) { if (!native) {
native = 'yes' native = 'yes'
} }
var domain = localStorage.getItem('domain_' + acct_id) var domain = localStorage.getItem('domain_' + acct_id)
if (localStorage.getItem('mode_' + domain) == 'misskey') { if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true var misskey = true
var start = 'https://' + domain + '/api/i/notifications' var start = 'https://' + domain + '/api/i/notifications'
var i = { var i = {
method: 'POST', method: 'POST',
headers: { headers: {
'content-type': 'application/json' 'content-type': 'application/json',
}, },
body: JSON.stringify({ body: JSON.stringify({
i: at i: at,
}) }),
} }
} else { } else {
var misskey = false var misskey = false
var start = 'https://' + domain + '/api/v1/notifications' var start = 'https://' + domain + '/api/v1/notifications'
var i = { var i = {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
} }
} }
if(stream == 'only') { if (stream == 'only') {
notfWS(misskey, acct_id, tlid, domain, at) notfWS(misskey, acct_id, tlid, domain, at)
return false return false
} }
fetch(start, i) fetch(start, i)
.then(function(response) { .then(function(response) {
console.log('header to get param:' + response.headers.get('link')) console.log('header to get param:' + response.headers.get('link'))
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function(text) {
setLog(response.url, response.status, text) console.log('notf error', 'div[data-notf=' + acct_id + '] .landing')
}) $('div[data-notf=' + acct_id + '] .landing').append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
} setLog(response.url, response.status, text)
return response.json() })
}) }
.catch(function(error) { return response.json()
todo(error) })
setLog(start, 'JSON', error) .catch(function(error) {
console.error(error) todo(error)
}) setLog(start, 'JSON', error)
.then(function(json) { console.error(error)
if (json[0]) { })
var templete = '' .then(function(json) {
var lastnotf = localStorage.getItem('lastnotf_' + acct_id) if (json[0]) {
localStorage.setItem('lastnotf_' + acct_id, json[0].id) var templete = ''
Object.keys(json).forEach(function(key) { var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
var obj = json[key] localStorage.setItem('lastnotf_' + acct_id, json[0].id)
if (lastnotf == obj.id && key > 0 && native == 'yes') { Object.keys(json).forEach(function(key) {
var ct = key var obj = json[key]
if (key > 14) { if (lastnotf == obj.id && key > 0 && native == 'yes') {
ct = '15+' var ct = key
} if (key > 14) {
var os = localStorage.getItem('platform') ct = '15+'
var options = { }
body: ct + lang.lang_notf_new, var os = localStorage.getItem('platform')
icon: localStorage.getItem('prof_' + acct_id) var options = {
} body: ct + lang.lang_notf_new,
var n = new Notification('TheDesk:' + domain, options) icon: localStorage.getItem('prof_' + acct_id),
} }
var mute = getFilterTypeByAcct(acct_id, 'notif') var n = new Notification('TheDesk:' + domain, options)
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ }
if (obj.type != 'follow' && obj.type != 'move') { var mute = getFilterTypeByAcct(acct_id, 'notif')
if (misskey) { //Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute) if (obj.type != 'follow' && obj.type != 'move') {
} else { if (misskey) {
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute) templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
} } else {
} else { templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
if (misskey) { }
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute) } else {
} else { if (misskey) {
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1) templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
} } else {
} templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
}) }
$('div[data-notf=' + acct_id + ']').html(templete) }
$('#landing_' + tlid).hide() })
jQuery('time.timeago').timeago() $('div[data-notf=' + acct_id + ']').html(templete)
} // $('#landing_' + tlid).hide()
$('#notf-box').addClass('fetched') jQuery('time.timeago').timeago()
todc() }
if(stream != 'no') notfWS(misskey, acct_id, tlid, domain, at) $('#notf-box').addClass('fetched')
}) todc()
if (stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
})
} }
function notfWS(misskey, acct_id, tlid, domain, at) {
if(mastodonBaseWsStatus[domain] == 'available') return false
if (!misskey) {
if (localStorage.getItem('streaming_' + acct_id)) {
var wss = localStorage.getItem('streaming_' + acct_id)
} else {
var wss = 'wss://' + domain
}
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
var wsid = websocketNotf.length function notfWS(misskey, acct_id, tlid, domain, at) {
websocketNotf[acct_id] = new WebSocket(start) if (mastodonBaseWsStatus[domain] == 'available') return false
websocketNotf[acct_id].onopen = function(mess) { if (!misskey) {
console.table({ if (localStorage.getItem('streaming_' + acct_id)) {
acct_id: acct_id, var wss = localStorage.getItem('streaming_' + acct_id)
type: 'Connect Streaming API(Notf)', } else {
domain: domain, var wss = 'wss://' + domain
message: [mess] }
}) var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
$('i[data-notf=' + acct_id + ']').removeClass('red-text')
} var wsid = websocketNotf.length
websocketNotf[acct_id].onmessage = function(mess) { websocketNotf[acct_id] = new WebSocket(start)
//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]); websocketNotf[acct_id].onopen = function(mess) {
var popup = localStorage.getItem('popup') console.table({
if (!popup) { acct_id: acct_id,
popup = 0 type: 'Connect Streaming API(Notf)',
} domain: domain,
var obj = JSON.parse(JSON.parse(mess.data).payload) message: [mess],
var type = JSON.parse(mess.data).event })
if (type == 'notification') { $('i[data-notf=' + acct_id + ']').removeClass('red-text')
var templete = '' }
localStorage.setItem('lastnotf_' + acct_id, obj.id) websocketNotf[acct_id].onmessage = function(mess) {
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) { $('#landing_' + tlid).hide()
//markers show中はダメ //console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
if (obj.type != 'follow' && obj.type != 'follow_request') { var popup = localStorage.getItem('popup')
templete = parse([obj], 'notf', acct_id, 'notf', popup) if (!popup) {
} else if (obj.type == 'follow_request') { popup = 0
templete = userparse([obj.account], 'request', acct_id, 'notf', -1) }
} else { var obj = JSON.parse(JSON.parse(mess.data).payload)
templete = userparse([obj], obj.type, acct_id, 'notf', popup) var type = JSON.parse(mess.data).event
} if (type == 'notification') {
if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) { var templete = ''
$('div[data-notf=' + acct_id + ']').prepend(templete) localStorage.setItem('lastnotf_' + acct_id, obj.id)
$('div[data-const=notf_' + acct_id + ']').prepend(templete) if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
} //markers show中はダメ
jQuery('time.timeago').timeago() if (obj.type != 'follow' && obj.type != 'follow_request') {
} templete = parse([obj], 'notf', acct_id, 'notf', popup)
} else if (type == 'delete') { } else if (obj.type == 'follow_request') {
$('[toot-id=' + obj + ']').hide() templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
$('[toot-id=' + obj + ']').remove() } else {
} templete = userparse([obj], obj.type, acct_id, 'notf', popup)
} }
websocketNotf[acct_id].onerror = function(error) { if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
console.error('WebSocket Error ', error) $('div[data-notf=' + acct_id + ']').prepend(templete)
errorct++ $('div[data-const=notf_' + acct_id + ']').prepend(templete)
console.log(errorct) }
if (errorct < 3) { jQuery('time.timeago').timeago()
notfWS(misskey, acct_id, tlid, domain, at) }
} } else if (type == 'delete') {
} $('[toot-id=' + obj + ']').hide()
websocketNotf[acct_id].onclose = function(error) { $('[toot-id=' + obj + ']').remove()
console.error('WebSocket Close ', error) }
errorct++ }
console.log(errorct) websocketNotf[acct_id].onerror = function(error) {
if (errorct < 3) { console.error('WebSocket Error ', error)
notfWS(misskey, acct_id, tlid, domain, at) errorct++
} console.log(errorct)
} if (errorct < 3) {
} notfWS(misskey, acct_id, tlid, domain, at)
}
}
websocketNotf[acct_id].onclose = function(error) {
console.error('WebSocket Close ', error)
errorct++
console.log(errorct)
if (errorct < 3) {
notfWS(misskey, acct_id, tlid, domain, at)
}
}
}
} }
//一定のスクロールで発火 //一定のスクロールで発火
function notfmore(tlid) { function notfmore(tlid) {
console.log({ status: 'kicked', status: moreloading }) console.log({ status: 'kicked', status: moreloading })
var multi = localStorage.getItem('column') var multi = localStorage.getItem('column')
var obj = JSON.parse(multi) var obj = JSON.parse(multi)
var acct_id = obj[tlid].domain var acct_id = obj[tlid].domain
if (!type) { if (!type) {
var type = obj[tlid].type var type = obj[tlid].type
} else { } else {
var data var data
} }
var sid = $('#timeline_' + tlid + ' .notif-marker') var sid = $('#timeline_' + tlid + ' .notif-marker')
.last() .last()
.attr('data-maxid') .attr('data-maxid')
var at = localStorage.getItem('acct_' + acct_id + '_at') var at = localStorage.getItem('acct_' + acct_id + '_at')
var domain = localStorage.getItem('domain_' + acct_id) var domain = localStorage.getItem('domain_' + acct_id)
if (sid && !moreloading) { if (sid && !moreloading) {
moreloading = true moreloading = true
var httpreq = new XMLHttpRequest() var httpreq = new XMLHttpRequest()
if (localStorage.getItem('mode_' + domain) == 'misskey') { if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true var misskey = true
var start = 'https://' + domain + '/api/i/notifications' var start = 'https://' + domain + '/api/i/notifications'
httpreq.open(POST, start, true) httpreq.open(POST, start, true)
httpreq.setRequestHeader('Content-Type', 'application/json') httpreq.setRequestHeader('Content-Type', 'application/json')
var body = JSON.stringify({ var body = JSON.stringify({
i: at, i: at,
untilID: sid untilID: sid,
}) })
} else { } else {
var misskey = false var misskey = false
if (localStorage.getItem('exclude-' + tlid)) { if (localStorage.getItem('exclude-' + tlid)) {
var exc = localStorage.getItem('exclude-' + tlid) + '&max_id=' + sid var exc = localStorage.getItem('exclude-' + tlid) + '&max_id=' + sid
} else { } else {
var exc = '?max_id=' + sid var exc = '?max_id=' + sid
} }
var start = 'https://' + domain + '/api/v1/notifications' + exc var start = 'https://' + domain + '/api/v1/notifications' + exc
httpreq.open('GET', start, true) httpreq.open('GET', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json') httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
var body = '' var body = ''
} }
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send(body) httpreq.send(body)
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) {
setLog(start, this.status, this.response) setLog(start, this.status, this.response)
} }
console.log(['More notifications on ' + tlid, json]) console.log(['More notifications on ' + tlid, json])
var max_id = httpreq.getResponseHeader('link').match(/[?&]{1}max_id=([0-9]+)/)[1] var max_id = httpreq.getResponseHeader('link').match(/[?&]{1}max_id=([0-9]+)/)[1]
if (json[0]) { if (json[0]) {
var templete = '' var templete = ''
var lastnotf = localStorage.getItem('lastnotf_' + acct_id) var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
localStorage.setItem('lastnotf_' + acct_id, json[0].id) localStorage.setItem('lastnotf_' + acct_id, json[0].id)
Object.keys(json).forEach(function(key) { Object.keys(json).forEach(function(key) {
var obj = json[key] var obj = json[key]
var mute = getFilterTypeByAcct(acct_id, 'notif') var mute = getFilterTypeByAcct(acct_id, 'notif')
if (obj.type != 'follow') { if (obj.type != 'follow') {
if (misskey) { if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute) templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
} else { } else {
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute) templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
} }
} else { } else {
if (misskey) { if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute) templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
} else { } else {
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1) templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
} }
} }
}) })
moreloading = false moreloading = false
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>' templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#timeline_' + tlid).append(templete) $('#timeline_' + tlid).append(templete)
$('#landing_' + tlid).hide() // $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago() jQuery('time.timeago').timeago()
} }
$('#notf-box').addClass('fetched') $('#notf-box').addClass('fetched')
todc() todc()
} }
} }
} }
} }
//通知トグルボタン //通知トグルボタン
function notfToggle(acct, tlid) { function notfToggle(acct, tlid) {
if ($('#notf-box_' + tlid).hasClass('column-hide')) { if ($('#notf-box_' + tlid).hasClass('column-hide')) {
$('#notf-box_' + tlid).css('display', 'block') $('#notf-box_' + tlid).css('display', 'block')
$('#notf-box_' + tlid).animate( $('#notf-box_' + tlid).animate({
{ height: '400px',
height: '400px' }, {
}, duration: 300,
{ complete: function() {
duration: 300, $('#notf-box_' + tlid).css('overflow-y', 'scroll')
complete: function() { $('#notf-box_' + tlid).removeClass('column-hide')
$('#notf-box_' + tlid).css('overflow-y', 'scroll') },
$('#notf-box_' + tlid).removeClass('column-hide') })
} } else {
} $('#notf-box_' + tlid).css('overflow-y', 'hidden')
) $('#notf-box_' + tlid).animate({
} else { height: '0',
$('#notf-box_' + tlid).css('overflow-y', 'hidden') }, {
$('#notf-box_' + tlid).animate( duration: 300,
{ complete: function() {
height: '0' $('#notf-box_' + tlid).addClass('column-hide')
}, $('#notf-box_' + tlid).css('display', 'none')
{ },
duration: 300, })
complete: function() { }
$('#notf-box_' + tlid).addClass('column-hide') notfCanceler(acct)
$('#notf-box_' + tlid).css('display', 'none')
}
}
)
}
notfCanceler(acct)
} }
function notfCanceler(acct) { function notfCanceler(acct) {
$('.notf-reply_' + acct).text(0) $('.notf-reply_' + acct).text(0)
localStorage.removeItem('notf-reply_' + acct) localStorage.removeItem('notf-reply_' + acct)
$('.notf-reply_' + acct).addClass('hide') $('.notf-reply_' + acct).addClass('hide')
$('.notf-fav_' + acct).text(0) $('.notf-fav_' + acct).text(0)
localStorage.removeItem('notf-fav_' + acct) localStorage.removeItem('notf-fav_' + acct)
$('.notf-fav_' + acct).addClass('hide') $('.notf-fav_' + acct).addClass('hide')
$('.notf-bt_' + acct).text(0) $('.notf-bt_' + acct).text(0)
localStorage.removeItem('notf-bt_' + acct) localStorage.removeItem('notf-bt_' + acct)
$('.notf-bt_' + acct).addClass('hide') $('.notf-bt_' + acct).addClass('hide')
$('.notf-follow_' + acct).text(0) $('.notf-follow_' + acct).text(0)
localStorage.removeItem('notf-follow_' + acct) localStorage.removeItem('notf-follow_' + acct)
$('.notf-follow_' + acct).addClass('hide') $('.notf-follow_' + acct).addClass('hide')
$('.notf-icon_' + acct).removeClass('red-text') $('.notf-icon_' + acct).removeClass('red-text')
var id = $('#announce_' + acct + ' .announcement').first().attr('data-id') var id = $('#announce_' + acct + ' .announcement')
$('.notf-announ_' + acct + '_ct').text("") .first()
$(`.boxIn[data-acct=${acct}] .notice-box`).removeClass('has-notf') .attr('data-id')
if(id) { $('.notf-announ_' + acct + '_ct').text('')
localStorage.setItem('announ_' + acct, id) $(`.boxIn[data-acct=${acct}] .notice-box`).removeClass('has-notf')
} if (id) {
localStorage.setItem('announ_' + acct, id)
}
} }
function allNotfRead() { function allNotfRead() {
var multi = localStorage.getItem('multi') var multi = localStorage.getItem('multi')
if (multi) { if (multi) {
var obj = JSON.parse(multi) var obj = JSON.parse(multi)
Object.keys(obj).forEach(function(key) { Object.keys(obj).forEach(function(key) {
notfCanceler(key) notfCanceler(key)
}) })
} }
} }
allNotfRead() allNotfRead()

View File

@@ -278,7 +278,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
</span> </span>
<span class="voice">${date(toot.created_at, 'absolute')}(${lang.lang_parse_notftime})</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 notf-udg-text">
${dis_name}(@${toot.account.acct}) ${dis_name}(@${toot.account.acct})
</a>` </a>`
var notice = noticetext var notice = noticetext
@@ -631,7 +631,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
var mty = media.remote_url.match(/.+(\..+)$/)[1] var mty = media.remote_url.match(/.+(\..+)$/)[1]
viewer = viewer =
viewer + viewer +
`<a href="${media.url ? media.url : media.remote_url}" title="${media.remote_url} from ${media.url}">[${lang.lang_parse_unknown}(${mty})]</a> ` `<a href="${media.url ? media.url : media.remote_url}" title="${media.url ? media.url : media.remote_url}">[${lang.lang_parse_unknown}(${mty})]</a>${media.url ? `<a href="${media.remote_url}"><i class="material-icons sublink" title="${media.remote_url}">open_in_new</i></a>` : ''} `
} else if (media.type == 'audio') { } else if (media.type == 'audio') {
viewer = viewer =
viewer + viewer +
@@ -703,31 +703,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
${lang.lang_parse_thread} ${lang.lang_parse_thread}
</a></div>` </a></div>`
} }
var tagck = toot.tags[0]
var tags = ''
//タグであれば
if (tagck) {
Object.keys(toot.tags).forEach(function (key4) {
var tag = toot.tags[key4]
var featured = ` <a onclick="tagFeature('${tag.name}','${acct_id}')" class="pointer" title="add it to Featured tags">Feature</a> `
tags =
tags +
`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${tag.name
}:
<a onclick="tl('tag','${tag.name}','${acct_id}','add')" class="pointer"
title="${lang.lang_parse_tagTL.replace(
'{{tag}}',
'#' + tag.name
)}">TL</a> <a onclick="brInsert('#${tag.name}')"
class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag.name)}">Toot</a> 
<a onclick="tagPin('${tag.name}')" class="pointer" title="${lang.lang_parse_tagpin.replace(
'{{tag}}',
'#' + tag.name
)}
">Pin</a>${featured}</span> `
})
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) {
var replyct = toot.replies_count var replyct = toot.replies_count
@@ -904,7 +879,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
//日本語じゃない //日本語じゃない
if (toot.language != lang.language && toot.language) { if (toot.language != lang.language && toot.language) {
var trans = `<li onclick="trans('${toot.language}','${lang.language}', $(this))" var trans = `<li onclick="trans('${toot.language}','${lang.language}', $(this))"
style="padding:0"> style="padding:0; padding-top: 5px;">
<i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans} <i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
</li>` </li>`
} else { } else {
@@ -1077,7 +1052,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
</div> </div>
<div class="area-additional grid"> <div class="area-additional grid">
<span class="additional">${analyze}</span> <span class="additional">${analyze}</span>
${mentions}${tags} ${mentions}
</div> </div>
<div class="area-vis grid">${vis}</div> <div class="area-vis grid">${vis}</div>
<div class="area-actions grid"> <div class="area-actions grid">
@@ -1157,23 +1132,23 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
</li> </li>
<div> <div>
<li onclick="bkm('${uniqueid}','${acct_id}','${tlid}')" <li onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
class="bkm-btn bkmStr_${uniqueid}" style="padding:0"> class="bkm-btn bkmStr_${uniqueid}" style="padding:0; padding-top: 5px;">
<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>${bkmStr} <i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>${bkmStr}
</li> </li>
<li class="${if_mine}" onclick="del('${uniqueid}','${acct_id}')" <li class="${if_mine}" onclick="del('${uniqueid}','${acct_id}')"
style="padding:0"> style="padding:0; padding-top: 5px;">
<i class="fas fa-trash"></i>${lang.lang_parse_del} <i class="fas fa-trash"></i>${lang.lang_parse_del}
</li> </li>
<li class="${if_mine}" onclick="pin('${uniqueid}','${acct_id}')" style="padding:0" class="pinStr_${uniqueid}"> <li class="${if_mine}" onclick="pin('${uniqueid}','${acct_id}')" style="padding:0; padding-top: 5px;" class="pinStr_${uniqueid}">
<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>${pinStr} <i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>${pinStr}
</li> </li>
<li class="${if_mine}" onclick="redraft('${uniqueid}','${acct_id}')" <li class="${if_mine}" onclick="redraft('${uniqueid}','${acct_id}')"
style="padding:0"> style="padding:0; padding-top: 5px;">
<i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft} <i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
</li> </li>
${trans} ${trans}
<li onclick="postMessage(['openUrl', '${toot.url}'], '*')" <li onclick="postMessage(['openUrl', '${toot.url}'], '*')"
style="padding:0"> style="padding:0; padding-top: 5px;">
<i class="fas text-darken-3 fa-globe"></i>${lang.lang_parse_link} <i class="fas text-darken-3 fa-globe"></i>${lang.lang_parse_link}
</li> </li>
${pluginHtml} ${pluginHtml}
@@ -1342,7 +1317,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
class="sml gray" class="sml gray"
style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"
> >
@ ${toot.acct}${locked}</span> @${toot.acct}${locked}</span>
</div> </div>
</div> </div>
<div class="area-status"> <div class="area-status">
@@ -1577,6 +1552,7 @@ function mastodonBaseStreaming(acct_id) {
$('.notice_icon_acct_' + acct_id).removeClass('red-text') $('.notice_icon_acct_' + acct_id).removeClass('red-text')
} }
mastodonBaseWs[domain].onmessage = function (mess) { mastodonBaseWs[domain].onmessage = function (mess) {
$(`div[data-acct=${acct_id}] .landing`).hide()
const typeA = JSON.parse(mess.data).event const typeA = JSON.parse(mess.data).event
if (typeA == 'delete') { if (typeA == 'delete') {
$(`[unique-id=${JSON.parse(mess.data).payload}]`).hide() $(`[unique-id=${JSON.parse(mess.data).payload}]`).hide()

View File

@@ -13,7 +13,21 @@ function searchMenu() {
//検索取得 //検索取得
function src(mode, offset) { function src(mode, offset) {
if (!offset) { if (!offset) {
$('#src-contents').html('') $('#src-contents').html(`
<div class="preloader-wrapper small active" style="margin-left: calc(50% - 36px);">
<div class="spinner-layer spinner-blue-only">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
</div>
`)
var add = '' var add = ''
} else { } else {
var add = '&type=accounts&offset=' + $('#src-accts .cvo').length var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
@@ -48,24 +62,27 @@ function src(mode, offset) {
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at
} }
}) })
.then(function(response) { .then(function (response) {
if (!offset) {
$('#src-contents').html(``)
}
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) {
src('v1') src('v1')
return false return false
}) })
.then(function(json) { .then(function (json) {
console.log(['Search', json]) console.log(['Search', json])
//ハッシュタグ //ハッシュタグ
if (json.hashtags[0]) { if (json.hashtags[0]) {
var tags = '' var tags = ''
Object.keys(json.hashtags).forEach(function(key4) { Object.keys(json.hashtags).forEach(function (key4) {
var tag = json.hashtags[key4] var tag = json.hashtags[key4]
if (mode) { if (mode) {
tags = tags =
@@ -116,7 +133,7 @@ function tsAdd(q) {
parseColumn('add') parseColumn('add')
} }
function tootsearch(tlid, q) { function tootsearch(tlid, q) {
if(!q || q=='undefined') { if (!q || q == 'undefined') {
return false return false
} }
var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
@@ -129,20 +146,20 @@ function tootsearch(tlid, q) {
'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(raw) { .then(function (raw) {
var templete = '' var templete = ''
var json = raw.hits.hits var json = raw.hits.hits
var max_id = raw['hits'].length var max_id = raw['hits'].length
@@ -180,20 +197,20 @@ function moreTs(tlid, q) {
'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(raw) { .then(function (raw) {
var templete = '' var templete = ''
var json = raw.hits.hits var json = raw.hits.hits
var max_id = raw['hits'].length var max_id = raw['hits'].length
@@ -256,8 +273,8 @@ function graphDrawCore(his, tag, acct_id) {
</div> </div>
<div class="tagCompTag"> <div class="tagCompTag">
<a onclick="tl('tag','${escapeHTML( <a onclick="tl('tag','${escapeHTML(
tag.name tag.name
)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}"> )}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
#${escapeHTML(tag.name)} #${escapeHTML(tag.name)}
</a> </a>
</div> </div>
@@ -290,21 +307,21 @@ function trend() {
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) {
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
var tags = '' var tags = ''
Object.keys(json).forEach(function(keye) { Object.keys(json).forEach(function (keye) {
var tag = json[keye] var tag = json[keye]
var his = tag.history var his = tag.history
tags = graphDrawCore(his, tag, acct_id) tags = graphDrawCore(his, tag, acct_id)
@@ -314,47 +331,31 @@ function trend() {
}) })
} }
function srcBox(mode) { function srcBox(mode) {
var selectedText = window.getSelection().toString()
if (mode == 'open') { if (mode == 'open') {
$('#pageSrc').removeClass('hide') $('#pageSrc').removeClass('hide')
} else if (mode == 'close') { } else if (mode == 'close') {
if(!selectedText) { $('#pageSrc').addClass('hide')
$('#pageSrc').addClass('hide') $('#pageSrc').removeClass('keep')
$('#pageSrc').removeClass('keep')
}
} else { } else {
$('#pageSrc').toggleClass('hide') $('#pageSrc').toggleClass('hide')
} }
if(!$('#pageSrc').hasClass('keep')) {
$('#pageSrcInput').val(selectedText)
}
} }
$('#pageSrcInput').click(function() {
$('#pageSrc').addClass('keep')
})
$('#pageSrcInput').on('input', function(evt) {
if(!$('#pageSrcInput').val()) {
$('#pageSrc').removeClass('keep')
}
})
document.addEventListener('selectionchange', function() {
var selectedText = window.getSelection().toString()
if (selectedText && !$('input').is(':focus') && !$('textarea').is(':focus')) {
srcBox('open')
}
})
function doSrc(type) { function doSrc(type) {
$('#pageSrc').addClass('hide') $('#pageSrc').addClass('hide')
$('#pageSrc').removeClass('keep') $('#pageSrc').removeClass('keep')
var q = $('#pageSrcInput').val() var q = $('.srcQ').text()
if(type == 'web') { if (type == 'web') {
var start = localStorage.getItem('srcUrl') var start = localStorage.getItem('srcUrl')
if(!start) { if (!start) {
start = 'https://google.com/search?q={q}' start = 'https://google.com/search?q={q}'
} }
start = start.replace(/{q}/, q) start = start.replace(/{q}/, q)
postMessage(["openUrl", start], "*") postMessage(["openUrl", start], "*")
} else if(type == 'ts') { } else if (type == 'ts') {
tsAdd(q) tsAdd(q)
} else if (type == 'copy') {
execCopy(q)
} else if (type == 'toot') {
brInsert(q)
} }
} }

View File

@@ -9,9 +9,47 @@ if (location.search) {
} }
} }
//よく使うタグ //よく使うタグ
function tagShow(tag) { function tagShow(tag, elm) {
console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']') tag = decodeURIComponent(tag)
$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide') const tagTL = lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)
const tagPin = lang.lang_parse_tagpin.replace('{{tag}}', '#' + tag)
const tagToot = lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)
$('#tagCMTL').text(tagTL)
$('#tagCMPin').text(tagPin)
$('#tagCMToot').text(tagToot)
const acct_id = $(elm).parents('.tl').attr('data-acct')
const rect = elm.getBoundingClientRect()
$('#tagContextMenu').css('top', `calc(${rect.top}px + 1rem)`)
$('#tagContextMenu').css('left', `${rect.left}px`)
$('#tagContextMenu').attr('data-tag', tag)
$('#tagContextMenu').attr('data-acct', acct_id)
$('#tagContextMenu').removeClass('hide')
setTimeout(() => tShowBox('open'), 500)
}
function tShowBox(mode) {
if (mode == 'open') {
$('#tagContextMenu').removeClass('hide')
} else if (mode == 'close') {
if (!$('#tagContextMenu').hasClass('hide')) $('#tagContextMenu').addClass('hide')
$('#tagContextMenu').removeClass('keep')
} else {
$('#tagContextMenu').toggleClass('hide')
}
}
function doTShowBox(type) {
$('#tagContextMenu').addClass('hide')
$('#tagContextMenu').removeClass('keep')
const q = $('#tagContextMenu').attr('data-tag')
const acct_id = $('#tagContextMenu').attr('data-acct')
if (type == 'tl') {
tl('tag', q, acct_id, 'add')
} else if (type == 'toot') {
brInsert(`#${q}`)
} else if (type == 'pin') {
tagPin(q)
} else if (type == 'f') {
tagFeature(q, acct_id)
}
} }
//タグ追加 //タグ追加
function tagPin(tag) { function tagPin(tag) {
@@ -22,7 +60,7 @@ function tagPin(tag) {
var obj = JSON.parse(tags) var obj = JSON.parse(tags)
} }
var can var can
Object.keys(obj).forEach(function(key) { Object.keys(obj).forEach(function (key) {
var tagT = obj[key] var tagT = obj[key]
if (tagT == tag) { if (tagT == tag) {
can = true can = true
@@ -56,7 +94,7 @@ function favTag() {
} }
var tags = '' var tags = ''
var nowPT = localStorage.getItem('stable') var nowPT = localStorage.getItem('stable')
Object.keys(obj).forEach(function(key) { Object.keys(obj).forEach(function (key) {
var tag = obj[key] var tag = obj[key]
if (nowPT != tag) { if (nowPT != tag) {
console.log('stable tags:' + nowPT + '/' + tag) console.log('stable tags:' + nowPT + '/' + tag)
@@ -69,28 +107,31 @@ function favTag() {
tag = escapeHTML(tag) tag = escapeHTML(tag)
tags = tags =
tags + tags +
`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a> `<a onclick="tagShowHorizon('${tag}')" class="pointer">#${tag}</a>
${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">  ${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}"> 
<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}"> <a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
TL TL
</a>  </a>
<a onclick="brInsert('#${tag}')" class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}"> <a onclick="brInsert('#${tag}')" class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
Toot Toot
</a>  </a>
<a onclick="autoToot('${tag}');" class="pointer" title="${lang.lang_tags_always}${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}"> <a onclick="autoToot('${tag}');" class="pointer" title="${lang.lang_tags_always}${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
${ptt} ${ptt}
</a>  </a>
<a onclick="tagRemove('${key}')" class="pointer" title="${lang.lang_tags_tagunpin.replace('{{tag}}', '#' + tag)}"> <a onclick="tagRemove('${key}')" class="pointer" title="${lang.lang_tags_tagunpin.replace('{{tag}}', '#' + tag)}">
${lang.lang_del} ${lang.lang_del}
</a> </a>
</span> ` </span> `
}) })
if (obj.length > 0) { if (obj.length > 0) {
$('#taglist').append('My Tags:' + tags) $('#taglist').append('My Tags: ' + tags)
} else { } else {
$('#taglist').append('') $('#taglist').append('')
} }
} }
function tagShowHorizon(tag) {
$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
}
function trendTag() { function trendTag() {
$('.trendtag').remove() $('.trendtag').remove()
var domain = 'imastodon.net' var domain = 'imastodon.net'
@@ -103,28 +144,28 @@ function trendTag() {
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 tags = '' var tags = ''
json = json.score json = json.score
Object.keys(json).forEach(function(tag) { Object.keys(json).forEach(function (tag) {
tag = escapeHTML(tag) tag = escapeHTML(tag)
tags = tags =
tags + tags +
`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a> `<a onclick="tagShow('${tag}', this)" class="pointer">#${tag}</a>
<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">  <span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}"> 
<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>  <a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a> 
<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート"> <a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
@@ -134,8 +175,8 @@ function trendTag() {
}) })
$('#taglist').append( $('#taglist').append(
'<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + '<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' +
tags + tags +
'</div>' '</div>'
) )
trendintervalset() trendintervalset()
} else { } else {
@@ -182,18 +223,18 @@ function tagFeature(name, acct_id) {
name: name name: name
}) })
}) })
.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) {
return false return false
}) })
.then(function(json) { .then(function (json) {
console.log(json) console.log(json)
M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 }) M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
}) })
@@ -202,7 +243,7 @@ function tagFeature(name, acct_id) {
function addTag(id) { function addTag(id) {
var columns = JSON.parse(localStorage.getItem('column')) var columns = JSON.parse(localStorage.getItem('column'))
var column = columns[id] var column = columns[id]
if(!column.data.name) { if (!column.data.name) {
var name = column.data var name = column.data
} else { } else {
var name = column.data.name var name = column.data.name
@@ -219,7 +260,7 @@ function addTag(id) {
o[id] = obj o[id] = obj
var json = JSON.stringify(o) var json = JSON.stringify(o)
console.log(json) console.log(json)
localStorage.setItem('column',json) localStorage.setItem('column', json)
columnReload(id, 'tag') columnReload(id, 'tag')
} }

File diff suppressed because it is too large Load Diff

View File

@@ -21,7 +21,7 @@ function imgv(id, key, acct_id) {
if (remote_img == 'yes') { if (remote_img == 'yes') {
murl = ourl murl = ourl
} }
$(document).ready(function() { $(document).ready(function () {
if (type == 'image') { if (type == 'image') {
$('#imagemodal').modal('open') $('#imagemodal').modal('open')
imageXhr(id, key, murl) imageXhr(id, key, murl)
@@ -62,7 +62,7 @@ function imgCont(type) {
$('#imgsec').text(0) $('#imgsec').text(0)
$('#imgmodal').attr('src', '../../img/loading.svg') $('#imgmodal').attr('src', '../../img/loading.svg')
var type = $('#' + id + '-image-' + key).attr('data-type') var type = $('#' + id + '-image-' + key).attr('data-type')
$(document).ready(function() { $(document).ready(function () {
if (type == 'image') { if (type == 'image') {
imageXhr(id, key, murl) imageXhr(id, key, murl)
$('#imagewrap').dragScroll() // ドラッグスクロール設定 $('#imagewrap').dragScroll() // ドラッグスクロール設定
@@ -77,16 +77,22 @@ function imgCont(type) {
} }
function imageXhr(id, key, murl) { function imageXhr(id, key, murl) {
var startTime = new Date() var startTime = new Date()
$('#imgmodal-progress div').removeClass('determinate')
$('#imgmodal-progress div').addClass('indeterminate')
$('#imgmodal-progress').removeClass('hide')
xhr = new XMLHttpRequest() xhr = new XMLHttpRequest()
xhr.open('GET', murl, true) xhr.open('GET', murl, true)
xhr.responseType = 'arraybuffer' xhr.responseType = 'arraybuffer'
xhr.addEventListener( xhr.addEventListener(
'progress', 'progress',
function(event) { function (event) {
if (event.lengthComputable) { if (event.lengthComputable) {
var total = event.total var total = event.total
var now = event.loaded var now = event.loaded
var per = (now / total) * 100 var per = (now / total) * 100
$('#imgmodal-progress div').removeClass('indeterminate')
$('#imgmodal-progress div').addClass('determinate')
$('#imgmodal-progress div').css('width', `${per}%`)
$('#imgprog').text(Math.floor(per)) $('#imgprog').text(Math.floor(per))
} }
}, },
@@ -94,31 +100,35 @@ function imageXhr(id, key, murl) {
) )
xhr.addEventListener( xhr.addEventListener(
'loadend', 'loadend',
function(event) { function (event) {
var total = event.total var total = event.total
$('#imgbyte').text(Math.floor(total / 1024)) $('#imgbyte').text(Math.floor(total / 1024))
var now = event.loaded var now = event.loaded
var per = (now / total) * 100 var per = (now / total) * 100
$('#imgprog').text(Math.floor(per)) $('#imgprog').text(Math.floor(per))
$('#imgmodal-progress').addClass('hide')
$('#imgmodal-progress div').css('width', '0%')
$('#imgmodal-progress div').removeClass('determinate')
$('#imgmodal-progress div').addClass('indeterminate')
}, },
false false
) )
xhr.addEventListener( xhr.addEventListener(
'error', 'error',
function(event) { function (event) {
$('#imgmodal').attr('src', murl) $('#imgmodal').attr('src', murl)
}, },
false false
) )
xhr.onreadystatechange = function() { xhr.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) { if (this.readyState == 4 && this.status == 200) {
r = new FileReader() r = new FileReader()
r.readAsDataURL(this.response) r.readAsDataURL(this.response)
r.onload = function() { r.onload = function () {
var b64 = r.result var b64 = r.result
var element = new Image() var element = new Image()
var width var width
element.onload = function() { element.onload = function () {
var width = element.naturalWidth var width = element.naturalWidth
var height = element.naturalHeight var height = element.naturalHeight
calcNiceAspect(width, height) calcNiceAspect(width, height)
@@ -146,8 +156,8 @@ function imageXhr(id, key, murl) {
xhr.responseType = 'blob' xhr.responseType = 'blob'
xhr.send() xhr.send()
} }
function calcNiceAspect( width, height ) { function calcNiceAspect(width, height) {
if(width < 650) { if (width < 650) {
width = 650 width = 650
} }
var windowH = $(window).height() var windowH = $(window).height()
@@ -156,7 +166,7 @@ function calcNiceAspect( width, height ) {
$('#imagemodal img').css('width', 'auto') $('#imagemodal img').css('width', 'auto')
if (height < windowH) { if (height < windowH) {
$('#imagemodal').css('height', height + 100 + 'px') $('#imagemodal').css('height', height + 100 + 'px')
$('#imagemodal img').css('height', height + 'px') $('#imagemodal img').css('height', height + 'px')
if (width > windowW * 0.8) { if (width > windowW * 0.8) {
$('#imagemodal').css('width', '80vw') $('#imagemodal').css('width', '80vw')
$('#imagemodal img').css('width', 'auto') $('#imagemodal img').css('width', 'auto')
@@ -188,11 +198,11 @@ function zoom(z) {
$('#imagewrap img').css('height', hgt + 'px') $('#imagewrap img').css('height', hgt + 'px')
} }
//スマホ対応ドラッグ移動システム //スマホ対応ドラッグ移動システム
(function() { (function () {
$.fn.dragScroll = function() { $.fn.dragScroll = function () {
var target = this var target = this
$(this) $(this)
.mousedown(function(event) { .mousedown(function (event) {
$(this) $(this)
.data('down', true) .data('down', true)
.data('x', event.clientX) .data('x', event.clientX)
@@ -207,7 +217,7 @@ function zoom(z) {
}) })
// ウィンドウから外れてもイベント実行 // ウィンドウから外れてもイベント実行
$(document) $(document)
.mousemove(function(event) { .mousemove(function (event) {
if ($(target).data('down') == true) { if ($(target).data('down') == true) {
// スクロール // スクロール
target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - event.clientX) target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - event.clientX)
@@ -215,11 +225,11 @@ function zoom(z) {
return false // 文字列選択を抑止 return false // 文字列選択を抑止
} }
}) })
.mouseup(function(event) { .mouseup(function (event) {
$(target).data('down', false) $(target).data('down', false)
}) })
$(this) $(this)
.on('touchstart', function(event) { .on('touchstart', function (event) {
$(this) $(this)
.data('down', true) .data('down', true)
.data('x', getX(event)) .data('x', getX(event))
@@ -232,7 +242,7 @@ function zoom(z) {
overflow: 'hidden', // スクロールバー非表示 overflow: 'hidden', // スクロールバー非表示
cursor: 'move' cursor: 'move'
}) //指が触れたか検知 }) //指が触れたか検知
$(this).on('touchmove', function(event) { $(this).on('touchmove', function (event) {
if ($(target).data('down') === true) { if ($(target).data('down') === true) {
// スクロール // スクロール
target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event)) target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event))
@@ -241,7 +251,7 @@ function zoom(z) {
} else { } else {
} }
}) //指が動いたか検知 }) //指が動いたか検知
$(this).on('touchend', function(event) { $(this).on('touchend', function (event) {
$(target).data('down', false) $(target).data('down', false)
}) })
@@ -258,7 +268,7 @@ function getY(event) {
} }
//マウスホイールで拡大 //マウスホイールで拡大
var element = document.getElementById('imagemodal') var element = document.getElementById('imagemodal')
element.onmousewheel = function(e) { element.onmousewheel = function (e) {
var delta = e.wheelDelta var delta = e.wheelDelta
if (delta > 0) { if (delta > 0) {
zoom(1.1) zoom(1.1)

View File

@@ -52,7 +52,7 @@ function parseColumn(target, dontclose) {
localStorage.setItem('domain_' + key, acct.domain) localStorage.setItem('domain_' + key, acct.domain)
localStorage.setItem('acct_' + key + '_at', acct.at) localStorage.setItem('acct_' + key + '_at', acct.at)
localStorage.setItem('acct_' + key + '_rt', acct.rt ? acct.rt : null) localStorage.setItem('acct_' + key + '_rt', acct.rt ? acct.rt : null)
if(!target) mastodonBaseStreaming(key) if (!target) mastodonBaseStreaming(key)
ckdb(key) ckdb(key)
//フィルターデータ読もう //フィルターデータ読もう
getFilter(key) getFilter(key)
@@ -167,11 +167,11 @@ function parseColumn(target, dontclose) {
} }
var maxWidth = localStorage.getItem('max-width') var maxWidth = localStorage.getItem('max-width')
if (maxWidth) { if (maxWidth) {
css = css +'max-width:' + maxWidth + 'px;' css = css + 'max-width:' + maxWidth + 'px;'
} }
var margin = localStorage.getItem('margin') var margin = localStorage.getItem('margin')
if (margin) { if (margin) {
css = css +'margin-right:' + margin + 'px;' css = css + 'margin-right:' + margin + 'px;'
} }
if (acct.width) { if (acct.width) {
css = css + ' min-width:' + acct.width + 'px !important;max-width:' + acct.width + 'px !important;' css = css + ' min-width:' + acct.width + 'px !important;max-width:' + acct.width + 'px !important;'
@@ -231,14 +231,14 @@ function parseColumn(target, dontclose) {
} }
var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')" var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
class="setting nex waves-effect" title="${lang.lang_layout_unread}"> class="setting nex waves-effect" title="${lang.lang_layout_unread}">
<i class="material-icons waves-effect nex">more</i><br />${lang.lang_layout_unread} <i class="material-icons waves-effect nex">more</i><span>${lang.lang_layout_unread}</span>
</a>` </a>`
var notfDomain = acct.domain var notfDomain = acct.domain
var notfKey = key var notfKey = key
var if_tag = '' var if_tag = ''
var if_tag_btn = '' var if_tag_btn = ''
if (acct.type == 'notf') { if (acct.type == 'notf') {
var exclude = var excludeNotf =
`<div style="border: 1px solid; padding: 5px; margin-top: 5px; margin-bottom: 5px;">${lang.lang_layout_excluded}:<br> `<div style="border: 1px solid; padding: 5px; margin-top: 5px; margin-bottom: 5px;">${lang.lang_layout_excluded}:<br>
<label> <label>
<input type="checkbox" class="filled-in" id="exc-reply-${key}" ${excludeCk(key, 'mention')} /> <input type="checkbox" class="filled-in" id="exc-reply-${key}" ${excludeCk(key, 'mention')} />
@@ -272,20 +272,21 @@ function parseColumn(target, dontclose) {
</label> <br /> </label> <br />
<button class="btn btn-flat waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="exclude('${key}')">Filter</button>` <button class="btn btn-flat waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="exclude('${key}')">Filter</button>`
if (checkNotfFilter(key)) { if (checkNotfFilter(key)) {
exclude = excludeNotf =
exclude + excludeNotf +
`<button class="btn btn-flat red-text waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="resetNotfFilter('${key}')"> `<button class="btn btn-flat red-text waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="resetNotfFilter('${key}')">
Clear all Clear all
</button>` </button>`
} }
exclude = exclude + '</div>' excludeNotf = excludeNotf + '</div>'
notfDomain = 'dummy' notfDomain = 'dummy'
notfKey = 'dummy' notfKey = 'dummy'
var excludeHome = ''
} else if (acct.type == 'home') { } else if (acct.type == 'home') {
var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect"> var excludeNotf = ''
var excludeHome = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
<i class="fas fa-retweet nex" title="${lang.lang_layout_excludingbt}" style="font-size: 24px"></i> <i class="fas fa-retweet nex" title="${lang.lang_layout_excludingbt}" style="font-size: 24px"></i>
<span id="sta-bt-${key}">Off</span><br /> <span>${lang.lang_layout_excludingbt}</span><span id="sta-bt-${key}">Off</span>
${lang.lang_layout_excludingbt}
</a>` </a>`
} else if (acct.type == 'tag') { } else if (acct.type == 'tag') {
if (acct.data.name) { if (acct.data.name) {
@@ -313,10 +314,12 @@ function parseColumn(target, dontclose) {
<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 excludeNotf = ''
var excludeHome = ''
var if_notf = 'hide' var if_notf = 'hide'
} else { } else {
var exclude = '' var excludeNotf = ''
var excludeHome = ''
unread = '' unread = ''
} }
@@ -337,12 +340,12 @@ function parseColumn(target, dontclose) {
$('#timeline-container').append(basehtml) $('#timeline-container').append(basehtml)
} }
var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex waves-effect"> var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex waves-effect">
<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i><br /> <i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
${lang.lang_layout_leftFold}</a>` <span>${lang.lang_layout_leftFold}</span></a>`
} else { } else {
var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex waves-effect"> var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex waves-effect">
<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i><br /> <i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
${lang.lang_layout_leftUnfold}</a>` <span>${lang.lang_layout_leftUnfold}</span></a>`
} }
if (key === 0) { if (key === 0) {
left_hold = '' left_hold = ''
@@ -363,8 +366,7 @@ function parseColumn(target, dontclose) {
if (acct.type != 'pub' && acct.type != 'pub-media') { if (acct.type != 'pub' && acct.type != 'pub-media') {
var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex waves-effect"> var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex waves-effect">
<i class="material-icons nex" title="${lang.lang_layout_mediafil}">perm_media</i> <i class="material-icons nex" title="${lang.lang_layout_mediafil}">perm_media</i>
<span id="sta-media-${key}">On</span><br /> <span>${lang.lang_layout_mediafil}</span/><span id="sta-media-${key}">On</span></a>`
${lang.lang_layout_mediafil}</a>`
} else { } else {
var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex waves-effect"> var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex waves-effect">
<i class="material-icons nex" title="${lang.lang_layout_remoteOnly}">perm_media</i><br /> <i class="material-icons nex" title="${lang.lang_layout_remoteOnly}">perm_media</i><br />
@@ -422,39 +424,48 @@ function parseColumn(target, dontclose) {
</div> </div>
</div> </div>
<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;">
${exclude} ${excludeNotf}
<div class="columnSettings">
${excludeHome}
${unread} ${unread}
${left_hold} ${left_hold}
${mediaFil} ${mediaFil}
<a onclick="cardToggle('${key}')" class="setting nex waves-effect"> <a onclick="cardToggle('${key}')" class="setting nex waves-effect">
<i class="material-icons nex" title="${lang.lang_layout_linkanades}">link</i> <i class="material-icons nex" title="${lang.lang_layout_linkanades}">link</i>
<span id="sta-card-${key}">On</span><br /> <span>${lang.lang_layout_linkana}</span><span id="sta-card-${key}">On</span>
${lang.lang_layout_linkana}
</a> </a>
<a onclick="voiceToggle('${key}')" class="setting nex waves-effect"> <a onclick="voiceToggle('${key}')" class="setting nex waves-effect">
<i class="material-icons nex" title="${lang.lang_layout_tts}">hearing</i> <i class="material-icons nex" title="${lang.lang_layout_tts}">hearing</i>
<span id="sta-voice-${key}">On</span><br /> <span>${lang.lang_layout_tts}TL</span/><span id="sta-voice-${key}">On</span>
${lang.lang_layout_tts} </a>
TL</a>
<a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide} waves-effect"> <a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide} waves-effect">
<i class="material-icons nex" title="${lang.lang_layout_reconnect}">refresh</i> <i class="material-icons nex" title="${lang.lang_layout_reconnect}">refresh</i>
<br /> <span>${lang.lang_layout_reconnect}</span>
${lang.lang_layout_reconnect}
</a> </a>
<a onclick="resetWidth('${key}')" class="setting nex waves-effect"> <a onclick="resetWidth('${key}')" class="setting nex waves-effect">
<i class="material-icons nex" title="${lang.lang_layout_resetWidth}">refresh</i> <i class="material-icons nex rotate-90" title="${lang.lang_layout_resetWidth}">height</i>
<br /> <span>${lang.lang_layout_resetWidth}</span>
${lang.lang_layout_resetWidth} </a></div>
</a><br /> <p>${lang.lang_layout_headercolor}</p>
${lang.lang_layout_headercolor}
<br>
<div id="picker_${key}" class="color-picker"></div> <div id="picker_${key}" class="color-picker"></div>
</div>${if_tag} </div>${if_tag}
<div class="tl-box" tlid="${key}"> <div class="tl-box" tlid="${key}">
<div id="timeline_${key}" class="tl ${acct.type}-timeline " tlid="${key}" <div id="timeline_${key}" class="tl ${acct.type}-timeline " tlid="${key}"
data-type="${acct.type}" data-acct="${acct.domain}" data-const="${acct.type}_${acct.domain}"> data-type="${acct.type}" data-acct="${acct.domain}" data-const="${acct.type}_${acct.domain}">
<div id="landing_${key}" style="text-align:center"> <div id="landing_${key}" class="landing">
${lang.lang_layout_nodata} <div class="preloader-wrapper small active " style="margin-top: calc(50vh - 15px)">
<div class="spinner-layer spinner-blue-only">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div>` </div>`
@@ -660,8 +671,6 @@ function removeColumn(tlid) {
$('#timeline_box_' + tlid + '_parentBox').remove() $('#timeline_box_' + tlid + '_parentBox').remove()
} }
} }
$('#sort-box').removeClass('hide')
$('#sort-box').addClass('show')
}) })
} }

View File

@@ -101,6 +101,7 @@ if (location.search) {
$('.mini-btn').text('expand_less') $('.mini-btn').text('expand_less')
} }
} }
function initPostbox() { function initPostbox() {
$('#posttgl').click(function (e) { $('#posttgl').click(function (e) {
if (!$('#post-box').hasClass('appear')) { if (!$('#post-box').hasClass('appear')) {
@@ -124,6 +125,7 @@ function initPostbox() {
selectedToot = 0 selectedToot = 0
localStorage.removeItem('nohide') localStorage.removeItem('nohide')
srcBox('close') srcBox('close')
tShowBox('close')
}) })
$('#textarea,#cw-text').focusout(function (e) { $('#textarea,#cw-text').focusout(function (e) {
localStorage.setItem('nohide', true) localStorage.setItem('nohide', true)

File diff suppressed because it is too large Load Diff

View File

@@ -117,7 +117,7 @@ function trendTagonTip() {
Object.keys(json).forEach(function(tag) { Object.keys(json).forEach(function(tag) {
tags = tags =
tags + tags +
`<a onclick="tagShow('${tag}')" class="pointer"> `<a onclick="tagShow('${tag}', this)" class="pointer">
#${escapeHTML(tag)} #${escapeHTML(tag)}
</a> </a>
<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">  <span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}"> 

File diff suppressed because it is too large Load Diff

View File

@@ -14,12 +14,12 @@ const dl = require('./main/dl.js')
const img = require('./main/img.js') const img = require('./main/img.js')
const np = require('./main/np.js') const np = require('./main/np.js')
const systemFunc = require('./main/system.js') const systemFunc = require('./main/system.js')
const Menu = electron.Menu const { Menu, MenuItem, BrowserWindow, ipcMain } = electron
const join = require('path').join const join = require('path').join
// ウィンドウを作成するモジュール // ウィンドウを作成するモジュール
const BrowserWindow = electron.BrowserWindow
// メインウィンドウはGCされないようにグローバル宣言 // メインウィンドウはGCされないようにグローバル宣言
let mainWindow let mainWindow
let opening = true
// アプリが多重起動しないようにする // アプリが多重起動しないようにする
const gotTheLock = app.requestSingleInstanceLock() const gotTheLock = app.requestSingleInstanceLock()
@@ -27,9 +27,12 @@ const gotTheLock = app.requestSingleInstanceLock()
if (!gotTheLock) { if (!gotTheLock) {
app.quit() app.quit()
} else { } else {
app.on('second-instance', () => { app.on('second-instance', (event, commandLine, workingDirector) => {
// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す opening = false
// Someone tried to run a second instance, we should focus our window. const m = commandLine[2].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
if (m) {
mainWindow.send('customUrl', [m[1], m[2]])
}
if (mainWindow) { if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore() if (mainWindow.isMinimized()) mainWindow.restore()
mainWindow.focus() mainWindow.focus()
@@ -39,7 +42,7 @@ if (!gotTheLock) {
// 全てのウィンドウが閉じたら終了 // 全てのウィンドウが閉じたら終了
app.on('window-all-closed', function () { app.on('window-all-closed', function () {
electron.session.defaultSession.clearCache(() => {}) electron.session.defaultSession.clearCache(() => { })
app.quit() app.quit()
}) })
function isFile(file) { function isFile(file) {
@@ -76,25 +79,26 @@ function createWindow() {
if (!packaged) console.log('launch:' + lang) if (!packaged) console.log('launch:' + lang)
//Opening //Opening
const package = fs.readFileSync(__dirname + '/package.json') const package = fs.readFileSync(__dirname + '/package.json')
if(lang == 'ja') { if (lang == 'ja') {
const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json')) const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
var show = maxims[Math.floor(Math.random() * maxims.length)] var show = maxims[Math.floor(Math.random() * maxims.length)]
} else if(lang == 'ja-KS') { } else if (lang == 'ja-KS') {
//ja-KSも作れたらいいね //ja-KSも作れたらいいね
const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json')) const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
var show = maxims[Math.floor(Math.random() * maxims.length)] var show = maxims[Math.floor(Math.random() * maxims.length)]
} else{ } else {
var show = 'TheDesk 2018' var show = 'TheDesk 2018'
} }
const data = JSON.parse(package) const data = JSON.parse(package)
const version = data.version const version = data.version
const codename = data.codename const codename = data.codename
var openingWindow = new BrowserWindow({ const openingWindow = new BrowserWindow({
width: 300, width: 300,
height: 400, height: 400,
transparent: false, transparent: false,
frame: false, frame: false,
resizable: false, resizable: false,
show: opening
}) })
openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`) openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
@@ -104,18 +108,18 @@ function createWindow() {
var packaged = false var packaged = false
console.log( console.log(
'||\\\\\\ \n' + '||\\\\\\ \n' +
'|||| \\\\\\\\ \n' + '|||| \\\\\\\\ \n' +
'|||| \\\\\\\\ \n' + '|||| \\\\\\\\ \n' +
'|||| Am I a \\\\\\\\ \n' + '|||| Am I a \\\\\\\\ \n' +
'|||| cat? ^ ^ \\\\\\\\\\ _____ _ ____ _ \n' + '|||| cat? ^ ^ \\\\\\\\\\ _____ _ ____ _ \n' +
'|||| (.-.) \\\\\\\\\\ |_ _| |__ ___| _ \\ ___ ___| | __\n' + '|||| (.-.) \\\\\\\\\\ |_ _| |__ ___| _ \\ ___ ___| | __\n' +
"|||| ___> ) ||||| | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" + "|||| ___> ) ||||| | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
'|||| < _ _) ////// | | | | | | __/ |_| | __/__ \\ < \n' + '|||| < _ _) ////// | | | | | | __/ |_| | __/__ \\ < \n' +
'|||| |_||_| ///// |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' + '|||| |_||_| ///// |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
'|||| ///// \n' + '|||| ///// \n' +
'|||| /////\n' + '|||| /////\n' +
'|||| /////\n' + '|||| /////\n' +
'||||//////' '||||//////'
) )
console.log('If it does not show the window, you might forget `npm run construct`.') console.log('If it does not show the window, you might forget `npm run construct`.')
} }
@@ -133,7 +137,7 @@ function createWindow() {
if (!packaged) console.log('enabled: Hardware Acceleration') if (!packaged) console.log('enabled: Hardware Acceleration')
} }
let webviewEnabled = false let webviewEnabled = false
if(fs.existsSync(wv_path, 'utf8')) webviewEnabled = true if (fs.existsSync(wv_path, 'utf8')) webviewEnabled = true
var window_size var window_size
try { try {
window_size = JSON.parse(fs.readFileSync(info_path, 'utf8')) window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
@@ -190,13 +194,13 @@ function createWindow() {
}) })
mainWindow.webContents.on('page-title-updated', () => { mainWindow.webContents.on('page-title-updated', () => {
const url = mainWindow.webContents.getURL() const url = mainWindow.webContents.getURL()
if(url.match(/https:\/\/crowdin.com\/profile/)) { if (url.match(/https:\/\/crowdin.com\/profile/)) {
app.relaunch() app.relaunch()
app.exit() app.exit()
} }
}) })
if (!packaged) mainWindow.toggleDevTools() if (!packaged) mainWindow.toggleDevTools()
electron.session.defaultSession.clearCache(() => {}) electron.session.defaultSession.clearCache(() => { })
if (process.argv) { if (process.argv) {
if (process.argv[1]) { if (process.argv[1]) {
var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/) var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
@@ -229,7 +233,7 @@ function createWindow() {
} }
// ウィンドウが閉じられたらアプリも終了 // ウィンドウが閉じられたらアプリも終了
mainWindow.on('closed', function () { mainWindow.on('closed', function () {
electron.ipcMain.removeAllListeners() ipcMain.removeAllListeners()
mainWindow = null mainWindow = null
}) })
closeArg = false closeArg = false
@@ -242,7 +246,7 @@ function createWindow() {
mainWindow.send('asReadEnd', '') mainWindow.send('asReadEnd', '')
let wait = 3000 let wait = 3000
const url = mainWindow.webContents.getURL() const url = mainWindow.webContents.getURL()
if(!url.match(/index.html/)) wait = 0 if (!url.match(/index.html/)) wait = 0
setTimeout(function () { setTimeout(function () {
resolve() resolve()
}, wait) }, wait)
@@ -252,7 +256,7 @@ function createWindow() {
mainWindow.close() mainWindow.close()
}) })
}) })
electron.ipcMain.on('sendMarkersComplete', function (e, arg) { ipcMain.on('sendMarkersComplete', function (e, arg) {
closeArg = true closeArg = true
mainWindow.close() mainWindow.close()
}) })

View File

@@ -1,13 +1,11 @@
// Create the Application's main menu // Create the Application's main menu
function templete(lang, mainWindow, packaged, dir, dirname) { function templete(lang, mainWindow, packaged, dir, dirname) {
//フレーム //フレーム
if(lang !="ja" && lang != "en"){ if (lang != "ja" && lang != "en") {
lang = "en" lang = "en"
} }
const electron = require("electron"); const electron = require("electron")
const ipc = electron.ipcMain; const { Menu, MenuItem, ipcMain, BrowserWindow, app } = electron
const app = electron.app;
const BrowserWindow = electron.BrowserWindow;
const join = require('path').join; const join = require('path').join;
const dict = { const dict = {
"application": { "application": {
@@ -71,7 +69,7 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
"en": "Close" "en": "Close"
} }
} }
if(packaged){ if (packaged) {
var ifDev = [ var ifDev = [
{ {
label: dict.reload[lang], label: dict.reload[lang],
@@ -79,12 +77,12 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
click: function () { mainWindow.reload(); } click: function () { mainWindow.reload(); }
} }
] ]
}else{ } else {
var ifDev = [ var ifDev = [
{ {
label: 'Toggle Developer Tools', label: 'Toggle Developer Tools',
accelerator: 'Alt+Command+I', accelerator: 'Alt+Command+I',
click: function () { if (!packaged) { mainWindow.toggleDevTools(); } } click: function () { mainWindow.toggleDevTools(); }
}, },
{ {
label: dict.reload[lang], label: dict.reload[lang],
@@ -104,7 +102,7 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
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, height: 500, width: 300, height: 500,
"transparent": false, // ウィンドウの背景を透過 "transparent": false, // ウィンドウの背景を透過
@@ -150,6 +148,28 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
] ]
} }
]; ];
// コピペメニュー
const ctxMenu = new Menu()
ctxMenu.append(new MenuItem({
label: dict.cut[lang],
role: 'cut',
click: () => { console.log('Cut clicked!') }
}))
ctxMenu.append(new MenuItem({
label: dict.copy[lang],
role: 'copy',
click: () => { console.log('Copy clicked!') }
}))
ctxMenu.append(new MenuItem({
label: dict.paste[lang],
role: 'paste',
click: () => { console.log('Paste clicked!') }
}))
ipcMain.on('textareaContextMenu', function (e, params) {
ctxMenu.popup(mainWindow, params.x, params.y)
})
return menu; return menu;
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "thedesk", "name": "thedesk",
"version": "22.2.0", "version": "22.3.0",
"codename": "Koume", "codename": "Koume",
"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",
@@ -38,8 +38,7 @@
"url": "https://cutls.dev", "url": "https://cutls.dev",
"email": "p@cutls.com" "email": "p@cutls.com"
}, },
"contributor": [ "contributor": [{
{
"name": "とねぢ", "name": "とねぢ",
"url": "https://minohdon.jp/@toneji", "url": "https://minohdon.jp/@toneji",
"email": "solfa.tono@gmail.com" "email": "solfa.tono@gmail.com"
@@ -57,7 +56,7 @@
], ],
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.15.2", "@fortawesome/fontawesome-free": "^5.15.3",
"@syuilo/aiscript": "^0.11.1", "@syuilo/aiscript": "^0.11.1",
"electron-dl": "^3.2.1", "electron-dl": "^3.2.1",
"itunes-nowplaying-mac": "https://github.com/cutls/itunes-nowplaying-mac/releases/download/v0.4.0/itunes-nowplaying-mac-0.4.0.tgz", "itunes-nowplaying-mac": "https://github.com/cutls/itunes-nowplaying-mac/releases/download/v0.4.0/itunes-nowplaying-mac-0.4.0.tgz",
@@ -67,25 +66,27 @@
"json5": "^2.2.0", "json5": "^2.2.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"materialize-css": "git://github.com/cutls/materialize#v1-dev", "materialize-css": "git://github.com/cutls/materialize#v1-dev",
"sanitize-html": "^2.3.2", "sanitize-html": "^2.4.0",
"sumchecker": "^3.0.1", "sumchecker": "^3.0.1",
"sweetalert2": "^10.15.7", "sweetalert2": "^11.0.17",
"system-font-families": "^0.4.1", "system-font-families": "^0.4.1",
"vue": "^2.6.12" "textarea-caret": "^3.1.0",
"vue": "^2.6.14"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^17.0.0", "browserify": "^17.0.0",
"chokidar": "^3.5.1", "chokidar": "^3.5.2",
"dotenv": "^8.2.0", "dotenv": "^10.0.0",
"electron": "^12.0.2", "electron": "^13.1.2",
"electron-builder": "^22.10.5", "electron-builder": "^22.11.7",
"electron-notarize": "^1.0.0", "electron-notarize": "^1.0.0",
"electron-rebuild": "^2.3.5", "electron-rebuild": "^2.3.5",
"eslint": "^7.23.0", "eslint": "^7.28.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"readline-sync": "1.4.10" "readline-sync": "1.4.10"
}, },
"resolutions": { "resolutions": {
"@types/fs-extra": "9.0.11" "@types/fs-extra": "9.0.11",
"plist": "3.0.2"
} }
} }

View File

@@ -17,7 +17,7 @@
bottom: '#eeeeee', bottom: '#eeeeee',
emphasized: '#81c784', emphasized: '#81c784',
postbox: '#fff', postbox: '#fff',
active: '#009688', active: '#66dacf',
selected: '#c0c0c0', selected: '#c0c0c0',
selectedWithShared: '#b2babd', selectedWithShared: '#b2babd',
}, },

View File

@@ -2,133 +2,143 @@
<html lang="@@lang@@"> <html lang="@@lang@@">
<head> <head>
<title>Account Manager - TheDesk</title> <title>Account Manager - TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport" /> <meta content="width=device-width,initial-scale=1.0" name="viewport" />
<link href="../../css/themes.css" type="text/css" rel="stylesheet"> <link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href="../../@@node_base@@/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" /> <link href="../../@@node_base@@/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
<link href="../../css/master.css" type="text/css" rel="stylesheet" /> <link href="../../css/master.css" type="text/css" rel="stylesheet" />
<link href="../../css/tl.css" rel="stylesheet" type="text/css" /> <link href="../../css/tl.css" rel="stylesheet" type="text/css" />
<link href="../../css/userdata.css" rel="stylesheet" type="text/css" /> <link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
<link href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet" /> <link href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="../../css/sweetalert2-material.min.css" type="text/css" rel="stylesheet"> <link href="../../css/sweetalert2-material.css" type="text/css" rel="stylesheet">
<link href="../../css/acct.css" rel="stylesheet" type="text/css" /> <link href="../../css/acct.css" rel="stylesheet" type="text/css" />
<meta charset="utf-8" /> <meta charset="utf-8" /> @@comment-start@@
@@comment-start@@ <script type="text/javascript">
<script type="text/javascript"> var _jipt = []
var _jipt = [] _jipt.push(['project', 'thedesk'])
_jipt.push(['project', 'thedesk']) </script>
</script> <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script> @@comment-end@@ @@pwa@@ @@store@@
@@comment-end@@
@@pwa@@ @@store@@
</head> </head>
<body id="mainView" class="@@pwaClass@@"> <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 type="text/javascript" src="../../@@node_base@@/materialize-css/dist/js/materialize.js"></script> <script type="text/javascript" src="../../@@node_base@@/materialize-css/dist/js/materialize.js"></script>
<script type="text/javascript" src="main.js"></script> <script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="../../@@node_base@@/sweetalert2/dist/sweetalert2.min.js"></script> <script type="text/javascript" src="../../@@node_base@@/sweetalert2/dist/sweetalert2.min.js"></script>
<script> <script>
var misskeytoken = false var misskeytoken = false
</script> </script>
<script type="text/javascript" src="../../js/common/time.js"></script> <script type="text/javascript" src="../../js/common/time.js"></script>
<div class="hide-first"> <div class="hide-first">
<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">@@back@@</a><br /> <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">@@back@@</a><br />
<h5>@@list@@</h5> <h5>@@list@@</h5>
<div id="acct-list"></div> <div id="acct-list"></div>
<div class="divider"></div> <div class="divider"></div>
</div> </div>
<div class="hide-second"> <div>
<a href="setting.html">@@haveExported@@</a> <h5>@@add@@</h5>
</div>
<div> <div class="hide-second">
<h5>@@add@@</h5> <a href="setting.html">@@haveExported@@</a>
<br /> </div>
<div id="add"> <br />
<div class="row"> <div id="add">
<div class="col s8"> <div class="row">
@@addAcct@@<br /> <div class="col s8">
<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" /> @@addAcct@@
<div id="ins-suggest"></div> <div class="row">
<button class="btn waves-effect" onclick="instance()">Login</button><br /> <div class="input-field col s6">
<div class="pwa"> <input type="text" id="autocomplete-input" class="autocomplete" placeholder="eg) mstdn.jp">
@@codesetupwarn@@<br /> <label for="autocomplete-input">URL</label>
<label> </div>
<div class="col s4 loginBtnWrap">
<button class="btn waves-effect" onclick="instance()"><i
class="material-icons left">login</i>Login</button>
</div>
</div>
<div class="pwa">
@@codesetupwarn@@<br />
<label>
<input type="checkbox" class="filled-in" id="linux" /> <input type="checkbox" class="filled-in" id="linux" />
<span>@@codesetup@@</span> <span>@@codesetup@@</span>
</label> </label>
<br /> <br />
</div> </div>
<label> <label>
<input type="checkbox" class="filled-in" id="misskey" /> <input type="checkbox" class="filled-in" id="misskey" />
<span>@@thisismisskey@@</span> </label><br /> <span>@@thisismisskey@@</span> </label><br />
</div> </div>
<div class="col s4 scr" aria-hidden="true"> <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>
</div> </div>
</div> </div>
<div id="auth" style="display:none"> <div id="auth" style="display:none">
@@codepastewarn@@<br /> @@codepastewarn@@<br />
<input type="text" id="code" placeholder="@@codepaste@@" required /> <input type="text" id="code" placeholder="@@codepaste@@" required />
<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" class="scr"> <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>のため以下の機能がご利用いただけません。
<span id="compt-warn" <span id="compt-warn" style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span> <ul id="compt-list"></ul>
<ul id="compt-list"></ul> </div>
</div> </div>
</div> <div id="misskeylogin" style="display:none">
<div id="misskeylogin" style="display:none"> <h5>AppSecret</h5>
<h5>AppSecret</h5> @@misskeylogin@@<br />
@@misskeylogin@@<br /> <input type="hidden" id="misskey-url" />
<input type="hidden" id="misskey-url" /> <input type="text" id="misskey-key" placeholder="@@codepaste@@" required />
<input type="text" id="misskey-key" placeholder="@@codepaste@@" required /> <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br />
<button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br /> <br />
<br /> <a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
<a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a> </div>
</div> </div>
</div> <div class="hide-first">
<div class="hide-first"> <h5>@@mainacct@@</h5>
<h5>@@mainacct@@</h5> <div class="input-field" style="width:300px">
<div class="input-field" style="width:300px"> <span data-trans="your_acct">@@selacct@@</span>
<span data-trans="your_acct">@@selacct@@</span> <br />
<br /> <select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select>
<select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select> <label></label>
<label></label> </div>
</div> <ul id="domain-list" class="collection transparent"></ul>
<ul id="domain-list" class="collection transparent"></ul> <div id="instance-data">
<div id="instance-data"> Some instance data by
Some instance data by <a href="https://instances.social" target="_blank">instances.social API</a><br />
<a href="https://instances.social" target="_blank">instances.social API</a><br /> <h5 id="ins-title"></h5>
<h5 id="ins-title"></h5> Administered by:
Administered by:<a id="ins-admin"></a><br /> <a id="ins-admin"></a><br />
<span id="ins-desc"></span><br /> <span id="ins-desc"></span><br />
<img src="../../img/loading.svg" id="ins-prof" width="200" /><br /> <img src="../../img/loading.svg" id="ins-prof" width="200" /><br />
<br /> <br /> @@domain@@:
@@domain@@:<span id="ins-name"></span><br /> <span id="ins-name"></span><br /> @@connect@@:
@@connect@@:<span id="ins-connect"></span>@@ko@@<br /> <span id="ins-connect"></span>@@ko@@<br /> @@toots@@:
@@toots@@:<span id="ins-toot"></span>@@ko@@<br /> <span id="ins-toot"></span>@@ko@@<br /> @@users@@:
@@users@@:<span id="ins-user"></span>@@users@@<br /> <span id="ins-user"></span>@@users@@<br /> @@safety@@:
@@safety@@:<span id="ins-per"></span>%<br /> <span id="ins-per"></span>%<br /> @@ver@@:
@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br /> <span id="ins-ver"></span>@<span id="ins-upd"></span><br />
</div> </div>
</div> </div>
<script type="text/javascript" src="../../js/ui/theme.js"></script> <script type="text/javascript" src="../../js/ui/theme.js"></script>
<script type="text/javascript" src="../../js/ui/tips.js"></script> <script type="text/javascript" src="../../js/ui/tips.js"></script>
<script type="text/javascript" src="../../js/platform/end.js"></script> <script type="text/javascript" src="../../js/platform/end.js"></script>
<script type="text/javascript" src="../../js/common/sha256.js"></script> <script type="text/javascript" src="../../js/common/sha256.js"></script>
<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script> <script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
<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> <script>
$('body').addClass(localStorage.getItem('platform'))
</script>
</body> </body>
</html> </html>

File diff suppressed because it is too large Load Diff

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Отваряне в браузъра", "openBrowser": "Отваряне в браузъра",
"screenshot": "Направете снимка на екрана", "screenshot": "Направете снимка на екрана",
"copyURL": "Копирай URL адреса на този тоот", "copyURL": "Копирай URL адреса на този тоот",
"copy": "Copy",
"embed": "Закрепи", "embed": "Закрепи",
"toots": "Тоот", "toots": "Тоот",
"follow": "Следвам", "follow": "Следвам",
@@ -178,6 +179,7 @@
"foundBug": "Намерена е грешка", "foundBug": "Намерена е грешка",
"show": "Покажи", "show": "Покажи",
"directory": "Директория", "directory": "Директория",
"discover": "Discover",
"active": "Наскоро активен", "active": "Наскоро активен",
"newcomer": "Новодошли", "newcomer": "Новодошли",
"local_only": "Само местно", "local_only": "Само местно",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Вграденият HTML е изрязан.", "lang_details_embed": "Вграденият HTML е изрязан.",
"lang_details_url": "URL адресът на този toot е изрязан.", "lang_details_url": "URL адресът на този toot е изрязан.",
"lang_details_txt": "Съдържанието на този toot е изрязано.", "lang_details_txt": "Съдържанието на този toot е изрязано.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Няма данни", "lang_filter_nodata": "Няма данни",
"lang_filter_errordegree": "Моля, проверете контекстта", "lang_filter_errordegree": "Моля, проверете контекстта",
"lang_list_nodata": "Няма данни", "lang_list_nodata": "Няма данни",

View File

@@ -72,6 +72,7 @@
"desc": "Относно тази тема", "desc": "Относно тази тема",
"customImport": "Импортиране на персонализирани теми", "customImport": "Импортиране на персонализирани теми",
"delete": "Изтрий", "delete": "Изтрий",
"preview": "Preview",
"timeline": "Предпочитания за времевата линия", "timeline": "Предпочитания за времевата линия",
"timemode": "Времеви формат", "timemode": "Времеви формат",
"relativetime": "Относителен формат: „преди 1 минута“, „преди 3 дни“", "relativetime": "Относителен формат: „преди 1 минута“, „преди 3 дни“",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Звук (Отговор)", "replySound": "Звук (Отговор)",
"favSound": "Звук(Фаворит)", "favSound": "Звук(Фаворит)",
"btSound": "Звук(Подсилване)", "btSound": "Звук(Подсилване)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Otevřít v prohlížeči", "openBrowser": "Otevřít v prohlížeči",
"screenshot": "Vytvořit snímek obrazovky", "screenshot": "Vytvořit snímek obrazovky",
"copyURL": "Kopírovat URL tohoto tootu", "copyURL": "Kopírovat URL tohoto tootu",
"copy": "Copy",
"embed": "Vložit", "embed": "Vložit",
"toots": "Tooty", "toots": "Tooty",
"follow": "Sledovat", "follow": "Sledovat",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "HTML pro vložení je zkopírován.", "lang_details_embed": "HTML pro vložení je zkopírován.",
"lang_details_url": "URL adresa tohoto tootu je zkopírována.", "lang_details_url": "URL adresa tohoto tootu je zkopírována.",
"lang_details_txt": "Obsah tohoto tootu je zkopírován.", "lang_details_txt": "Obsah tohoto tootu je zkopírován.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Žádná data", "lang_filter_nodata": "Žádná data",
"lang_filter_errordegree": "Prosím zkontrolujte kontext", "lang_filter_errordegree": "Prosím zkontrolujte kontext",
"lang_list_nodata": "Žádná data", "lang_list_nodata": "Žádná data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Časový formát", "timemode": "Časový formát",
"relativetime": "Relativní formát: „před 1 minutou“, „před 3 dny“", "relativetime": "Relativní formát: „před 1 minutou“, „před 3 dny“",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -1,7 +1,7 @@
{ {
"draghere": "Zum Hochladen hier her ziehen", "draghere": "Zum Hochladen hier her ziehen",
"nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet", "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
"reOnline": "Now we are in the Internet, you should reload...", "reOnline": "Jetzt haben wir wieder Internet. Du solltest neuladen...",
"close": "Schließen", "close": "Schließen",
"webSrc": "Suche im Internet", "webSrc": "Suche im Internet",
"tsSrc": "Bei Tootsearch suchen", "tsSrc": "Bei Tootsearch suchen",
@@ -74,6 +74,7 @@
"openBrowser": "Im Browser öffnen", "openBrowser": "Im Browser öffnen",
"screenshot": "Bildschirmfoto aufnehmen", "screenshot": "Bildschirmfoto aufnehmen",
"copyURL": "URL dieses Tröts kopieren", "copyURL": "URL dieses Tröts kopieren",
"copy": "Copy",
"embed": "Einbinden", "embed": "Einbinden",
"toots": "Tröts", "toots": "Tröts",
"follow": "Folgen", "follow": "Folgen",
@@ -178,6 +179,7 @@
"foundBug": "Ich habe einen Fehler gefunden", "foundBug": "Ich habe einen Fehler gefunden",
"show": "Zeige", "show": "Zeige",
"directory": "Verzeichnis", "directory": "Verzeichnis",
"discover": "Discover",
"active": "Kürzlich aktiv", "active": "Kürzlich aktiv",
"newcomer": "Neu eingetroffen", "newcomer": "Neu eingetroffen",
"local_only": "Nur lokal", "local_only": "Nur lokal",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Eingefügtes HTML wurde entfernt.", "lang_details_embed": "Eingefügtes HTML wurde entfernt.",
"lang_details_url": "URL dieses Tröts wurde entfernt.", "lang_details_url": "URL dieses Tröts wurde entfernt.",
"lang_details_txt": "Inhalt dieses Tröts wurde entfernt.", "lang_details_txt": "Inhalt dieses Tröts wurde entfernt.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Keine Daten", "lang_filter_nodata": "Keine Daten",
"lang_filter_errordegree": "Bitte überprüfen Sie den Kontext", "lang_filter_errordegree": "Bitte überprüfen Sie den Kontext",
"lang_list_nodata": "Keine Daten", "lang_list_nodata": "Keine Daten",

View File

@@ -72,6 +72,7 @@
"desc": "Über dieses Design", "desc": "Über dieses Design",
"customImport": "Import von eigenen Designs", "customImport": "Import von eigenen Designs",
"delete": "Löschen", "delete": "Löschen",
"preview": "Preview",
"timeline": "Verlaufseinstellungen", "timeline": "Verlaufseinstellungen",
"timemode": "Zeitformat", "timemode": "Zeitformat",
"relativetime": "Relatives Format:\"vor 1 Minuten\",\"vor 3 Tagen\"", "relativetime": "Relatives Format:\"vor 1 Minuten\",\"vor 3 Tagen\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Ton bei Antwort", "replySound": "Ton bei Antwort",
"favSound": "Ton bei Favorit", "favSound": "Ton bei Favorit",
"btSound": "Ton bei Verstärkung", "btSound": "Ton bei Verstärkung",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "crwdns3190:0crwdne3190:0", "openBrowser": "crwdns3190:0crwdne3190:0",
"screenshot": "crwdns3192:0crwdne3192:0", "screenshot": "crwdns3192:0crwdne3192:0",
"copyURL": "crwdns3194:0crwdne3194:0", "copyURL": "crwdns3194:0crwdne3194:0",
"copy": "crwdns4586:0crwdne4586:0",
"embed": "crwdns3196:0crwdne3196:0", "embed": "crwdns3196:0crwdne3196:0",
"toots": "crwdns3198:0crwdne3198:0", "toots": "crwdns3198:0crwdne3198:0",
"follow": "crwdns3200:0crwdne3200:0", "follow": "crwdns3200:0crwdne3200:0",
@@ -178,6 +179,7 @@
"foundBug": "crwdns4431:0crwdne4431:0", "foundBug": "crwdns4431:0crwdne4431:0",
"show": "crwdns3388:0crwdne3388:0", "show": "crwdns3388:0crwdne3388:0",
"directory": "crwdns3390:0crwdne3390:0", "directory": "crwdns3390:0crwdne3390:0",
"discover": "crwdns4590:0crwdne4590:0",
"active": "crwdns3392:0crwdne3392:0", "active": "crwdns3392:0crwdne3392:0",
"newcomer": "crwdns3394:0crwdne3394:0", "newcomer": "crwdns3394:0crwdne3394:0",
"local_only": "crwdns3396:0crwdne3396:0", "local_only": "crwdns3396:0crwdne3396:0",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "crwdns3584:0crwdne3584:0", "lang_details_embed": "crwdns3584:0crwdne3584:0",
"lang_details_url": "crwdns3586:0crwdne3586:0", "lang_details_url": "crwdns3586:0crwdne3586:0",
"lang_details_txt": "crwdns3588:0crwdne3588:0", "lang_details_txt": "crwdns3588:0crwdne3588:0",
"lang_details_fetch": "crwdns4588:0crwdne4588:0",
"lang_filter_nodata": "crwdns3590:0crwdne3590:0", "lang_filter_nodata": "crwdns3590:0crwdne3590:0",
"lang_filter_errordegree": "crwdns3592:0crwdne3592:0", "lang_filter_errordegree": "crwdns3592:0crwdne3592:0",
"lang_list_nodata": "crwdns3594:0crwdne3594:0", "lang_list_nodata": "crwdns3594:0crwdne3594:0",

View File

@@ -72,6 +72,7 @@
"desc": "crwdns3992:0crwdne3992:0", "desc": "crwdns3992:0crwdne3992:0",
"customImport": "crwdns3996:0crwdne3996:0", "customImport": "crwdns3996:0crwdne3996:0",
"delete": "crwdns3998:0crwdne3998:0", "delete": "crwdns3998:0crwdne3998:0",
"preview": "crwdns4584:0crwdne4584:0",
"timeline": "crwdns4002:0crwdne4002:0", "timeline": "crwdns4002:0crwdne4002:0",
"timemode": "crwdns4004:0crwdne4004:0", "timemode": "crwdns4004:0crwdne4004:0",
"relativetime": "crwdns4006:0crwdne4006:0", "relativetime": "crwdns4006:0crwdne4006:0",
@@ -119,6 +120,7 @@
"remote_imgWarn": "crwdns4384:0crwdne4384:0", "remote_imgWarn": "crwdns4384:0crwdne4384:0",
"moreContextMode": "crwdns4572:0crwdne4572:0", "moreContextMode": "crwdns4572:0crwdne4572:0",
"moreContextModeWarn": "crwdns4574:0crwdne4574:0", "moreContextModeWarn": "crwdns4574:0crwdne4574:0",
"smallHeader": "crwdns4582:0crwdne4582:0",
"replySound": "crwdns4088:0crwdne4088:0", "replySound": "crwdns4088:0crwdne4088:0",
"favSound": "crwdns4090:0crwdne4090:0", "favSound": "crwdns4090:0crwdne4090:0",
"btSound": "crwdns4092:0crwdne4092:0", "btSound": "crwdns4092:0crwdne4092:0",

View File

@@ -1,183 +1,185 @@
{ {
"draghere":"Drag here to upload", "draghere": "Drag here to upload",
"nowOffline":"OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet", "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
"reOnline":"Now we are in the Internet, you should reload...", "reOnline": "Now we are in the Internet, you should reload...",
"close":"Close", "close": "Close",
"webSrc": "Search on Web", "webSrc": "Search on Web",
"tsSrc": "Search on tootsearch", "tsSrc": "Search on tootsearch",
"showSelectProf":"Show profile of the selecting account", "showSelectProf": "Show profile of the selecting account",
"closethisbox":"Close this box", "closethisbox": "Close this box",
"toot":"Toot", "toot": "Toot",
"post-new":"Post new", "post-new": "Post new",
"nsfwDes":"Mark media as sensitive", "nsfwDes": "Mark media as sensitive",
"cwDes":"Hide text behind warning", "cwDes": "Hide text behind warning",
"selfile":"Attach..", "selfile": "Attach..",
"insertEmoji":"Emojis", "insertEmoji": "Emojis",
"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.)",
"clearToot":"Clear toot box", "clearToot": "Clear toot box",
"replyMode":"Reply", "replyMode": "Reply",
"no":"No", "no": "No",
"yes":"Yes", "yes": "Yes",
"temp":"Attaching files", "temp": "Attaching files",
"nothing":"None", "nothing": "None",
"stamp": "Stamp", "stamp": "Stamp",
"stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image", "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
"vis":"Adjust status privacy", "vis": "Adjust status privacy",
"cwtext":"Warning text", "cwtext": "Warning text",
"selectVis":"Adjust status privacy", "selectVis": "Adjust status privacy",
"publicJP":"", "publicJP": "",
"unlistedJP":"", "unlistedJP": "",
"privateJP":"", "privateJP": "",
"localJP":"Local only", "localJP": "Local only",
"sectoot":"Secondary Toot", "sectoot": "Secondary Toot",
"directJP":"", "directJP": "",
"emojiWarn":"", "emojiWarn": "",
"emojiInsertWarn":"Some emojis are not able to be inserted.", "emojiInsertWarn": "Some emojis are not able to be inserted.",
"refreshEmoji":"Refresh emojis list", "refreshEmoji": "Refresh emojis list",
"closeThisBox":"Close this box", "closeThisBox": "Close this box",
"showThisEmoji":" are shown.", "showThisEmoji": " are shown.",
"customEmoji":"Custom emojis", "customEmoji": "Custom emojis",
"peopleEmoji":"Emojis of people", "peopleEmoji": "Emojis of people",
"natureEmoji":"Emojis of nature", "natureEmoji": "Emojis of nature",
"foodEmoji":"Emojis of foods", "foodEmoji": "Emojis of foods",
"activityEmoji":"Emojis of activities", "activityEmoji": "Emojis of activities",
"placeEmoji":"Emojis of places", "placeEmoji": "Emojis of places",
"thingsEmoji":"Emojis of tools", "thingsEmoji": "Emojis of tools",
"symbolEmoji":"Emojis of symbols", "symbolEmoji": "Emojis of symbols",
"flagsEmoji":"Emojis of flags", "flagsEmoji": "Emojis of flags",
"draft": "Draft", "draft": "Draft",
"poll":"Poll", "poll": "Poll",
"pollDdisabled":"Polls: Disabled", "pollDdisabled": "Polls: Disabled",
"pollProvider":"Provider of Poll", "pollProvider": "Provider of Poll",
"polluntil":"Hide 'votes' count until people vote it.", "polluntil": "Hide 'votes' count until people vote it.",
"choice":"Choice", "choice": "Choice",
"pollmulti":"Multiple select", "pollmulti": "Multiple select",
"expires_in":"Expires in...(sec)", "expires_in": "Expires in...(sec)",
"contextBefore":"Context before this toot", "contextBefore": "Context before this toot",
"thisToot":"This toot", "thisToot": "This toot",
"contextAfter":"Context after this toot", "contextAfter": "Context after this toot",
"beforeLTL":"Local TL before this toot", "beforeLTL": "Local TL before this toot",
"beforeUTL":"User TL before this toot", "beforeUTL": "User TL before this toot",
"afterLTL":"Local TL after this toot)", "afterLTL": "Local TL after this toot)",
"afterUTL":"User TL before this toot", "afterUTL": "User TL before this toot",
"afterFTL":"Federated TL after this toot", "afterFTL": "Federated TL after this toot",
"favedPeople":"People who favourited it", "favedPeople": "People who favourited it",
"btedPeople":"People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1":"Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2":":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility", "btWithVis": "Boost with visibility",
"reply":"Reply", "reply": "Reply",
"bt":"Boost", "bt": "Boost",
"favRegist":"Favourite", "favRegist": "Favourite",
"openBrowser":"Open in browser", "openBrowser": "Open in browser",
"screenshot":"Take a screenshot", "screenshot": "Take a screenshot",
"copyURL":"Copy the URL", "copyURL": "Copy the URL",
"embed":"Embed", "copy": "Copy",
"toots":"Toots", "embed": "Embed",
"follow":"Follow", "toots": "Toots",
"follower":"Follower", "follow": "Follow",
"utlColumn":"Show as a column", "follower": "Follower",
"timeline":"Timeline", "utlColumn": "Show as a column",
"operateOtherAcct":"Cross-account", "timeline": "Timeline",
"list":"List", "operateOtherAcct": "Cross-account",
"makeNew":"Save", "list": "List",
"blocks":"Blocks", "makeNew": "Save",
"mutes":"Mutes", "blocks": "Blocks",
"block":"Block", "mutes": "Mutes",
"mute":"Mute", "block": "Block",
"domainBlock":"Domain block", "mute": "Mute",
"editProf":"Edit profile", "domainBlock": "Domain block",
"change":"Save", "editProf": "Edit profile",
"followReq":"Follow requests", "change": "Save",
"likeHimOrHer":"Resembling", "followReq": "Follow requests",
"endorse":"Feature on profile", "likeHimOrHer": "Resembling",
"openinbrowser":"Open in browser", "endorse": "Feature on profile",
"mainacct":"Set it an main account", "openinbrowser": "Open in browser",
"frc":"Suggest", "mainacct": "Set it an main account",
"more":"More", "frc": "Suggest",
"revoverJP":" to ", "more": "More",
"warnUseOtherAcct":"(Unable to unfollow)", "revoverJP": " to ",
"revoverJPde":"", "warnUseOtherAcct": "(Unable to unfollow)",
"or":"or", "revoverJPde": "",
"openProf":"Show profile", "or": "or",
"warnListRegist":"Follow to add this user to lists.", "openProf": "Show profile",
"blockDomain":"Add blocking domain", "warnListRegist": "Follow to add this user to lists.",
"name":"Display name", "blockDomain": "Add blocking domain",
"note":"Note", "name": "Display name",
"editProfImg":"Change avataor", "note": "Note",
"editHeader":"Change header image", "editProfImg": "Change avataor",
"blocked":"You are blocked. Why?", "editHeader": "Change header image",
"likeUserDes":"Get people resembling this user.", "blocked": "You are blocked. Why?",
"get":"Get", "likeUserDes": "Get people resembling this user.",
"historyBack":"Back", "get": "Get",
"empUser":"Emphasize this user", "historyBack": "Back",
"supportme":"Support TheDesk!", "empUser": "Emphasize this user",
"TheDeskDes":"TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!", "supportme": "Support TheDesk!",
"PatreonSupport":"Support on Patreon", "TheDeskDes": "TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!",
"PixivSupport":"Support on Pixiv FANBOX", "PatreonSupport": "Support on Patreon",
"AWLSupport":"Amazon Wish List", "PixivSupport": "Support on Pixiv FANBOX",
"SendAmazonGift1":"Give me Amazon Gift Card:", "AWLSupport": "Amazon Wish List",
"SendAmazonGift2":"", "SendAmazonGift1": "Give me Amazon Gift Card:",
"monthly":"Monthly", "SendAmazonGift2": "",
"once":"Once", "monthly": "Monthly",
"local":"Local", "once": "Once",
"localMedia":"Local(Media)", "local": "Local",
"home":"Home", "localMedia": "Local(Media)",
"fed":"Federated", "home": "Home",
"fedMedia":"Federated(Media)", "fed": "Federated",
"dm":"Direct Message", "fedMedia": "Federated(Media)",
"integratedTLDes":"Integrated(Local/Home)", "dm": "Direct Message",
"localPlusDes":"LTL+Reply+BT", "integratedTLDes": "Integrated(Local/Home)",
"notf":"Notifications", "localPlusDes": "LTL+Reply+BT",
"notf": "Notifications",
"bookmark": "Bookmarks", "bookmark": "Bookmarks",
"showThisTL":"Show this TL:", "showThisTL": "Show this TL:",
"webviewWarn":"TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).", "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
"add":"Add", "add": "Add",
"search":"Search", "search": "Search",
"sortSet":"Sort", "sortSet": "Sort",
"selectAcct":"Account(Scroll to show all)", "selectAcct": "Account(Scroll to show all)",
"listLocale":"List", "listLocale": "List",
"filterWord":"Filtering words", "filterWord": "Filtering words",
"degree":"Filter contexts", "degree": "Filter contexts",
"conver":"Conversations", "conver": "Conversations",
"prof":"Profiles", "prof": "Profiles",
"option":"Options", "option": "Options",
"matchWord":"Whole word", "matchWord": "Whole word",
"warnMatchWord":"Nice for Latin language", "warnMatchWord": "Nice for Latin language",
"except":"Drop instead of hide", "except": "Drop instead of hide",
"exceptWorn":"Filtered toots will disappear irreversibly, even if filter is later removed", "exceptWorn": "Filtered toots will disappear irreversibly, even if filter is later removed",
"avalableBefore":"Expire after", "avalableBefore": "Expire after",
"warnAvBefore":"Unset or \"0\" means \"Never\"", "warnAvBefore": "Unset or \"0\" means \"Never\"",
"warnAvBefore2":"This value may contain some error", "warnAvBefore2": "This value may contain some error",
"unlimited":"Never", "unlimited": "Never",
"days":"day(s)", "days": "day(s)",
"hours":"hour(s)", "hours": "hour(s)",
"mins":"minute(s)", "mins": "minute(s)",
"secs":"second(s)", "secs": "second(s)",
"warnOnIntegratedTL":"Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.", "warnOnIntegratedTL": "Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
"helloTheDesk":"Internal error: please clear all data(at setting page) <b>All data will be deleted.</b>", "helloTheDesk": "Internal error: please clear all data(at setting page) <b>All data will be deleted.</b>",
"addColumn":"Add a column", "addColumn": "Add a column",
"sortColumns":"Sort", "sortColumns": "Sort",
"acctMan":"Account Manager", "acctMan": "Account Manager",
"filter":"Filter", "filter": "Filter",
"setting":"Preferences", "setting": "Preferences",
"reverse":"Toot button layout reverse", "reverse": "Toot button layout reverse",
"f5":"Reload TL", "f5": "Reload TL",
"nanoDes":"The smallest Mastodon,", "nanoDes": "The smallest Mastodon,",
"verTips":"Version", "verTips": "Version",
"clockTips":"Clock", "clockTips": "Clock",
"ramTips":"RAM status", "ramTips": "RAM status",
"changeTips":"Change Tips", "changeTips": "Change Tips",
"helpAndLogs":"Help & Log", "helpAndLogs": "Help & Log",
"help":"Help", "help": "Help",
"contactwithlog":"If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.", "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
"about":"About TheDesk", "about": "About TheDesk",
"hereAddColumns":"<- Add TL", "hereAddColumns": "<- Add TL",
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Abrir en navegador web", "openBrowser": "Abrir en navegador web",
"screenshot": "Tomar captura de pantalla", "screenshot": "Tomar captura de pantalla",
"copyURL": "Copiar dirección web de este toot", "copyURL": "Copiar dirección web de este toot",
"copy": "Copiar",
"embed": "Insertar", "embed": "Insertar",
"toots": "Toots", "toots": "Toots",
"follow": "Seguir", "follow": "Seguir",
@@ -178,6 +179,7 @@
"foundBug": "Encontré un error", "foundBug": "Encontré un error",
"show": "Mostrar", "show": "Mostrar",
"directory": "Directorio", "directory": "Directorio",
"discover": "Discover",
"active": "Recientemente activo", "active": "Recientemente activo",
"newcomer": "Recién llegados", "newcomer": "Recién llegados",
"local_only": "Sólo local", "local_only": "Sólo local",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "El código HTML de inserción se copió al portapapeles.", "lang_details_embed": "El código HTML de inserción se copió al portapapeles.",
"lang_details_url": "La dirección web de este toot se copió al portapapeles.", "lang_details_url": "La dirección web de este toot se copió al portapapeles.",
"lang_details_txt": "El contenido de este toot se copió al portapapeles.", "lang_details_txt": "El contenido de este toot se copió al portapapeles.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Sin datos", "lang_filter_nodata": "Sin datos",
"lang_filter_errordegree": "Por favor, comprobá un contexto", "lang_filter_errordegree": "Por favor, comprobá un contexto",
"lang_list_nodata": "Sin datos", "lang_list_nodata": "Sin datos",

View File

@@ -9,7 +9,7 @@
"default": "Predeterminado", "default": "Predeterminado",
"change": "Cambiar", "change": "Cambiar",
"select": "Seleccionar", "select": "Seleccionar",
"exec": "Exec", "exec": "Ejec",
"env": "Configuración del sistema", "env": "Configuración del sistema",
"setlang": "Idiomas", "setlang": "Idiomas",
"backup": "Importación y exportación de la configuración", "backup": "Importación y exportación de la configuración",
@@ -18,8 +18,8 @@
"export": "Exportar", "export": "Exportar",
"hardwareAcceleration": "Deshabilitar la aceleración por hardware", "hardwareAcceleration": "Deshabilitar la aceleración por hardware",
"hardwareAccelerationWarn": "Inicio automático", "hardwareAccelerationWarn": "Inicio automático",
"webview": "Webview Integration", "webview": "Integración de Webview",
"webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.", "webviewWarn": "Para usar Integración de TweetDeck, por favor activalo. Tené en cuenta que puede reducir el nivel de seguridad.",
"theme": "Temas", "theme": "Temas",
"popup": "Ventana emergente de notificaciones (en Windows)", "popup": "Ventana emergente de notificaciones (en Windows)",
"popupwarn": "Establecer \"0\" para ocultar", "popupwarn": "Establecer \"0\" para ocultar",
@@ -72,6 +72,7 @@
"desc": "Acerca de este tema", "desc": "Acerca de este tema",
"customImport": "Importación de temas personalizados", "customImport": "Importación de temas personalizados",
"delete": "Eliminar", "delete": "Eliminar",
"preview": "Previsualización",
"timeline": "Configuración de la línea temporal", "timeline": "Configuración de la línea temporal",
"timemode": "Formato del tiempo", "timemode": "Formato del tiempo",
"relativetime": "Formato relativo: \"hace 1 minuto\", \"hace 3 días\"", "relativetime": "Formato relativo: \"hace 1 minuto\", \"hace 3 días\"",
@@ -117,8 +118,9 @@
"markerswarn": "Mastodon 3.0~. Compartido en interface web y clientes de terceros soportados.", "markerswarn": "Mastodon 3.0~. Compartido en interface web y clientes de terceros soportados.",
"remote_img": "Obtener imágenes del servidor remoto", "remote_img": "Obtener imágenes del servidor remoto",
"remote_imgWarn": "Todas las previsualizaciones se obtienen de tu servidor de caché conectado.", "remote_imgWarn": "Todas las previsualizaciones se obtienen de tu servidor de caché conectado.",
"moreContextMode": "Context Tool", "moreContextMode": "Herramienta de contexto",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "En detalle de la modal de toot, mostrar toots antes / después del toot en LTL, FTL, UTL",
"smallHeader": "Minimizar cabeceras de columna",
"replySound": "Sonido (respuesta)", "replySound": "Sonido (respuesta)",
"favSound": "Sonido (marcado como favorito)", "favSound": "Sonido (marcado como favorito)",
"btSound": "Sonido (retoot)", "btSound": "Sonido (retoot)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Sin datos", "lang_filter_nodata": "Sin datos",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "Sin datos", "lang_list_nodata": "Sin datos",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Ouvrir dans un navigateur", "openBrowser": "Ouvrir dans un navigateur",
"screenshot": "Prendre une capture d'écran", "screenshot": "Prendre une capture d'écran",
"copyURL": "Copier l'URL", "copyURL": "Copier l'URL",
"copy": "Copy",
"embed": "Embarquer", "embed": "Embarquer",
"toots": "Pouets", "toots": "Pouets",
"follow": "Suivre", "follow": "Suivre",
@@ -178,6 +179,7 @@
"foundBug": "J'ai trouvé un bug", "foundBug": "J'ai trouvé un bug",
"show": "Afficher", "show": "Afficher",
"directory": "Répertoire", "directory": "Répertoire",
"discover": "Discover",
"active": "Actif récemment", "active": "Actif récemment",
"newcomer": "Nouveautés", "newcomer": "Nouveautés",
"local_only": "Local uniquement", "local_only": "Local uniquement",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Le code HTML intégré est tronqué.", "lang_details_embed": "Le code HTML intégré est tronqué.",
"lang_details_url": "L'URL de ce pouet est tronqué.", "lang_details_url": "L'URL de ce pouet est tronqué.",
"lang_details_txt": "Le contenu de ce pouet est tronqué.", "lang_details_txt": "Le contenu de ce pouet est tronqué.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Aucune donnée", "lang_filter_nodata": "Aucune donnée",
"lang_filter_errordegree": "Veuillez vérifier le contexte", "lang_filter_errordegree": "Veuillez vérifier le contexte",
"lang_list_nodata": "Aucune donnée", "lang_list_nodata": "Aucune donnée",

View File

@@ -72,6 +72,7 @@
"desc": "À propos de ce thème", "desc": "À propos de ce thème",
"customImport": "Importer des thèmes personnalisés", "customImport": "Importer des thèmes personnalisés",
"delete": "Supprimer", "delete": "Supprimer",
"preview": "Preview",
"timeline": "Préférence de la TimeLine", "timeline": "Préférence de la TimeLine",
"timemode": "Format de lheure", "timemode": "Format de lheure",
"relativetime": "Format relatif:\"Il y a 1 minutes\",\"3 jours\"", "relativetime": "Format relatif:\"Il y a 1 minutes\",\"3 jours\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "Toutes les prévisualisations sont obtenues depuis le serveur où vous êtes connecté.", "remote_imgWarn": "Toutes les prévisualisations sont obtenues depuis le serveur où vous êtes connecté.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Son (Réponse)", "replySound": "Son (Réponse)",
"favSound": "Son (Fav)", "favSound": "Son (Fav)",
"btSound": "Son (Boost)", "btSound": "Son (Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

View File

@@ -103,6 +103,7 @@
"lang_details_embed": "Embed HTML is cliped.", "lang_details_embed": "Embed HTML is cliped.",
"lang_details_url": "URL of this toot is cliped.", "lang_details_url": "URL of this toot is cliped.",
"lang_details_txt": "Content of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "No data", "lang_filter_nodata": "No data",
"lang_filter_errordegree": "Please check a context", "lang_filter_errordegree": "Please check a context",
"lang_list_nodata": "No data", "lang_list_nodata": "No data",

View File

@@ -72,6 +72,7 @@
"desc": "About this theme", "desc": "About this theme",
"customImport": "Import of custom themes", "customImport": "Import of custom themes",
"delete": "Delete", "delete": "Delete",
"preview": "Preview",
"timeline": "Timeline Preferences", "timeline": "Timeline Preferences",
"timemode": "Time format", "timemode": "Time format",
"relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"", "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "All previews are got from your loginned cache server.", "remote_imgWarn": "All previews are got from your loginned cache server.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@@ -47,7 +47,7 @@
"thingsEmoji": "Emoji di strumenti", "thingsEmoji": "Emoji di strumenti",
"symbolEmoji": "Emoji di simboli", "symbolEmoji": "Emoji di simboli",
"flagsEmoji": "Emoji delle bandiere", "flagsEmoji": "Emoji delle bandiere",
"draft": "Draft", "draft": "Bozza",
"poll": "Sondaggio", "poll": "Sondaggio",
"pollDdisabled": "Sondaggi: Disabilitato", "pollDdisabled": "Sondaggi: Disabilitato",
"pollProvider": "Fornitore del sondaggio", "pollProvider": "Fornitore del sondaggio",
@@ -74,6 +74,7 @@
"openBrowser": "Apri nel browser", "openBrowser": "Apri nel browser",
"screenshot": "Cattura una schermata", "screenshot": "Cattura una schermata",
"copyURL": "Copia l'URL", "copyURL": "Copia l'URL",
"copy": "Copia",
"embed": "Incorpora", "embed": "Incorpora",
"toots": "Toots", "toots": "Toots",
"follow": "Segui", "follow": "Segui",
@@ -178,6 +179,7 @@
"foundBug": "Ho trovato un bug", "foundBug": "Ho trovato un bug",
"show": "Mostra", "show": "Mostra",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recentemente attivo", "active": "Recentemente attivo",
"newcomer": "Nuovi arrivi", "newcomer": "Nuovi arrivi",
"local_only": "Solo locale", "local_only": "Solo locale",

View File

@@ -49,7 +49,7 @@
"lang_manager_godev": "Apri DevCenter di Misskey. Mostriamo anche un documento ufficiale da riferire.", "lang_manager_godev": "Apri DevCenter di Misskey. Mostriamo anche un documento ufficiale da riferire.",
"lang_manager_logout": "Esci", "lang_manager_logout": "Esci",
"lang_manager_maxChars": "Max caratteri dei toot", "lang_manager_maxChars": "Max caratteri dei toot",
"lang_manager_refreshAt": "Login with this domain", "lang_manager_refreshAt": "Accedi con questo dominio",
"lang_bbmd_misskey": "TheDesk considera \"@\" come risposta, ma mettere altri parametri. Non elencato su Mastodon significa Home su Misskey.", "lang_bbmd_misskey": "TheDesk considera \"@\" come risposta, ma mettere altri parametri. Non elencato su Mastodon significa Home su Misskey.",
"lang_emoji_get": "Ottieni emoji", "lang_emoji_get": "Ottieni emoji",
"lang_emoji_custom": "Emoji personalizzate", "lang_emoji_custom": "Emoji personalizzate",
@@ -89,7 +89,7 @@
"lang_status_endorse": "Caratteristica sul profilo", "lang_status_endorse": "Caratteristica sul profilo",
"lang_status_followers": "Follower", "lang_status_followers": "Follower",
"lang_status_active": "Ultimo stato", "lang_status_active": "Ultimo stato",
"lang_secure_draft": "Add to draft", "lang_secure_draft": "Aggiungi alla bozza",
"lang_secure_useThis": "Usa questo", "lang_secure_useThis": "Usa questo",
"lang_secure_deleteThis": "Elimina questo", "lang_secure_deleteThis": "Elimina questo",
"lang_suggest_nodata": "Si prega di ottenere l'elenco delle emoji per mostrare il suggerimento.", "lang_suggest_nodata": "Si prega di ottenere l'elenco delle emoji per mostrare il suggerimento.",
@@ -103,6 +103,7 @@
"lang_details_embed": "HTML incorporato è sotto la lente.", "lang_details_embed": "HTML incorporato è sotto la lente.",
"lang_details_url": "L'URL di questo toot è sotto la lente.", "lang_details_url": "L'URL di questo toot è sotto la lente.",
"lang_details_txt": "Il contenuto di questo toot è ritagliato.", "lang_details_txt": "Il contenuto di questo toot è ritagliato.",
"lang_details_fetch": "Fetcging toot data...",
"lang_filter_nodata": "Nessun dato", "lang_filter_nodata": "Nessun dato",
"lang_filter_errordegree": "Si prega di controllare un contesto", "lang_filter_errordegree": "Si prega di controllare un contesto",
"lang_list_nodata": "Nessun dato", "lang_list_nodata": "Nessun dato",
@@ -154,7 +155,7 @@
"lang_layout_unread": "Non Letta", "lang_layout_unread": "Non Letta",
"lang_layout_tagManager": "Gestore timeline tag", "lang_layout_tagManager": "Gestore timeline tag",
"lang_layout_announ": "Annuncio: il contatore è il numero dei tuoi annunci non letti. Se non mostrato, significa che gli annunci sono tutti contrassegnati come letti.", "lang_layout_announ": "Annuncio: il contatore è il numero dei tuoi annunci non letti. Se non mostrato, significa che gli annunci sono tutti contrassegnati come letti.",
"lang_layout_resetWidth": "Stretch this column", "lang_layout_resetWidth": "Allunga questa colonna",
"lang_sort_gothis": "Vai a questa colonna", "lang_sort_gothis": "Vai a questa colonna",
"lang_sort_remthis": "Elimina questa colonna", "lang_sort_remthis": "Elimina questa colonna",
"lang_spotify_img": "Allega una copertina album", "lang_spotify_img": "Allega una copertina album",

View File

@@ -72,6 +72,7 @@
"desc": "Informazioni su questo tema", "desc": "Informazioni su questo tema",
"customImport": "Importa temi personalizzati", "customImport": "Importa temi personalizzati",
"delete": "Elimina", "delete": "Elimina",
"preview": "Preview",
"timeline": "Preferenze Della Timeline", "timeline": "Preferenze Della Timeline",
"timemode": "Formato orario", "timemode": "Formato orario",
"relativetime": "Formato relativo:\"1 minuti fa\",\"3 giorni fa\"", "relativetime": "Formato relativo:\"1 minuti fa\",\"3 giorni fa\"",
@@ -119,6 +120,7 @@
"remote_imgWarn": "Tutte le anteprime sono ottenute dal server cache loginato.", "remote_imgWarn": "Tutte le anteprime sono ottenute dal server cache loginato.",
"moreContextMode": "Context Tool", "moreContextMode": "Context Tool",
"moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL", "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
"smallHeader": "Minimize column headers",
"replySound": "Suono(Rispondi)", "replySound": "Suono(Rispondi)",
"favSound": "Suono (Fav)", "favSound": "Suono (Fav)",
"btSound": "Suono (Boost)", "btSound": "Suono (Boost)",

View File

@@ -1,181 +1,183 @@
{ {
"draghere":"ドラッグしてみ?(ドラッグしたらすぐアップロードされるで)", "draghere": "ドラッグしてみ?(ドラッグしたらすぐアップロードされるで)",
"nowOffline":"オフラインやで。投稿は全部下書きに行くし、もしオンラインなったら再読み込みしたらええで。", "nowOffline": "オフラインやで。投稿は全部下書きに行くし、もしオンラインなったら再読み込みしたらええで。",
"reOnline":"オンライン戻ったから再読み込みしてな。", "reOnline": "オンライン戻ったから再読み込みしてな。",
"close":"Close", "close": "Close",
"webSrc": "Webでさがす", "webSrc": "Webでさがす",
"tsSrc": "tootsearchでさがす", "tsSrc": "tootsearchでさがす",
"showSelectProf":"このアカウントのプロフィール出す", "showSelectProf": "このアカウントのプロフィール出す",
"closethisbox":"このボックスなおす", "closethisbox": "このボックスなおす",
"post-new":"投稿", "post-new": "投稿",
"toot":"トゥート", "toot": "トゥート",
"nsfwDes":"画像を見たらあかんやつにする", "nsfwDes": "画像を見たらあかんやつにする",
"cwDes":"コンテンツワーニング(ほんまに見るんか?って聞く)", "cwDes": "コンテンツワーニング(ほんまに見るんか?って聞く)",
"selfile":"ファイル選ぶ", "selfile": "ファイル選ぶ",
"insertEmoji":"絵文字入れる", "insertEmoji": "絵文字入れる",
"schedule":"時間指定投稿", "schedule": "時間指定投稿",
"postat":"時間指定投稿", "postat": "時間指定投稿",
"scheduleWarn":"2.7.0~ 5分は待ってな。サーバーの時計おうてるかは知らんで。", "scheduleWarn": "2.7.0~ 5分は待ってな。サーバーの時計おうてるかは知らんで。",
"clearToot":"トゥートボックスのクリア", "clearToot": "トゥートボックスのクリア",
"replyMode":"返信モード", "replyMode": "返信モード",
"no":"いいえ", "no": "いいえ",
"yes":"はい", "yes": "はい",
"temp":"添付ファイル", "temp": "添付ファイル",
"nothing":"なし", "nothing": "なし",
"vis":"公開範囲", "vis": "公開範囲",
"cwtext":"警告文", "cwtext": "警告文",
"selectVis":"公開範囲指定", "selectVis": "公開範囲指定",
"publicJP":"公開", "publicJP": "公開",
"unlistedJP":"未収載", "unlistedJP": "未収載",
"privateJP":"非公開", "privateJP": "非公開",
"localJP":"ローカル限定", "localJP": "ローカル限定",
"directJP":"ダイレクト", "directJP": "ダイレクト",
"sectoot":"こっちでもトゥート", "sectoot": "こっちでもトゥート",
"emojiWarn":"サーバーちゃうかったら絵文字もちゃうで。", "emojiWarn": "サーバーちゃうかったら絵文字もちゃうで。",
"emojiInsertWarn":"入力できん絵文字もあるけどしゃーない。", "emojiInsertWarn": "入力できん絵文字もあるけどしゃーない。",
"refreshEmoji":"絵文字更新", "refreshEmoji": "絵文字更新",
"closeThisBox":"ボックスなおす", "closeThisBox": "ボックスなおす",
"showThisEmoji":"一覧を表示中", "showThisEmoji": "一覧を表示中",
"customEmoji":"カスタム絵文字", "customEmoji": "カスタム絵文字",
"peopleEmoji":"ひと", "peopleEmoji": "ひと",
"natureEmoji":"自然", "natureEmoji": "自然",
"foodEmoji":"食べ物", "foodEmoji": "食べ物",
"activityEmoji":"活動", "activityEmoji": "活動",
"placeEmoji":"場所", "placeEmoji": "場所",
"thingsEmoji":"もの", "thingsEmoji": "もの",
"symbolEmoji":"記号", "symbolEmoji": "記号",
"flagsEmoji":"国旗", "flagsEmoji": "国旗",
"draft": "下書き(タンス)", "draft": "下書き(タンス)",
"poll":"アンケート", "poll": "アンケート",
"pollDdisabled":"アンケート付けへん", "pollDdisabled": "アンケート付けへん",
"pollProvider":"アンケートのプロバイダ", "pollProvider": "アンケートのプロバイダ",
"choice":"選択肢", "choice": "選択肢",
"polluntil":"あんたが投票するまで票数教えへん", "polluntil": "あんたが投票するまで票数教えへん",
"pollmulti":"複数選択を許可", "pollmulti": "複数選択を許可",
"expires_in":"有効期限(秒)", "expires_in": "有効期限(秒)",
"contextBefore":"これより前の会話", "contextBefore": "これより前の会話",
"thisToot":"対象のトゥート", "thisToot": "対象のトゥート",
"contextAfter":"これより後の会話", "contextAfter": "これより後の会話",
"beforeLTL":"これより前のLocal TL(誰にエアリプしてん)", "beforeLTL": "これより前のLocal TL(誰にエアリプしてん)",
"beforeUTL":"これより前のユーザーTL(誰のトゥート言及してんねん)", "beforeUTL": "これより前のユーザーTL(誰のトゥート言及してんねん)",
"afterLTL":"これより後のLocal TL(誰のトゥート言及してんねん)", "afterLTL": "これより後のLocal TL(誰のトゥート言及してんねん)",
"afterUTL":"これより後のユーザーTL(誰のトゥート言及してんねん)", "afterUTL": "これより後のユーザーTL(誰のトゥート言及してんねん)",
"afterFTL":"これより後の連合TL(誰のトゥート言及してんねん)", "afterFTL": "これより後の連合TL(誰のトゥート言及してんねん)",
"favedPeople":"誰がお気に入りに登録してるんや", "favedPeople": "誰がお気に入りに登録してるんや",
"btedPeople":"誰がお気に入りブーストしたんや", "btedPeople": "誰がお気に入りブーストしたんや",
"useOtherAcct1":"他のアカウント使う", "useOtherAcct1": "他のアカウント使う",
"useOtherAcct2":"の解除はできひん", "useOtherAcct2": "の解除はできひん",
"btWithVis": "公開範囲も決めてからブースト", "btWithVis": "公開範囲も決めてからブースト",
"reply":"返信", "reply": "返信",
"bt":"ブースト", "bt": "ブースト",
"favRegist":"お気に入り", "favRegist": "お気に入り",
"openBrowser":"ブラウザで開く", "openBrowser": "ブラウザで開く",
"screenshot":"スクリーンショット", "screenshot": "スクリーンショット",
"copyURL":"URLをコピー", "copyURL": "URLをコピー",
"embed":"埋め込む", "copy": "コピー",
"toots":"トゥート", "embed": "埋め込む",
"follow":"フォロー", "toots": "トゥート",
"follower":"フォロー", "follow": "フォロー",
"utlColumn":"カラムとして追加", "follower": "フォロワー",
"timeline":"タイムライン", "utlColumn": "カラムとして追加",
"operateOtherAcct":"他のアカウント使うて何かする", "timeline": "タイムライン",
"list":"リスト", "operateOtherAcct": "他のアカウント使うて何かする",
"makeNew":"新しいやつ", "list": "リスト",
"blocks":"ブロック", "makeNew": "新しいやつ",
"mutes":"ミュート", "blocks": "ブロック",
"block":"ブロック", "mutes": "ミュート",
"mute":"ミュート", "block": "ブロック",
"domainBlock":"ドメインブロック", "mute": "ミュート",
"editProf":"プロフィールいらう", "domainBlock": "ドメインブロック",
"change":"変更", "editProf": "プロフィールいらう",
"followReq":"フォローリクエスト", "change": "変更",
"likeHimOrHer":"似とうユーザー", "followReq": "フォローリクエスト",
"frc":"あんたにおすすめ", "likeHimOrHer": "似とうユーザー",
"more":"他無いんか?", "frc": "あんたにおすすめ",
"endorse":"紹介したる", "more": "他無いんか?",
"openinbrowser":"ブラウザで開く", "endorse": "紹介したる",
"mainacct":"メインアカウントに設定", "openinbrowser": "ブラウザで開く",
"revoverJP":"する", "mainacct": "メインアカウントに設定",
"warnUseOtherAcct":"(解除はでけへん。)", "revoverJP": "する",
"revoverJPde":"", "warnUseOtherAcct": "(解除はでけへん。)",
"or":"それか", "revoverJPde": "",
"openProf":"プロフィール出す", "or": "それか",
"warnListRegist":"リストに入れたかったらまずフォローせなあかん。", "openProf": "プロフィール出す",
"blockDomain":"ブロックするドメイン", "warnListRegist": "リストに入れたかったらまずフォローせなあかん。",
"name":"名前", "blockDomain": "ブロックするドメイン",
"note":"自己紹介", "name": "名前",
"editProfImg":"アバター変える", "note": "自己紹介",
"editHeader":"ヘッダー変える", "editProfImg": "アバター変える",
"blocked":"なんでか知らんけどブロックされとるわ", "editHeader": "ヘッダー変える",
"likeUserDes":"あんたと似とうユーザーを発掘すんで。", "blocked": "なんでか知らんけどブロックされとるわ",
"get":"取得", "likeUserDes": "あんたと似とうユーザーを発掘すんで。",
"historyBack":"一つ前のユーザーデータ", "get": "取得",
"empUser":"ユーザー強調", "historyBack": "一つ前のユーザーデータ",
"supportme":"支援してくれんか?", "empUser": "ユーザー強調",
"TheDeskDes":"TheDeskは営利目的ちゃうし、有料機能や広告は一切あらへん。<br>せやけど君らが支援してくれとうからTheDeskは続いてるんや。ほんまありがとうな。", "supportme": "支援してくれんか?",
"PatreonSupport":"Patreonで支援", "TheDeskDes": "TheDeskは営利目的ちゃうし、有料機能や広告は一切あらへん。<br>せやけど君らが支援してくれとうからTheDeskは続いてるんや。ほんまありがとうな。",
"PixivSupport":"Pixiv FANBOXで支援", "PatreonSupport": "Patreonで支援",
"AWLSupport":"Amazonほしいものリスト", "PixivSupport": "Pixiv FANBOXで支援",
"SendAmazonGift1":"", "AWLSupport": "Amazonほしいものリスト",
"SendAmazonGift2":"にAmazonギフトカードを送る", "SendAmazonGift1": "",
"monthly":"月額支援(大歓迎)", "SendAmazonGift2": "にAmazonギフトカードを送る",
"once":"一度限りの支援(めっちゃ歓迎)", "monthly": "月額支援(大歓迎)",
"local":"ローカル", "once": "一度限りの支援(めっちゃ歓迎)",
"localMedia":"ローカル(メディア)", "local": "ローカル",
"home":"ホーム", "localMedia": "ローカル(メディア)",
"fed":"連合", "home": "ホーム",
"fedMedia":"連合(メディア)", "fed": "連合",
"dm":"ダイレクトメッセージ", "fedMedia": "連合(メディア)",
"integratedTLDes":"統合(ローカルとホーム)", "dm": "ダイレクトメッセージ",
"localPlusDes":"統合(LTL+BT+返信)", "integratedTLDes": "統合(ローカルとホーム)",
"notf":"通知", "localPlusDes": "統合(LTL+BT+返信)",
"notf": "通知",
"bookmark": "ブックマーク", "bookmark": "ブックマーク",
"showThisTL":"表示するタイムライン", "showThisTL": "表示するタイムライン",
"webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。", "webviewWarn": "TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。",
"add":"追加", "add": "追加",
"search":"検索", "search": "検索",
"sortSet":"並べ替え設定", "sortSet": "並べ替え設定",
"selectAcct":"選択(スクロールして全選択肢表示)", "selectAcct": "選択(スクロールして全選択肢表示)",
"filterWord":"フィルターワード", "filterWord": "フィルターワード",
"listLocale":"一覧", "listLocale": "一覧",
"degree":"適応範囲", "degree": "適応範囲",
"conver":"会話", "conver": "会話",
"prof":"プロフィール", "prof": "プロフィール",
"option":"オプション", "option": "オプション",
"matchWord":"単語マッチ", "matchWord": "単語マッチ",
"warnMatchWord":"非ラテン系の文字列では「単語マッチ」はせん方がええで。(これはフリかも知れん)", "warnMatchWord": "非ラテン系の文字列では「単語マッチ」はせん方がええで。(これはフリかも知れん)",
"except":"除外", "except": "除外",
"exceptWorn":"「除外」にしてもうたらマッチしたトゥートはフィルター解除しても二度と表示されへん。", "exceptWorn": "「除外」にしてもうたらマッチしたトゥートはフィルター解除しても二度と表示されへん。",
"avalableBefore":"有効期限(あと)", "avalableBefore": "有効期限(あと)",
"warnAvBefore":"未指定(または0分)で「無期限」や", "warnAvBefore": "未指定(または0分)で「無期限」や",
"warnAvBefore2":"この数字はそんなに正確ちゃうで", "warnAvBefore2": "この数字はそんなに正確ちゃうで",
"unlimited":"無期限", "unlimited": "無期限",
"days":"日", "days": "日",
"hours":"時間", "hours": "時間",
"mins":"分", "mins": "分",
"secs":"秒", "secs": "秒",
"warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードをどっちも合わせて処理するで", "warnOnIntegratedTL": "Integrated TL/Plus TLは、公開/ホームのフィルターワードをどっちも合わせて処理するで",
"helloTheDesk":"やってもうた…再読込して治らんかったら初期化(全データ削除)してな…(予め設定をエクスポートしとくんやで)", "helloTheDesk": "やってもうた…再読込して治らんかったら初期化(全データ削除)してな…(予め設定をエクスポートしとくんやで)",
"addColumn":"カラム追加", "addColumn": "カラム追加",
"sortColumns":"カラム一覧/並べ替え", "sortColumns": "カラム一覧/並べ替え",
"acctMan":"アカウントマネージャー", "acctMan": "アカウントマネージャー",
"filter":"フィルター", "filter": "フィルター",
"setting":"設定", "setting": "設定",
"reverse":"トゥートボタンの左右入れ替え", "reverse": "トゥートボタンの左右入れ替え",
"f5":"TL再読込", "f5": "TL再読込",
"nanoDes":"めっちゃ小さいマストドン。", "nanoDes": "めっちゃ小さいマストドン。",
"verTips":"バージョン", "verTips": "バージョン",
"clockTips":"時計", "clockTips": "時計",
"ramTips":"システムメモリ容量", "ramTips": "システムメモリ容量",
"changeTips":"Tips変更", "changeTips": "Tips変更",
"helpAndLogs":"ヘルプとログ", "helpAndLogs": "ヘルプとログ",
"help":"ヘルプ", "help": "ヘルプ",
"contactwithlog":"なんか知らんけど動かんとかそういうのを開発者のお兄さんお姉さんに言うときは下のログのそこらへんの時間に起きたなぁってのを拾って連絡するとなんかの助けになるかも知れん。ついでやけどこのウィンドウ全体を横に引き伸ばしたらいい感じに見れるで", "contactwithlog": "なんか知らんけど動かんとかそういうのを開発者のお兄さんお姉さんに言うときは下のログのそこらへんの時間に起きたなぁってのを拾って連絡するとなんかの助けになるかも知れん。ついでやけどこのウィンドウ全体を横に引き伸ばしたらいい感じに見れるで",
"about":"このソフトについて", "about": "このソフトについて",
"hereAddColumns":"←ここからTL追加", "hereAddColumns": "←ここからTL追加",
"foundBug": "バグあるんやけど", "foundBug": "バグあるんやけど",
"show": "表示", "show": "表示",
"directory": "ディレクトリ", "directory": "ディレクトリ",
"discover": "見つける",
"active": "最新活動順", "active": "最新活動順",
"newcomer": "新規順", "newcomer": "新規順",
"local_only": "ローカルだけ", "local_only": "ローカルだけ",

View File

@@ -102,6 +102,7 @@
"lang_details_embed": "埋め込みHTMLがコピーされたで。", "lang_details_embed": "埋め込みHTMLがコピーされたで。",
"lang_details_url": "トゥートURLがコピーされたで。", "lang_details_url": "トゥートURLがコピーされたで。",
"lang_details_txt": "トゥート本文がコピーされたで。", "lang_details_txt": "トゥート本文がコピーされたで。",
"lang_details_fetch": "トゥートの情報を引っ張って来とるで…",
"lang_filter_nodata": "フィルターは無いで", "lang_filter_nodata": "フィルターは無いで",
"lang_filter_errordegree": "適応範囲は一つ以上チェックせなあかんで。", "lang_filter_errordegree": "適応範囲は一つ以上チェックせなあかんで。",
"lang_list_nodata": "リストは無いで", "lang_list_nodata": "リストは無いで",

View File

@@ -1,183 +1,185 @@
{ {
"draghere":"ここにドラッグして添付(ドラッグと同時にアップロードされます)", "draghere": "ここにドラッグして添付(ドラッグと同時にアップロードされます)",
"nowOffline":"オフラインです。投稿はすべて下書きに追加されます。オンライン復帰時には再読み込みを推奨します。", "nowOffline": "オフラインです。投稿はすべて下書きに追加されます。オンライン復帰時には再読み込みを推奨します。",
"reOnline": "オンラインに復帰しました。再読み込みを推奨します。", "reOnline": "オンラインに復帰しました。再読み込みを推奨します。",
"webSrc": "Webで検索", "webSrc": "Webで検索",
"tsSrc": "tootsearchで検索", "tsSrc": "tootsearchで検索",
"close":"Close", "close": "Close",
"showSelectProf":"選択したアカウントのプロフィールを表示", "showSelectProf": "選択したアカウントのプロフィールを表示",
"closethisbox":"このボックスを閉じる", "closethisbox": "このボックスを閉じる",
"post-new":"投稿", "post-new": "投稿",
"toot":"トゥート", "toot": "トゥート",
"nsfwDes":"画像に制限を付与", "nsfwDes": "画像に制限を付与",
"cwDes":"コンテンツワーニング(トゥートを表示する前にメッセージで隠す)", "cwDes": "コンテンツワーニング(トゥートを表示する前にメッセージで隠す)",
"selfile":"ファイルを選択", "selfile": "ファイルを選択",
"insertEmoji":"絵文字を挿入", "insertEmoji": "絵文字を挿入",
"schedule":"時間指定投稿", "schedule": "時間指定投稿",
"postat":"時間指定投稿", "postat": "時間指定投稿",
"scheduleWarn":"2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。", "scheduleWarn": "2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。",
"clearToot":"トゥートボックスのクリア", "clearToot": "トゥートボックスのクリア",
"replyMode":"返信モード", "replyMode": "返信モード",
"no":"いいえ", "no": "いいえ",
"yes":"はい", "yes": "はい",
"temp":"添付ファイル", "temp": "添付ファイル",
"nothing":"なし", "nothing": "なし",
"stamp": "スタンプ", "stamp": "スタンプ",
"stampWarn": "画像右下にアカウント名(aa@bb.cc)テキストを挿入します", "stampWarn": "画像右下にアカウント名(aa@bb.cc)テキストを挿入します",
"vis":"公開範囲", "vis": "公開範囲",
"cwtext":"警告文", "cwtext": "警告文",
"selectVis":"公開範囲指定", "selectVis": "公開範囲指定",
"publicJP":"公開", "publicJP": "公開",
"unlistedJP":"未収載", "unlistedJP": "未収載",
"privateJP":"非公開", "privateJP": "非公開",
"localJP":"ローカル限定", "localJP": "ローカル限定",
"directJP":"ダイレクト", "directJP": "ダイレクト",
"sectoot":"セカンダリートゥート", "sectoot": "セカンダリートゥート",
"emojiWarn":"サーバーによって実装が異なります。", "emojiWarn": "サーバーによって実装が異なります。",
"emojiInsertWarn":"一部絵文字は入力できません。", "emojiInsertWarn": "一部絵文字は入力できません。",
"refreshEmoji":"絵文字更新", "refreshEmoji": "絵文字更新",
"closeThisBox":"このボックスを閉じる", "closeThisBox": "このボックスを閉じる",
"showThisEmoji":"一覧を表示中", "showThisEmoji": "一覧を表示中",
"customEmoji":"カスタム絵文字", "customEmoji": "カスタム絵文字",
"peopleEmoji":"ひと", "peopleEmoji": "ひと",
"natureEmoji":"自然", "natureEmoji": "自然",
"foodEmoji":"食べ物", "foodEmoji": "食べ物",
"activityEmoji":"活動", "activityEmoji": "活動",
"placeEmoji":"場所", "placeEmoji": "場所",
"thingsEmoji":"もの", "thingsEmoji": "もの",
"symbolEmoji":"記号", "symbolEmoji": "記号",
"flagsEmoji":"国旗", "flagsEmoji": "国旗",
"draft": "下書き", "draft": "下書き",
"poll":"アンケート", "poll": "アンケート",
"pollDdisabled":"アンケートを使用しない", "pollDdisabled": "アンケートを使用しない",
"pollProvider":"アンケートのプロバイダ", "pollProvider": "アンケートのプロバイダ",
"choice":"選択肢", "choice": "選択肢",
"polluntil":"投票するまで票数を隠す", "polluntil": "投票するまで票数を隠す",
"pollmulti":"複数選択を許可", "pollmulti": "複数選択を許可",
"expires_in":"有効期限(秒)", "expires_in": "有効期限(秒)",
"contextBefore":"これより前の会話", "contextBefore": "これより前の会話",
"thisToot":"対象のトゥート", "thisToot": "対象のトゥート",
"contextAfter":"これより後の会話", "contextAfter": "これより後の会話",
"beforeLTL":"これより前のLocal TL(エアリプソース確認)", "beforeLTL": "これより前のLocal TL(エアリプソース確認)",
"beforeUTL":"これより前のユーザーTL(BTソース確認)", "beforeUTL": "これより前のユーザーTL(BTソース確認)",
"afterLTL":"これより後のLocal TL(言及確認)", "afterLTL": "これより後のLocal TL(言及確認)",
"afterUTL":"これより後のユーザーTL(言及確認)", "afterUTL": "これより後のユーザーTL(言及確認)",
"afterFTL":"これより後の連合TL(言及確認)", "afterFTL": "これより後の連合TL(言及確認)",
"favedPeople":"このトゥートをお気に入りに登録した人", "favedPeople": "このトゥートをお気に入りに登録した人",
"btedPeople":"このトゥートをブーストした人", "btedPeople": "このトゥートをブーストした人",
"useOtherAcct1":"他のアカウントを使用", "useOtherAcct1": "他のアカウントを使用",
"useOtherAcct2":"の解除はできません", "useOtherAcct2": "の解除はできません",
"btWithVis": "公開範囲を指定してブースト", "btWithVis": "公開範囲を指定してブースト",
"reply":"返信", "reply": "返信",
"bt":"ブースト", "bt": "ブースト",
"favRegist":"お気に入り", "favRegist": "お気に入り",
"openBrowser":"ブラウザで開く", "openBrowser": "ブラウザで開く",
"screenshot":"スクリーンショット", "screenshot": "スクリーンショット",
"copyURL":"URLをコピー", "copyURL": "URLをコピー",
"embed":"埋め込む", "copy": "コピー",
"toots":"トゥート", "embed": "埋め込む",
"follow":"フォロー", "toots": "トゥート",
"follower":"フォロー", "follow": "フォロー",
"utlColumn":"カラムとして追加", "follower": "フォロワー",
"timeline":"タイムライン", "utlColumn": "カラムとして追加",
"operateOtherAcct":"他のアカウントで操作", "timeline": "タイムライン",
"list":"リスト", "operateOtherAcct": "他のアカウントで操作",
"makeNew":"新規作成", "list": "リスト",
"blocks":"ブロック", "makeNew": "新規作成",
"mutes":"ミュート", "blocks": "ブロック",
"block":"ブロック", "mutes": "ミュート",
"mute":"ミュート", "block": "ブロック",
"domainBlock":"ドメインブロック", "mute": "ミュート",
"editProf":"プロフィール編集", "domainBlock": "ドメインブロック",
"change":"変更", "editProf": "プロフィール編集",
"followReq":"フォローリクエスト", "change": "変更",
"likeHimOrHer":"似てる", "followReq": "フォローリクエスト",
"frc":"おすすめ", "likeHimOrHer": "似てる",
"more":"もっと", "frc": "おすすめフォロー",
"endorse":"紹介する", "more": "もっと",
"openinbrowser":"ブラウザで開く", "endorse": "紹介する",
"mainacct":"メインアカウントに設定", "openinbrowser": "ブラウザで開く",
"revoverJP":"する", "mainacct": "メインアカウントに設定",
"warnUseOtherAcct":"(解除はできません。)", "revoverJP": "する",
"revoverJPde":"", "warnUseOtherAcct": "(解除はできません。)",
"or":"または", "revoverJPde": "",
"openProf":"プロフィールを表示", "or": "または",
"warnListRegist":"リストに追加するためにはフォローが必要です。", "openProf": "プロフィールを表示",
"blockDomain":"ブロックするドメイン", "warnListRegist": "リストに追加するためにはフォローが必要です。",
"name":"名前", "blockDomain": "ブロックするドメイン",
"note":"自己紹介", "name": "名前",
"editProfImg":"アバターを変更", "note": "自己紹介",
"editHeader":"ヘッダーを変更", "editProfImg": "アバターを変更",
"blocked":"ブロックされています。なぜでしょう?", "editHeader": "ヘッダーを変更",
"likeUserDes":"似ているユーザーを取得できます。", "blocked": "ブロックされています。なぜでしょう?",
"get":"取得", "likeUserDes": "似ているユーザーを取得できます。",
"historyBack":"一つ前のユーザーデータ", "get": "取得",
"empUser":"ユーザー強調", "historyBack": "一つ前のユーザーデータ",
"supportme":"ご支援ください。", "empUser": "ユーザー強調",
"TheDeskDes":"TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。", "supportme": "ご支援ください。",
"PatreonSupport":"Patreonで支援", "TheDeskDes": "TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。",
"PixivSupport":"Pixiv FANBOXで支援", "PatreonSupport": "Patreonで支援",
"AWLSupport":"Amazonほしいものリスト", "PixivSupport": "Pixiv FANBOXで支援",
"SendAmazonGift1":"", "AWLSupport": "Amazonほしいものリスト",
"SendAmazonGift2":"にAmazonギフトカードを送る", "SendAmazonGift1": "",
"monthly":"月額支援(大歓迎)", "SendAmazonGift2": "にAmazonギフトカードを送る",
"once":"一度限りの支援(もちろん歓迎)", "monthly": "月額支援(大歓迎)",
"local":"ローカル", "once": "一度限りの支援(もちろん歓迎)",
"localMedia":"ローカル(メディア)", "local": "ローカル",
"home":"ホーム", "localMedia": "ローカル(メディア)",
"fed":"連合", "home": "ホーム",
"fedMedia":"連合(メディア)", "fed": "連合",
"dm":"ダイレクトメッセージ", "fedMedia": "連合(メディア)",
"integratedTLDes":"統合(ローカルとホーム)", "dm": "ダイレクトメッセージ",
"localPlusDes":"統合(LTL+BT+返信)", "integratedTLDes": "統合(ローカルとホーム)",
"notf":"通知", "localPlusDes": "統合(LTL+BT+返信)",
"notf": "通知",
"bookmark": "ブックマーク", "bookmark": "ブックマーク",
"showThisTL":"表示するタイムライン", "showThisTL": "表示するタイムライン",
"webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。", "webviewWarn": "TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。",
"add":"追加", "add": "追加",
"search":"検索", "search": "検索",
"sortSet":"並べ替え設定", "sortSet": "並べ替え設定",
"selectAcct":"選択(スクロールで全選択肢表示)", "selectAcct": "選択(スクロールで全選択肢表示)",
"filterWord":"フィルターワード", "filterWord": "フィルターワード",
"listLocale":"一覧", "listLocale": "一覧",
"degree":"適応範囲", "degree": "適応範囲",
"conver":"会話", "conver": "会話",
"prof":"プロフィール", "prof": "プロフィール",
"option":"オプション", "option": "オプション",
"matchWord":"単語マッチ", "matchWord": "単語マッチ",
"warnMatchWord":"非ラテン系の文字列では「単語マッチ」は推奨されません。", "warnMatchWord": "非ラテン系の文字列では「単語マッチ」は推奨されません。",
"except":"除外", "except": "除外",
"exceptWorn":"「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。", "exceptWorn": "「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。",
"avalableBefore":"有効期限(あと)", "avalableBefore": "有効期限(あと)",
"warnAvBefore":"未指定(または0分)で「無期限」になります。", "warnAvBefore": "未指定(または0分)で「無期限」になります。",
"warnAvBefore2":"仕様上数値の正確性を保証できません。", "warnAvBefore2": "仕様上数値の正確性を保証できません。",
"unlimited":"無期限", "unlimited": "無期限",
"days":"日", "days": "日",
"hours":"時間", "hours": "時間",
"mins":"分", "mins": "分",
"secs":"秒", "secs": "秒",
"warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。", "warnOnIntegratedTL": "Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。",
"helloTheDesk":"内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)", "helloTheDesk": "内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)",
"addColumn":"カラム追加", "addColumn": "カラム追加",
"sortColumns":"カラム一覧/並べ替え", "sortColumns": "カラム一覧/並べ替え",
"acctMan":"アカウントマネージャー", "acctMan": "アカウントマネージャー",
"filter":"フィルター", "filter": "フィルター",
"setting":"設定", "setting": "設定",
"reverse":"トゥートボタンの左右入れ替え", "reverse": "トゥートボタンの左右入れ替え",
"f5":"TL再読込", "f5": "TL再読込",
"nanoDes":"最小のマストドン。", "nanoDes": "最小のマストドン。",
"verTips":"バージョン", "verTips": "バージョン",
"clockTips":"時計", "clockTips": "時計",
"ramTips":"システムメモリ容量", "ramTips": "システムメモリ容量",
"changeTips":"Tips変更", "changeTips": "Tips変更",
"helpAndLogs":"ヘルプとログ", "helpAndLogs": "ヘルプとログ",
"help":"ヘルプ", "help": "ヘルプ",
"contactwithlog":"不具合等のお問合わせは以下のログから発生時刻付近のものを集めてご連絡いただけるとスムーズになるかもしれません。また、このメニューウィンドウ全体を横に引き伸ばすとログが見やすくなります。", "contactwithlog": "不具合等のお問合わせは以下のログから発生時刻付近のものを集めてご連絡いただけるとスムーズになるかもしれません。また、このメニューウィンドウ全体を横に引き伸ばすとログが見やすくなります。",
"about":"このソフトについて", "about": "このソフトについて",
"hereAddColumns":"←ここからTL追加", "hereAddColumns": "←ここからTL追加",
"foundBug": "バグを見つけた", "foundBug": "バグを見つけた",
"show": "表示", "show": "表示",
"directory": "ディレクトリ", "directory": "ディレクトリ",
"discover": "見つける",
"active": "最新活動順", "active": "最新活動順",
"newcomer": "新規順", "newcomer": "新規順",
"local_only": "ローカルのみ", "local_only": "ローカルのみ",

View File

@@ -104,6 +104,7 @@
"lang_details_embed": "埋め込みHTMLがコピーされました。", "lang_details_embed": "埋め込みHTMLがコピーされました。",
"lang_details_url": "トゥートURLがコピーされました。", "lang_details_url": "トゥートURLがコピーされました。",
"lang_details_txt": "トゥート本文がコピーされました。", "lang_details_txt": "トゥート本文がコピーされました。",
"lang_details_fetch": "トゥートの情報を読み込んでいます",
"lang_filter_nodata": "フィルターはありません", "lang_filter_nodata": "フィルターはありません",
"lang_filter_errordegree": "適応範囲を最低一つ以上チェックしてください。", "lang_filter_errordegree": "適応範囲を最低一つ以上チェックしてください。",
"lang_list_nodata": "リストはありません", "lang_list_nodata": "リストはありません",

View File

@@ -74,6 +74,7 @@
"openBrowser": "Open in browser", "openBrowser": "Open in browser",
"screenshot": "Take a screenshot", "screenshot": "Take a screenshot",
"copyURL": "Copy the URL", "copyURL": "Copy the URL",
"copy": "Copy",
"embed": "Embed", "embed": "Embed",
"toots": "Toots", "toots": "Toots",
"follow": "Follow", "follow": "Follow",
@@ -178,6 +179,7 @@
"foundBug": "I found a bug", "foundBug": "I found a bug",
"show": "Show", "show": "Show",
"directory": "Directory", "directory": "Directory",
"discover": "Discover",
"active": "Recently active", "active": "Recently active",
"newcomer": "New arrivals", "newcomer": "New arrivals",
"local_only": "Local only", "local_only": "Local only",

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