graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-24 20:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2021-01-23 16:52:50 +09:00
commit fe52f7c392
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/client/pages/my-groups/group.vue
View file

@ -45,6 +45,13 @@ export default defineComponent({
MkButton MkButton
}, },
props: {
groupId: {
type: String,
required: true,
},
},
data() { data() {
return { return {
INFO: computed(() => this.group ? { INFO: computed(() => this.group ? {
@ -58,7 +65,7 @@ export default defineComponent({
}, },
watch: { watch: {
$route: 'fetch' groupId: 'fetch',
}, },
created() { created() {
@ -69,7 +76,7 @@ export default defineComponent({
fetch() { fetch() {
Progress.start(); Progress.start();
os.api('users/groups/show', { os.api('users/groups/show', {
groupId: this.$route.params.group groupId: this.groupId
}).then(group => { }).then(group => {
this.group = group; this.group = group;
os.api('users/show', { os.api('users/show', {

2
src/client/router.ts
View file

@ -55,7 +55,7 @@ export const router = createRouter({
{ path: '/my/lists', component: page('my-lists/index') }, { path: '/my/lists', component: page('my-lists/index') },
{ path: '/my/lists/:list', component: page('my-lists/list') }, { path: '/my/lists/:list', component: page('my-lists/list') },
{ path: '/my/groups', component: page('my-groups/index') }, { path: '/my/groups', component: page('my-groups/index') },
{ path: '/my/groups/:group', component: page('my-groups/group') }, { path: '/my/groups/:group', component: page('my-groups/group'), props: route => ({ groupId: route.params.group }) },
{ path: '/my/antennas', component: page('my-antennas/index') }, { path: '/my/antennas', component: page('my-antennas/index') },
{ path: '/my/clips', component: page('my-clips/index') }, { path: '/my/clips', component: page('my-clips/index') },
{ path: '/scratchpad', component: page('scratchpad') }, { path: '/scratchpad', component: page('scratchpad') },

2
src/server/api/endpoints/i/registry/remove.ts
View file

@ -41,5 +41,5 @@ export default define(meta, async (ps, user) => {
throw new ApiError(meta.errors.noSuchKey); throw new ApiError(meta.errors.noSuchKey);
} }
RegistryItems.remove(item); await RegistryItems.remove(item);
}); });