@@ -85,30 +85,46 @@ export default Vue.extend({
};
},
+ computed: {
+ path(): string {
+ return this.username + '/' + this.pageName;
+ }
+ },
+
+ watch: {
+ path() {
+ this.fetch();
+ }
+ },
+
created() {
- this.$root.api('pages/show', {
- name: this.pageName,
- username: this.username,
- }).then(page => {
- this.page = page;
- this.$emit('init', {
- title: this.page.title,
- icon: faStickyNote
- });
- const pageVars = this.getPageVars();
- this.script = new Script(new ASEvaluator(this.page.variables, pageVars, {
- randomSeed: Math.random(),
- user: page.user,
- visitor: this.$store.state.i,
- page: page,
- url: url
- }), e => {
- console.dir(e);
- });
- });
+ this.fetch();
},
methods: {
+ fetch() {
+ this.$root.api('pages/show', {
+ name: this.pageName,
+ username: this.username,
+ }).then(page => {
+ this.page = page;
+ this.$emit('init', {
+ title: this.page.title,
+ icon: faStickyNote
+ });
+ const pageVars = this.getPageVars();
+ this.script = new Script(new ASEvaluator(this.page.variables, pageVars, {
+ randomSeed: Math.random(),
+ user: page.user,
+ visitor: this.$store.state.i,
+ page: page,
+ url: url
+ }), e => {
+ console.dir(e);
+ });
+ });
+ },
+
getPageVars() {
return collectPageVars(this.page.content);
},
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index fb1e7e13ec..ae1446b934 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -282,7 +282,7 @@ export default class MiOS extends EventEmitter {
// トークンが再生成されたとき
// このままではMisskeyが利用できないので強制的にサインアウトさせる
main.on('myTokenRegenerated', () => {
- alert(locale['common']['my-token-regenerated'])
+ alert(locale['common']['my-token-regenerated']);
this.signout();
});
}
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index b137f79989..f229a2b7be 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -31,12 +31,8 @@ const defaultSettings = {
wallpaper: null,
webSearchEngine: 'https://www.google.com/?#q={{query}}',
mutedWords: [],
- games: {
- reversi: {
- showBoardLabels: false,
- useAvatarStones: true,
- }
- }
+ gamesReversiShowBoardLabels: false,
+ gamesReversiUseAvatarStones: true,
};
const defaultDeviceSettings = {
diff --git a/src/models/repositories/note.ts b/src/models/repositories/note.ts
index 7b46276930..e5bf8d3f3a 100644
--- a/src/models/repositories/note.ts
+++ b/src/models/repositories/note.ts
@@ -165,6 +165,7 @@ export class NoteRepository extends Repository
{
renoteCount: note.renoteCount,
repliesCount: note.repliesCount,
reactions: note.reactions,
+ tags: note.tags.length > 0 ? note.tags : undefined,
emojis: reactionEmojis.length > 0 ? Emojis.find({
name: In(reactionEmojis),
host: host
diff --git a/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/src/server/api/endpoints/admin/drive/clean-remote-files.ts
index a861052bbe..69cfe0db94 100644
--- a/src/server/api/endpoints/admin/drive/clean-remote-files.ts
+++ b/src/server/api/endpoints/admin/drive/clean-remote-files.ts
@@ -12,7 +12,8 @@ export const meta = {
export default define(meta, async (ps, me) => {
const files = await DriveFiles.find({
- userHost: Not(IsNull())
+ userHost: Not(IsNull()),
+ isLink: false,
});
for (const file of files) {
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts
index 6cd84b866f..46db274581 100644
--- a/src/server/api/endpoints/notes/create.ts
+++ b/src/server/api/endpoints/notes/create.ts
@@ -40,7 +40,7 @@ export const meta = {
params: {
visibility: {
- validator: $.optional.str.or(['public', 'home', 'followers', 'specified', 'private']),
+ validator: $.optional.str.or(['public', 'home', 'followers', 'specified']),
default: 'public',
desc: {
'ja-JP': '投稿の公開範囲'
