mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-24 05:03:08 +02:00
Merge branch 'develop'
This commit is contained in:
syuilo
commit
d040dc19bc
35 changed files with 295 additions and 99 deletions
|
|
@ -5,6 +5,14 @@ If you encounter any problems with updating, please try the following:
|
|||
1. `npm run clean` or `npm run cleanall`
|
||||
2. Retry update (Don't forget `npm i`)
|
||||
|
||||
11.0.2 (2019/04/15)
|
||||
-------------------
|
||||
* アプリが作成できない問題を修正
|
||||
* 「ハイライト」が表示されない問題を修正
|
||||
* リモートの投稿に添付されている画像が小さい問題を修正
|
||||
* モバイル版でリストの名前が表示されない問題を修正
|
||||
* APIドキュメントにパーミッション一覧を追加
|
||||
|
||||
11.0.1 (2019/04/15)
|
||||
-------------------
|
||||
* 不要な依存関係を削除
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ Organize and store your files! Want to post a picture you have already uploaded?
|
|||
|
||||
---
|
||||
|
||||
...and more! Experience Misskey with your own eyes at [misskey.xyz](https://misskey.xyz) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
|
||||
...and more! Experience Misskey with your own eyes at [misskey.io](https://misskey.io/) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
|
||||
|
||||
Screen shots
|
||||
----------------------------------------------------------------
|
||||
|
|
@ -103,7 +103,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
|
|||
<table><tr>
|
||||
<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
|
||||
<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weep" width="100"></td>
|
||||
<td><img src="https://c8.patreon.com/2/200/12059069" alt="naga_rus" width="100"></td>
|
||||
<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1.jpe?token-time=2145916800&token-hash=bqwLTk0Wo0hUJJ8J5y7ii05bLzz-_CDA7Bo0Mp4RFU0%3D" alt="ne_moni" width="100"></td>
|
||||
<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/4.jpe?token-time=2145916800&token-hash=zEyJqVM7u9d8Ri-65fJYSJcWF1jBH1nJ5a3taRzrTmw%3D" alt="Melilot" width="100"></td>
|
||||
<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
|
||||
|
|
@ -111,7 +110,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
|
|||
</tr><tr>
|
||||
<td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
|
||||
<td><a href="https://www.patreon.com/weepjp">weep</a></td>
|
||||
<td><a href="https://www.patreon.com/user?u=12059069">naga_rus</a></td>
|
||||
<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
|
||||
<td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
|
||||
<td><a href="https://www.patreon.com/osapon">osapon</a></td>
|
||||
|
|
@ -165,7 +163,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
|
|||
</tr><tr>
|
||||
</tr></table>
|
||||
|
||||
**Last updated:** Sun, 14 Apr 2019 08:13:12 UTC
|
||||
**Last updated:** Mon, 15 Apr 2019 01:59:07 UTC
|
||||
<!-- PATREON_END -->
|
||||
|
||||
:four_leaf_clover: Copyright
|
||||
|
|
|
|||
|
|
@ -69,6 +69,9 @@ common:
|
|||
following: "Sledovaní"
|
||||
followers: "Sledující"
|
||||
favorites: "Oblíbené"
|
||||
permissions:
|
||||
'read:drive': "Prohlížet Disk"
|
||||
'write:drive': "Pracovat s Diskem"
|
||||
empty-timeline-info:
|
||||
follow-users-to-make-your-timeline: "Poznámky sledujících se zobrazí ve vaší časové ose"
|
||||
explore: "Najít uživatele"
|
||||
|
|
|
|||
|
|
@ -20,6 +20,13 @@ common:
|
|||
load-more: "Mehr laden"
|
||||
enter-password: "Bitte Passwort eingeben"
|
||||
2fa: "Zwei-Faktor-Authentifizierung"
|
||||
customize-home: "Layout Anpassen"
|
||||
featured-notes: "Hervorgehobene Beiträge"
|
||||
dark-mode: "Dunkler Modus"
|
||||
signin: "Einloggen"
|
||||
signup: "Registrieren"
|
||||
signout: "Ausloggen"
|
||||
reload-to-apply-the-setting: "Die Seite muss zum Übernehmen dieser Einstellung aktualisiert werden. Soll die Seite jetzt neu geladen werden?"
|
||||
got-it: "Verstanden!"
|
||||
customization-tips:
|
||||
title: "Anpassung-Tipps"
|
||||
|
|
@ -27,6 +34,7 @@ common:
|
|||
notification:
|
||||
file-uploaded: "Datei hochgeladen!"
|
||||
message-from: "Nachricht von {}:"
|
||||
reversi-invited: "Zu einem Spiel eingeladen"
|
||||
reversi-invited-by: "Eingeladen von {}:"
|
||||
notified-by: "Benachrichtigt von {}:"
|
||||
reply-from: "Antwort von {}:"
|
||||
|
|
@ -47,7 +55,20 @@ common:
|
|||
drive: "Drive"
|
||||
messaging: "Unterhaltungen"
|
||||
home: "Home"
|
||||
favorites: "Diese Notiz favorisieren"
|
||||
deck: "Stapel"
|
||||
timeline: "Zeitleiste"
|
||||
explore: "Entdecken"
|
||||
following: "Folgt"
|
||||
followers: "Folgende"
|
||||
favorites: "Diesen Beitrag favorisieren"
|
||||
permissions:
|
||||
'read:account': "Accountinformationen anzeigen."
|
||||
'write:account': "Accountinformationen bearbeiten."
|
||||
'read:drive': "Dateien anzeigen"
|
||||
'write:drive': "Dateien bearbeiten"
|
||||
empty-timeline-info:
|
||||
follow-users-to-make-your-timeline: "Beiträge von Benutzern, denen du folgst, werden in der Zeitleiste angezeigt."
|
||||
explore: "Benutzer finden"
|
||||
weekday-short:
|
||||
sunday: "So"
|
||||
monday: "Mo"
|
||||
|
|
@ -78,11 +99,11 @@ common:
|
|||
note-visibility:
|
||||
public: "Öffentlich"
|
||||
home: "Startseite"
|
||||
home-desc: "Nur auf die Startseite posten"
|
||||
home-desc: "Auf die Startseite posten"
|
||||
followers: "Abonnenten"
|
||||
followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
|
||||
specified: "Direkt"
|
||||
specified-desc: "Nur für bestimmte Benutzer posten"
|
||||
specified-desc: "Nur für bestimmte Benutzer sichtbar"
|
||||
local-public: "Öffentlich (nur lokal)"
|
||||
local-home: "Home (nur lokal)"
|
||||
local-followers: "Follower (nur lokal)"
|
||||
|
|
@ -92,11 +113,34 @@ common:
|
|||
c: "Was geht dir durch den Kopf?"
|
||||
d: "Willst du etwas sagen?"
|
||||
e: "Schreib hier etwas!"
|
||||
f: "Warte darauf, das du schreibst."
|
||||
f: "Warte darauf, das du schreibst..."
|
||||
settings: "Einstellungen"
|
||||
_settings:
|
||||
profile: "Dein Profil"
|
||||
notification: "Benachrichtigungen"
|
||||
apps: "Anwendungen"
|
||||
tags: "Hashtags"
|
||||
mute-and-block: "Stummschalten/Blocken"
|
||||
blocking: "Blocken"
|
||||
security: "Sicherheit"
|
||||
signin: "Login-Verlauf"
|
||||
password: "Passwort"
|
||||
other: "Mehr"
|
||||
appearance: "Designs"
|
||||
behavior: "Verhalten"
|
||||
fetch-on-scroll: "Unendliches laden beim scrollen"
|
||||
fetch-on-scroll-desc: "Wenn beim scrollen das Ende erreicht wird, lädt die Anwendung automatisch neue Inhalte nach."
|
||||
note-visibility: "Sichtbarkeit von Beiträgen"
|
||||
default-note-visibility: "Die Standardsichtbarkeit"
|
||||
remember-note-visibility: "Erinnerung an Sichtbarkeit von Beiträgen"
|
||||
web-search-engine: "Web-Suchmaschine"
|
||||
web-search-engine-desc: "Beispiel: https://www.google.de/search?q={{query}}"
|
||||
keep-cw: "Inhaltswarnung beibehalten"
|
||||
keep-cw-desc: "Wenn auf einen Beitrag geantwortet wird, wird die Inhaltswarnung des Originalbeitrags übernommen."
|
||||
i-like-sushi: "Ich bevorzuge Sushi anstelle von Pudding"
|
||||
show-reversi-board-labels: "Zeige Reihen- und Spaltenbeschreibungen in Reversi an"
|
||||
use-avatar-reversi-stones: "Avatar als Stein in Reversi anzeigen"
|
||||
disable-animated-mfm: "Animierten Text in Beiträgen deaktivieren"
|
||||
search: "Suche"
|
||||
delete: "Löschen"
|
||||
loading: "Laden"
|
||||
|
|
@ -104,7 +148,7 @@ common:
|
|||
update-available: "Eine neue Version von Misskey ist verfügbar ({newer}, aktuell ist {current}). Lade die Seite neu um die aktuelle Version zu laden"
|
||||
my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
|
||||
verified-user: "Verifizierter Benutzer"
|
||||
do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktionsumgebung verwenden."
|
||||
do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktivumgebung verwenden."
|
||||
error:
|
||||
retry: "Erneut versuchen"
|
||||
reversi:
|
||||
|
|
@ -118,7 +162,7 @@ common:
|
|||
analog-clock: "Analoge Uhr"
|
||||
profile: "Profil"
|
||||
calendar: "Kalender"
|
||||
timemachine: "Kalender (Zeitmaschiene)"
|
||||
timemachine: "Kalender (Zeitmaschine)"
|
||||
activity: "Aktivitäten"
|
||||
rss: "RSS Leser"
|
||||
memo: "Notizen"
|
||||
|
|
@ -129,7 +173,7 @@ common:
|
|||
notifications: "Benachrichtigungen"
|
||||
users: "Empfohlene Benutzer"
|
||||
polls: "Umfrage"
|
||||
post-form: "Beitragsform"
|
||||
post-form: "\"Neuer Beitrag\"-Formular"
|
||||
server: "Server-Info"
|
||||
nav: "Navigation"
|
||||
tips: "Tipps"
|
||||
|
|
@ -179,7 +223,7 @@ common/views/components/games/reversi/reversi.room.vue:
|
|||
ready: "Bereit"
|
||||
common/views/components/connect-failed.vue:
|
||||
title: "Verbindung zum Server ist fehlgeschlagen"
|
||||
description: "Es gibt entweder ein Problem mit deiner Internetverbindung, der Server ist nicht erreichbar oder wird gerade gewartet. Bitte versuche es später noch einmal."
|
||||
description: "Entweder gibt es ein Problem mit deiner Internetverbindung oder der Server ist zur Zeit nicht erreichbar oder wird gewartet. Bitte versuche es später noch einmal."
|
||||
thanks: "Vielen Dank für das nutzen von Misskey."
|
||||
troubleshoot: "Problembehandlung"
|
||||
common/views/components/connect-failed.troubleshooter.vue:
|
||||
|
|
@ -196,8 +240,8 @@ common/views/components/connect-failed.troubleshooter.vue:
|
|||
no-internet: "Keine Internetverbindung"
|
||||
no-internet-desc: "Bitte vergewissere dich, dass du mit dem Internet verbunden bist."
|
||||
no-server: "Verbindung mit dem Server nicht möglich"
|
||||
no-server-desc: "Die Internetverbindung scheint in Ordnung zu sein, aber eine Verbindung mit dem Misskey Server konnte nicht hergestellt werden. Möglicherweise ist dieser zur Zeit offline oder in der Wartung, bitte versuche es später noch einmal."
|
||||
success: "Erfolgreich mit dem Misskey Server verbunden"
|
||||
no-server-desc: "Die Internetverbindung scheint in Ordnung zu sein, aber eine Verbindung mit dem Misskey-Server konnte nicht hergestellt werden. Möglicherweise ist dieser zur Zeit offline oder wird gewartet. Bitte versuche es später noch einmal."
|
||||
success: "Erfolgreich mit dem Misskey-Server verbunden"
|
||||
success-desc: "Die Verbindung scheint zu funktionieren. Bitte lade die Seite neu."
|
||||
flush: "Cache leeren"
|
||||
set-version: "Version angeben"
|
||||
|
|
@ -224,6 +268,7 @@ common/views/components/theme.vue:
|
|||
invalid-theme: "Thema ist ungültig"
|
||||
already-installed: "Thema ist bereits installiert"
|
||||
author: "Autor"
|
||||
desc: "Beschreibung"
|
||||
export: "Exportieren"
|
||||
import: "Importieren"
|
||||
common/views/components/cw-button.vue:
|
||||
|
|
@ -251,15 +296,15 @@ common/views/components/nav.vue:
|
|||
status: "Status"
|
||||
wiki: "Wiki"
|
||||
donors: "Spender"
|
||||
repository: "Projektarchiv"
|
||||
repository: "Quellcode"
|
||||
develop: "Entwickler"
|
||||
feedback: "Feedback"
|
||||
common/views/components/note-menu.vue:
|
||||
favorite: "Diese Notiz favorisieren"
|
||||
favorite: "Diesen Beitrag favorisieren"
|
||||
unfavorite: "Aus Favoriten entfernen"
|
||||
pin: "An die Profilseite pinnen"
|
||||
delete: "Löschen"
|
||||
delete-confirm: "Diesen Post löschen?"
|
||||
delete-confirm: "Diesen Beitrag löschen?"
|
||||
remote: "Auf Quelle anzeigen"
|
||||
common/views/components/poll.vue:
|
||||
vote-to: "Stimme für '{}'"
|
||||
|
|
@ -296,8 +341,8 @@ common/views/components/signup.vue:
|
|||
password: "Passwort"
|
||||
password-placeholder: "Wir empfehlen mindestens 8 Zeichen"
|
||||
weak-password: "Schwaches Passwort"
|
||||
normal-password: "Faires Passwort"
|
||||
strong-password: "Schwaches Passwort"
|
||||
normal-password: "Normales Passwort"
|
||||
strong-password: "Starkes Passwort"
|
||||
retype: "Wiederholen"
|
||||
retype-placeholder: "Bitte das Passwort erneut eingeben"
|
||||
password-matched: "OK"
|
||||
|
|
@ -319,16 +364,17 @@ common/views/components/uploader.vue:
|
|||
common/views/components/visibility-chooser.vue:
|
||||
public: "Öffentlich"
|
||||
home: "Home"
|
||||
home-desc: "Nur auf die Startseite posten"
|
||||
home-desc: "Auf die Startseite posten"
|
||||
followers: "Folgende"
|
||||
followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
|
||||
specified: "Direkt"
|
||||
specified-desc: "Poste nur für bestimmte Benutzer"
|
||||
specified-desc: "Nur für bestimmte Benutzer sichtbar"
|
||||
local-public: "Öffentlich (nur lokal)"
|
||||
local-home: "Home (nur lokal)"
|
||||
local-followers: "Follower (nur lokal)"
|
||||
common/views/components/profile-editor.vue:
|
||||
title: "Dein Profil"
|
||||
name: "Name"
|
||||
avatar: "Avatar"
|
||||
banner: "Banner"
|
||||
save: "Speichern"
|
||||
|
|
@ -400,8 +446,8 @@ desktop/views/components/drive.file.vue:
|
|||
copied: "Kopieren erfolgreich"
|
||||
copied-url-to-clipboard: "URL wurde in die Zwischenablage kopiert"
|
||||
desktop/views/components/drive.folder.vue:
|
||||
unable-to-process: "Der Vorgang konnte nicht beendet werden"
|
||||
circular-reference-detected: "Das Zielverzeichnis ist ein Unterverzeichnis des Verzeichnisses welches du verschieben möchtest"
|
||||
unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
|
||||
circular-reference-detected: "Das Zielverzeichnis ist innerhalb des Verzeichnisses, dass du verschieben möchtest"
|
||||
unhandled-error: "Unbekannter Fehler"
|
||||
contextmenu:
|
||||
move-to-this-folder: "Verschiebe in diesen Ordner"
|
||||
|
|
@ -416,7 +462,7 @@ desktop/views/components/drive.vue:
|
|||
empty-drive-description: "Du kannst rechts klicken und \"Datei hochladen\" auswählen oder eine Datei per Drag and Drop auf das Fenster ziehen."
|
||||
empty-folder: "Dieser Ordner ist leer"
|
||||
unable-to-process: "Der Vorgang konnte nicht beendet werden"
|
||||
circular-reference-detected: "Das Zielverzeichnis ist ein Unterverzeichnis des Verzeichnisses welches du verschieben möchtest"
|
||||
circular-reference-detected: "Das Zielverzeichnis ist innerhalb des Verzeichnisses, dass du verschieben möchtest"
|
||||
unhandled-error: "Unbekannter Fehler"
|
||||
url-upload: "Von einer URL hochladen"
|
||||
url-of-file: "URL der Datei, welche du hochladen möchtest"
|
||||
|
|
@ -440,15 +486,15 @@ desktop/views/input-dialog.vue:
|
|||
cancel: "Abbrechen"
|
||||
ok: "OK"
|
||||
desktop/views/components/note-detail.vue:
|
||||
private: "Dieser Post ist privat"
|
||||
private: "Dieser Beitrag ist privat"
|
||||
deleted: "Dieser Beitrag wurde entfernt"
|
||||
location: "Ort"
|
||||
renote: "Anmerkung"
|
||||
add-reaction: "Reaktion hinzufügen"
|
||||
desktop/views/components/note.vue:
|
||||
reply: "Antworten"
|
||||
renote: "Anmerkung"
|
||||
private: "Dieser Post ist privat"
|
||||
renote: "Anmerken"
|
||||
private: "Dieser Beitrag ist privat"
|
||||
deleted: "Dieser Beitrag wurde entfernt"
|
||||
desktop/views/components/notes.vue:
|
||||
error: "Laden fehlgeschlagen."
|
||||
|
|
@ -460,9 +506,9 @@ desktop/views/components/post-form.vue:
|
|||
hide-contents: "Inhalt verstecken"
|
||||
reply-placeholder: "Antworte auf diese Anmerkung..."
|
||||
quote-placeholder: "Zitiere diese Anmerkung..."
|
||||
submit: "Beitragsform"
|
||||
submit: "Abschicken"
|
||||
reply: "Antworten"
|
||||
renote: "Anmerkung"
|
||||
renote: "Anmerken"
|
||||
posted: "Gepostet!"
|
||||
replied: "Geantwortet!"
|
||||
reposted: "Weitergesagt!"
|
||||
|
|
@ -478,7 +524,7 @@ desktop/views/components/post-form.vue:
|
|||
error: "Fehler"
|
||||
enter-username: "Bitte gib einen Benutzernamen ein..."
|
||||
desktop/views/components/post-form-window.vue:
|
||||
note: "Neue Notiz"
|
||||
note: "Neuer Beitrag"
|
||||
reply: "Antworten"
|
||||
attaches: "{} Medien hinzugefügt"
|
||||
uploading-media: "Lade {} Medien hoch"
|
||||
|
|
@ -492,7 +538,7 @@ desktop/views/components/renote-form.vue:
|
|||
success: "Weitergesagt!"
|
||||
failure: "Weitersagen fehlgeschlagen"
|
||||
desktop/views/components/renote-form-window.vue:
|
||||
title: "Bist du dir sicher, dass du das reposten willst?"
|
||||
title: "Bist du dir sicher, dass du das weitersagen willst?"
|
||||
desktop/views/components/settings.2fa.vue:
|
||||
url: "https://www.google.de/intl/de/landing/2step/"
|
||||
register: "Ein Gerät registrieren"
|
||||
|
|
@ -504,6 +550,7 @@ desktop/views/components/settings.2fa.vue:
|
|||
common/views/components/api-settings.vue:
|
||||
enter-password: "Bitte Passwort eingeben"
|
||||
console:
|
||||
parameter: "Parameter"
|
||||
send: "Senden"
|
||||
common/views/components/drive-settings.vue:
|
||||
in-use: "benutzt"
|
||||
|
|
@ -511,7 +558,7 @@ common/views/components/drive-settings.vue:
|
|||
common/views/components/mute-and-block.vue:
|
||||
save: "Speichern"
|
||||
desktop/views/components/sub-note-content.vue:
|
||||
private: "Dieser Post ist privat"
|
||||
private: "Dieser Beitrag ist privat"
|
||||
deleted: "Dieser Beitrag wurde entfernt"
|
||||
poll: "Umfrage"
|
||||
desktop/views/components/settings.tags.vue:
|
||||
|
|
@ -601,22 +648,22 @@ mobile/views/components/drive.file-detail.vue:
|
|||
download: "Download"
|
||||
rename: "Umbenennen"
|
||||
mobile/views/components/note.vue:
|
||||
private: "Dieser Post ist privat"
|
||||
private: "Dieser Beitrag ist privat"
|
||||
deleted: "Dieser Beitrag wurde entfernt"
|
||||
location: "Ort"
|
||||
mobile/views/components/note-detail.vue:
|
||||
reply: "Antworten"
|
||||
private: "Dieser Post ist privat"
|
||||
private: "Dieser Beitrag ist privat"
|
||||
deleted: "Dieser Beitrag wurde entfernt"
|
||||
location: "Ort"
|
||||
mobile/views/components/notifications.vue:
|
||||
empty: "Keine Benachrichtigungen"
|
||||
mobile/views/components/post-form.vue:
|
||||
reply: "Antworten"
|
||||
renote: "Anmerkung"
|
||||
renote: "Anmerken"
|
||||
reply-placeholder: "Antworte auf diese Anmerkung..."
|
||||
mobile/views/components/sub-note-content.vue:
|
||||
private: "Dieser Post ist privat"
|
||||
private: "Dieser Beitrag ist privat"
|
||||
deleted: "Dieser Beitrag wurde entfernt"
|
||||
poll: "Umfrage"
|
||||
mobile/views/components/ui.nav.vue:
|
||||
|
|
@ -633,7 +680,7 @@ mobile/views/pages/home.vue:
|
|||
global: "Global"
|
||||
mobile/views/pages/widgets.vue:
|
||||
add-widget: "Hinzufügen"
|
||||
customization-tips: "Anpassung-Tipps"
|
||||
customization-tips: "Anpassungs-Tipps"
|
||||
mobile/views/pages/widgets/activity.vue:
|
||||
activity: "Aktivität"
|
||||
mobile/views/pages/note.vue:
|
||||
|
|
@ -654,4 +701,50 @@ deck:
|
|||
list: "Listen"
|
||||
rename: "Umbenennen"
|
||||
deck/deck.user-column.vue:
|
||||
following: "Folgen"
|
||||
followers: "Folgende"
|
||||
images: "Bilder"
|
||||
activity: "Aktivität"
|
||||
timeline: "Zeitleiste"
|
||||
pinned-notes: "Angeheftete Beiträge"
|
||||
docs:
|
||||
edit-this-page-on-github: "Hast Du einen Fehler gefunden oder Lust, diese Dokumentation zu verbessern?"
|
||||
edit-this-page-on-github-link: "Seite auf GitHub bearbeiten!"
|
||||
api:
|
||||
entities:
|
||||
properties: "Eigenschaften"
|
||||
endpoints:
|
||||
params: "Parameter"
|
||||
no-params: "Keine Parameter."
|
||||
res: "Antwort"
|
||||
require-credential: "Dieser Endpunkt erfordert eine Authentifizierung."
|
||||
require-permission: "Dieser Endpunkt erfordert die {permission} Berechtigung."
|
||||
has-limit: "Es gibt eine Ratenbegrenzung."
|
||||
duration-limit: "Es sind maximal {max} Anfragen pro {duration} Millisekunden möglich."
|
||||
min-interval-limit: "Es ist nur eine Anfrage alle {interval} Millisekunden möglich."
|
||||
show-src: "Quellcode anzeigen."
|
||||
show-src-link: "Quellcode auf GitHub anzeigen"
|
||||
generated: "Dieses Dokument wird automatisch anhand der API-Definition generiert."
|
||||
props:
|
||||
name: "Name"
|
||||
type: "Typ"
|
||||
description: "Beschreibung"
|
||||
dev/views/index.vue:
|
||||
manage-apps: "Anwendungen verwalten"
|
||||
dev/views/apps.vue:
|
||||
manage-apps: "Anwendungen verwalten"
|
||||
create-app: "Anwendung erstellen"
|
||||
app-missing: "Keine Anwendungen"
|
||||
dev/views/new-app.vue:
|
||||
create-app: "Erstelle Anwendung"
|
||||
app-name: "Name der Anwendung"
|
||||
app-name-desc: "Der Name der Anwendung"
|
||||
app-name-ex: "z.B. Misskey für iOS"
|
||||
app-overview: "Beschreibung der Anwendung"
|
||||
app-desc: "Eine kurze Beschreibung oder Einführung der Anwendung."
|
||||
app-desc-ex: "z.B. Ein iOS-Client für Misskey."
|
||||
callback-url: "Callback-URL (optional)"
|
||||
callback-url-desc: "Die URL, auf die nach erfolgreicher Authentifizierung umgeleitet werden soll."
|
||||
authority: "Berechtigungen"
|
||||
authority-desc: "Nur die hier eingetragenen Berechtigungen, werden per API zur Verfügung stehen."
|
||||
authority-warning: "Dies kann auch nach dem erstellen der Anwendung geändert werden, allerdings werden dann alle bisher generierten Token ungültig."
|
||||
|
|
|
|||
|
|
@ -74,10 +74,26 @@ common:
|
|||
favorites: "お気に入り"
|
||||
|
||||
permissions:
|
||||
'read:account': "アカウントの情報を見る"
|
||||
'write:account': "アカウントの情報を変更する"
|
||||
'read:drive': "ドライブを見る"
|
||||
'write:drive': "ドライブを操作する"
|
||||
"read:account": "アカウントの情報を見る"
|
||||
"write:account": "アカウントの情報を変更する"
|
||||
"read:blocks": "ブロックを見る"
|
||||
"write:blocks": "ブロックを操作する"
|
||||
"read:drive": "ドライブを見る"
|
||||
"write:drive": "ドライブを操作する"
|
||||
"read:favorites": "お気に入りを見る"
|
||||
"write:favorites": "お気に入りを操作する"
|
||||
"read:following": "フォローの情報を見る"
|
||||
"write:following": "フォロー・フォロー解除する"
|
||||
"read:messaging": "トークを見る"
|
||||
"write:messaging": "トークを操作する"
|
||||
"read:mutes": "ミュートを見る"
|
||||
"write:mutes": "ミュートを操作する"
|
||||
"write:notes": "投稿を作成・削除する"
|
||||
"read:notifications": "通知を見る"
|
||||
"write:notifications": "通知を操作する"
|
||||
"read:reactions": "リアクションを見る"
|
||||
"write:reactions": "リアクションを操作する"
|
||||
"write:votes": "投票する"
|
||||
|
||||
empty-timeline-info:
|
||||
follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
|
||||
|
|
@ -1804,14 +1820,17 @@ dev/views/apps.vue:
|
|||
app-missing: "アプリなし"
|
||||
|
||||
dev/views/new-app.vue:
|
||||
new-app: "新しいアプリケーション"
|
||||
new-app-info: "アプリケーションはAPIからでも作成できます。 (app/create)"
|
||||
create-app: "アプリケーションの作成"
|
||||
app-name: "アプリケーション名"
|
||||
app-name-placeholder: "ex) Misskey for iOS"
|
||||
app-name-desc: "あなたのアプリの名称。"
|
||||
app-name-ex: "ex) Misskey for iOS"
|
||||
app-overview: "アプリの概要"
|
||||
app-desc: "あなたのアプリの簡単な説明や紹介。"
|
||||
app-desc-ex: "ex) Misskey iOSクライアント。"
|
||||
app-overview-placeholder: " ex) Misskey iOSクライアント。"
|
||||
app-overview-desc: "あなたのアプリの簡単な説明や紹介。"
|
||||
callback-url: "コールバックURL (オプション)"
|
||||
callback-url-placeholder: "ex) https://your.app.example.com/callback.php"
|
||||
callback-url-desc: "ユーザーが認証フォームで認証した際にリダイレクトするURLを設定できます。"
|
||||
authority: "権限"
|
||||
authority-desc: "ここで要求した機能だけがAPIからアクセスできます。"
|
||||
|
|
|
|||
|
|
@ -966,6 +966,7 @@ common/views/components/password-settings.vue:
|
|||
changed: "비밀번호를 변경하였습니다"
|
||||
failed: "비밀번호 변경을 실패하였습니다."
|
||||
common/views/components/post-form-attaches.vue:
|
||||
attach-cancel: "첨부 취소"
|
||||
mark-as-sensitive: "열람주의로 설정"
|
||||
unmark-as-sensitive: "열람주의 해제"
|
||||
desktop/views/components/sub-note-content.vue:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "misskey",
|
||||
"author": "syuilo <i@syuilo.com>",
|
||||
"version": "11.0.1",
|
||||
"version": "11.0.2",
|
||||
"codename": "daybreak",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -118,7 +118,6 @@ export default Vue.extend({
|
|||
fileType: image,
|
||||
excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
|
||||
limit: 9,
|
||||
untilDate: new Date().getTime() + 1000 * 86400 * 365
|
||||
}).then(notes => {
|
||||
for (const note of notes) {
|
||||
for (const file of note.files) {
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ export default Vue.extend({
|
|||
fileType: image,
|
||||
excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
|
||||
limit: 9,
|
||||
untilDate: new Date().getTime() + 1000 * 86400 * 365
|
||||
}).then(notes => {
|
||||
for (const note of notes) {
|
||||
for (const file of note.files) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<mk-ui>
|
||||
<b-card :header="$t('header')">
|
||||
<b-card :header="$t('manage-apps')">
|
||||
<b-button to="/app/new" variant="primary">{{ $t('create-app') }}</b-button>
|
||||
<hr>
|
||||
<div class="apps">
|
||||
|
|
|
|||
|
|
@ -1,35 +1,22 @@
|
|||
<template>
|
||||
<mk-ui>
|
||||
<b-card :header="$t('header')">
|
||||
<b-card :header="$t('new-app')">
|
||||
<b-alert show variant="info"><fa icon="info-circle"/> {{ $t('new-app-info') }}</b-alert>
|
||||
<b-form @submit.prevent="onSubmit" autocomplete="off">
|
||||
<b-form-group :label="$t('app-name')" :description="$t('description')">
|
||||
<b-form-input v-model="name" type="text" :placeholder="$t('placeholder')" autocomplete="off" required/>
|
||||
<b-form-group :label="$t('app-name')" :description="$t('app-name-desc')">
|
||||
<b-form-input v-model="name" type="text" :placeholder="$t('app-name-placeholder')" autocomplete="off" required/>
|
||||
</b-form-group>
|
||||
<b-form-group :label="$t('app-overview')" :description="$t('description')">
|
||||
<b-textarea v-model="description" :placeholder="$t('placeholder')" autocomplete="off" required></b-textarea>
|
||||
<b-form-group :label="$t('app-overview')" :description="$t('app-overview-desc')">
|
||||
<b-textarea v-model="description" :placeholder="$t('app-overview-placeholder')" autocomplete="off" required></b-textarea>
|
||||
</b-form-group>
|
||||
<b-form-group :label="$t('callback-url')" :description="$t('description')">
|
||||
<b-input v-model="cb" type="url" placeholder="ex) https://your.app.example.com/callback.php" autocomplete="off"/>
|
||||
<b-form-group :label="$t('callback-url')" :description="$t('callback-url-desc')">
|
||||
<b-input v-model="cb" type="url" :placeholder="$t('callback-url-placeholder')" autocomplete="off"/>
|
||||
</b-form-group>
|
||||
<b-card :header="$t('header')">
|
||||
<b-form-group :description="$t('description')">
|
||||
<b-card :header="$t('authority')">
|
||||
<b-form-group :description="$t('authority-desc')">
|
||||
<b-alert show variant="warning"><fa icon="exclamation-triangle"/> {{ $t('authority-warning') }}</b-alert>
|
||||
<b-form-checkbox-group v-model="permission" stacked>
|
||||
<b-form-checkbox value="read:account">{{ $t('read:account') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="write:account">{{ $t('write:account') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="write:notes">{{ $t('write:notes') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="read:reactions">{{ $t('read:reactions') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="write:reactions">{{ $t('write:reactions') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="read:following">{{ $t('read:following') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="write:following">{{ $t('write:following') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="read:mutes">{{ $t('read:mutes') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="write:mutes">{{ $t('write:mutes') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="read:blocks">{{ $t('read:blocks') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="write:blocks">{{ $t('write:blocks') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="read:drive">{{ $t('read:drive') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="write:drive">{{ $t('write:drive') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="read:notifications">{{ $t('read:notifications') }}</b-form-checkbox>
|
||||
<b-form-checkbox value="write:notifications">{{ $t('write:notifications') }}</b-form-checkbox>
|
||||
<b-form-checkbox v-for="v in permissionsList" :value="v" :key="v">{{ $t(`@.permissions.${v}`) }} ({{ v }})</b-form-checkbox>
|
||||
</b-form-checkbox-group>
|
||||
</b-form-group>
|
||||
</b-card>
|
||||
|
|
@ -43,6 +30,8 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import i18n from '../../i18n';
|
||||
import { kinds } from '../../../../server/api/kinds';
|
||||
|
||||
export default Vue.extend({
|
||||
i18n: i18n('dev/views/new-app.vue'),
|
||||
data() {
|
||||
|
|
@ -51,7 +40,8 @@ export default Vue.extend({
|
|||
description: '',
|
||||
cb: '',
|
||||
nidState: null,
|
||||
permission: []
|
||||
permission: [],
|
||||
permissionsList: kinds
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<span :data-active="src == 'messages'" @click="src = 'messages'"><fa :icon="['far', 'envelope']"/> {{ $t('messages') }}<i class="badge" v-if="$store.state.i.hasUnreadSpecifiedNotes"><fa icon="circle"/></i></span>
|
||||
<template v-if="lists">
|
||||
<div class="hr" v-if="lists.length > 0"></div>
|
||||
<span v-for="l in lists" :data-active="src == 'list' && list == l" @click="src = 'list'; list = l" :key="l.id"><fa icon="list"/> {{ l.title }}</span>
|
||||
<span v-for="l in lists" :data-active="src == 'list' && list == l" @click="src = 'list'; list = l" :key="l.id"><fa icon="list"/> {{ l.name }}</span>
|
||||
</template>
|
||||
<div class="hr" v-if="$store.state.settings.tagTimelines && $store.state.settings.tagTimelines.length > 0"></div>
|
||||
<span v-for="tl in $store.state.settings.tagTimelines" :data-active="src == 'tag' && tagTl == tl" @click="src = 'tag'; tagTl = tl" :key="tl.id"><fa icon="hashtag"/> {{ tl.title }}</span>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ export default Vue.extend({
|
|||
mounted() {
|
||||
this.$root.api('users/notes', {
|
||||
userId: this.user.id,
|
||||
untilDate: new Date().getTime() + 1000 * 86400 * 365
|
||||
}).then(notes => {
|
||||
this.notes = notes;
|
||||
this.fetching = false;
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ export default Vue.extend({
|
|||
fileType: image,
|
||||
excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
|
||||
limit: 9,
|
||||
untilDate: new Date().getTime() + 1000 * 86400 * 365
|
||||
}).then(notes => {
|
||||
for (const note of notes) {
|
||||
for (const file of note.files) {
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ export class AppRepository extends Repository<App> {
|
|||
return {
|
||||
id: app.id,
|
||||
name: app.name,
|
||||
callbackUrl: app.callbackUrl,
|
||||
...(opts.includeSecret ? { secret: app.secret } : {}),
|
||||
...(me ? {
|
||||
isAuthorized: await AccessTokens.count({
|
||||
|
|
|
|||
|
|
@ -14,7 +14,8 @@ export class AuthSessionRepository extends Repository<AuthSession> {
|
|||
|
||||
return await rap({
|
||||
id: session.id,
|
||||
app: Apps.pack(session.appId, me)
|
||||
app: Apps.pack(session.appId, me),
|
||||
token: session.token
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ export class DriveFileRepository extends Repository<DriveFile> {
|
|||
}
|
||||
|
||||
public getPublicUrl(file: DriveFile, thumbnail = false): string | null {
|
||||
return thumbnail ? (file.thumbnailUrl || file.webpublicUrl || null) : (file.webpublicUrl || file.thumbnailUrl || file.url);
|
||||
return thumbnail ? (file.thumbnailUrl || file.webpublicUrl || null) : (file.webpublicUrl || file.url);
|
||||
}
|
||||
|
||||
public async clacDriveUsageOf(user: User['id'] | User): Promise<number> {
|
||||
|
|
|
|||
|
|
@ -115,3 +115,8 @@ export function cumulativeSum(xs: number[]): number[] {
|
|||
for (let i = 1; i < ys.length; i++) ys[i] += ys[i - 1];
|
||||
return ys;
|
||||
}
|
||||
|
||||
// Object.fromEntries()
|
||||
export function fromEntries(xs: [string, any][]): { [x: string]: any; } {
|
||||
return xs.reduce((obj, [k, v]) => Object.assign(obj, { [k]: v }), {} as { [x: string]: any; });
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import $ from 'cafy';
|
|||
import define from '../../define';
|
||||
import { Apps } from '../../../../models';
|
||||
import { genId } from '../../../../misc/gen-id';
|
||||
import { unique } from '../../../../prelude/array';
|
||||
|
||||
export const meta = {
|
||||
tags: ['app'],
|
||||
|
|
@ -34,6 +35,9 @@ export default define(meta, async (ps, user) => {
|
|||
// Generate secret
|
||||
const secret = rndstr('a-zA-Z0-9', 32);
|
||||
|
||||
// for backward compatibility
|
||||
const permission = unique(ps.permission.map(v => v.replace(/^(.+)(\/|-)(read|write)$/, '$3:$1')));
|
||||
|
||||
// Create account
|
||||
const app = await Apps.save({
|
||||
id: genId(),
|
||||
|
|
@ -41,7 +45,7 @@ export default define(meta, async (ps, user) => {
|
|||
userId: user ? user.id : null,
|
||||
name: ps.name,
|
||||
description: ps.description,
|
||||
permission: ps.permission,
|
||||
permission,
|
||||
callbackUrl: ps.callbackUrl,
|
||||
secret: secret
|
||||
});
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'favorites-read',
|
||||
kind: 'read:favorites',
|
||||
|
||||
params: {
|
||||
limit: {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'messaging-read',
|
||||
kind: 'read:messaging',
|
||||
|
||||
params: {
|
||||
limit: {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'messaging-read',
|
||||
kind: 'read:messaging',
|
||||
|
||||
params: {
|
||||
userId: {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'messaging-write',
|
||||
kind: 'write:messaging',
|
||||
|
||||
params: {
|
||||
userId: {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'messaging-write',
|
||||
kind: 'write:messaging',
|
||||
|
||||
limit: {
|
||||
duration: ms('1hour'),
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'messaging-write',
|
||||
kind: 'write:messaging',
|
||||
|
||||
params: {
|
||||
messageId: {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'favorite-write',
|
||||
kind: 'write:favorites',
|
||||
|
||||
params: {
|
||||
noteId: {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'favorite-write',
|
||||
kind: 'write:favorites',
|
||||
|
||||
params: {
|
||||
noteId: {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ export default define(meta, async (ps, user) => {
|
|||
const day = 1000 * 60 * 60 * 24 * 3; // 3日前まで
|
||||
|
||||
const query = Notes.createQueryBuilder('note')
|
||||
.addSelect('note.score')
|
||||
.where('note.userHost IS NULL')
|
||||
.andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) })
|
||||
.andWhere(`note.visibility = 'public'`)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ export const meta = {
|
|||
|
||||
requireCredential: true,
|
||||
|
||||
kind: 'vote-write',
|
||||
kind: 'write:votes',
|
||||
|
||||
params: {
|
||||
noteId: {
|
||||
|
|
|
|||
22
src/server/api/kinds.ts
Normal file
22
src/server/api/kinds.ts
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
export const kinds = [
|
||||
'read:account',
|
||||
'write:account',
|
||||
'read:blocks',
|
||||
'write:blocks',
|
||||
'read:drive',
|
||||
'write:drive',
|
||||
'read:favorites',
|
||||
'write:favorites',
|
||||
'read:following',
|
||||
'write:following',
|
||||
'read:messaging',
|
||||
'write:messaging',
|
||||
'read:mutes',
|
||||
'write:mutes',
|
||||
'write:notes',
|
||||
'read:notifications',
|
||||
'write:notifications',
|
||||
'read:reactions',
|
||||
'write:reactions',
|
||||
'write:votes'
|
||||
];
|
||||
|
|
@ -1,6 +1,49 @@
|
|||
import config from '../../../config';
|
||||
import endpoints from '../endpoints';
|
||||
import * as locale from '../../../../locales/';
|
||||
import { fromEntries } from '../../../prelude/array';
|
||||
import { kinds as kindsList } from '../kinds';
|
||||
|
||||
export interface IKindInfo {
|
||||
endpoints: string[];
|
||||
descs: { [x: string]: string; };
|
||||
}
|
||||
|
||||
export function kinds() {
|
||||
const kinds = fromEntries(
|
||||
kindsList
|
||||
.map(k => [k, {
|
||||
endpoints: [],
|
||||
descs: fromEntries(
|
||||
Object.keys(locale)
|
||||
.map(l => [l, locale[l].common.permissions[k] as string] as [string, string])
|
||||
) as { [x: string]: string; }
|
||||
}] as [ string, IKindInfo ])
|
||||
) as { [x: string]: IKindInfo; };
|
||||
|
||||
const errors = [] as string[][];
|
||||
|
||||
for (const endpoint of endpoints.filter(ep => !ep.meta.secure)) {
|
||||
if (endpoint.meta.kind) {
|
||||
const kind = endpoint.meta.kind;
|
||||
if (kind in kinds) kinds[kind].endpoints.push(endpoint.name);
|
||||
else errors.push([kind, endpoint.name]);
|
||||
}
|
||||
}
|
||||
|
||||
if (errors.length > 0) throw Error('\n ' + errors.map((e) => `Unknown kind (permission) "${e[0]}" found at ${e[1]}.`).join('\n '));
|
||||
|
||||
return kinds;
|
||||
}
|
||||
|
||||
export function getDescription(lang = 'ja-JP'): string {
|
||||
const permissionTable = (Object.entries(kinds()) as [string, IKindInfo][])
|
||||
.map(e => `|${e[0]}|${e[1].descs[lang]}|${e[1].endpoints.map(f => `[${f}](#operation/${f})`).join(', ')}|`)
|
||||
.join('\n');
|
||||
|
||||
const descriptions = {
|
||||
'ja-JP': `**Misskey is a decentralized microblogging platform.**
|
||||
|
||||
export const description = `
|
||||
## Usage
|
||||
**APIはすべてPOSTでリクエスト/レスポンスともにJSON形式です。**
|
||||
一部のAPIはリクエストに認証情報(APIキー)が必要です。リクエストの際に\`i\`というパラメータでAPIキーを添付してください。
|
||||
|
|
@ -44,4 +87,12 @@ APIキーの生成方法を擬似コードで表すと次のようになりま
|
|||
\`\`\` js
|
||||
const i = sha256(userToken + secretKey);
|
||||
\`\`\`
|
||||
`;
|
||||
|
||||
## Permissions
|
||||
|Permisson (kind)|Description|Endpoints|
|
||||
|:--|:--|:--|
|
||||
${permissionTable}
|
||||
`
|
||||
} as { [x: string]: string };
|
||||
return lang in descriptions ? descriptions[lang] : descriptions['ja-JP'];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { Context } from 'cafy';
|
|||
import config from '../../../config';
|
||||
import { errors as basicErrors } from './errors';
|
||||
import { schemas } from './schemas';
|
||||
import { description } from './description';
|
||||
import { getDescription } from './description';
|
||||
import { convertOpenApiSchema } from '../../../misc/schema';
|
||||
|
||||
export function genOpenapiSpec(lang = 'ja-JP') {
|
||||
|
|
@ -13,7 +13,7 @@ export function genOpenapiSpec(lang = 'ja-JP') {
|
|||
info: {
|
||||
version: 'v1',
|
||||
title: 'Misskey API',
|
||||
description: '**Misskey is a decentralized microblogging platform.**\n\n' + description,
|
||||
description: getDescription(lang),
|
||||
'x-logo': { url: '/assets/api-doc.png' }
|
||||
},
|
||||
|
||||
|
|
@ -110,7 +110,10 @@ export function genOpenapiSpec(lang = 'ja-JP') {
|
|||
|
||||
let desc = (endpoint.meta.desc ? endpoint.meta.desc[lang] : 'No description provided.') + '\n\n';
|
||||
desc += `**Credential required**: *${endpoint.meta.requireCredential ? 'Yes' : 'No'}*`;
|
||||
if (endpoint.meta.kind) desc += ` / **Permission**: *${endpoint.meta.kind}*`;
|
||||
if (endpoint.meta.kind) {
|
||||
const kind = endpoint.meta.kind;
|
||||
desc += ` / **Permission**: *${kind}*`;
|
||||
}
|
||||
|
||||
const info = {
|
||||
operationId: endpoint.name,
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@ export default (
|
|||
noteId: Note['id']
|
||||
) => new Promise<any>(async (resolve, reject) => {
|
||||
// Remove document
|
||||
const res = await NoteUnreads.delete({
|
||||
/*const res = */await NoteUnreads.delete({
|
||||
userId: userId,
|
||||
noteId: noteId
|
||||
});
|
||||
|
||||
// v11 TODO: https://github.com/typeorm/typeorm/issues/2415
|
||||
if (res.affected == 0) {
|
||||
return;
|
||||
}
|
||||
//if (res.affected == 0) {
|
||||
// return;
|
||||
//}
|
||||
|
||||
const count1 = await NoteUnreads.count({
|
||||
userId: userId,
|
||||
|
|
|
|||
|
|
@ -792,7 +792,7 @@ describe('API', () => {
|
|||
parentId: folderA.id
|
||||
}, arisugawa);
|
||||
|
||||
expect(res).have.status(400);
|
||||
assert.strictEqual(res.status, 400);
|
||||
}));
|
||||
|
||||
it('存在しない親フォルダを設定できない', async(async () => {
|
||||
|
|
|
|||
|
|
@ -1141,7 +1141,7 @@ describe('MFM', () => {
|
|||
it('exlude emotes', () => {
|
||||
const tokens = parse('*.*');
|
||||
assert.deepStrictEqual(tokens, [
|
||||
text("*.*"),
|
||||
text('*.*'),
|
||||
]);
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue