Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Charlotte
Sharkey
Commits
54d0a463
Unverified
Commit
54d0a463
authored
8 months ago
by
taichan
Committed by
GitHub
8 months ago
Browse files
Options
Downloads
Patches
Plain Diff
fix(frontend): 個人宛てダイアログお知らせが即時表示されない問題 (#14260)
* fix(frontend): 個人向けお知らせが即時ダイアログで出ない問題 * Update CHANGELOG
parent
615e60f2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
packages/frontend/src/boot/main-boot.ts
+8
-2
8 additions, 2 deletions
packages/frontend/src/boot/main-boot.ts
with
9 additions
and
2 deletions
CHANGELOG.md
+
1
−
0
View file @
54d0a463
...
...
@@ -43,6 +43,7 @@
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/574)
-
Fix: Twitchの埋め込みが開けない問題を修正
-
Fix: 子メニューの高さがウィンドウからはみ出ることがある問題を修正
-
Fix: 個人宛てのダイアログ形式のお知らせが即時表示されない問題を修正
### Server
-
Feat: レートリミット制限に引っかかったときに
`Retry-After`
ヘッダーを返すように (#13949)
...
...
This diff is collapsed.
Click to expand it.
packages/frontend/src/boot/main-boot.ts
+
8
−
2
View file @
54d0a463
...
...
@@ -5,6 +5,7 @@
import
{
createApp
,
defineAsyncComponent
,
markRaw
}
from
'
vue
'
;
import
{
common
}
from
'
./common.js
'
;
import
type
*
as
Misskey
from
'
misskey-js
'
;
import
{
ui
}
from
'
@/config.js
'
;
import
{
i18n
}
from
'
@/i18n.js
'
;
import
{
alert
,
confirm
,
popup
,
post
,
toast
}
from
'
@/os.js
'
;
...
...
@@ -113,7 +114,7 @@ export async function mainBoot() {
});
}
stream
.
on
(
'
a
nnouncementCreated
'
,
(
ev
)
=>
{
function
onA
nnouncementCreated
(
ev
:
{
announcement
:
Misskey
.
entities
.
Announcement
})
{
const
announcement
=
ev
.
announcement
;
if
(
announcement
.
display
===
'
dialog
'
)
{
const
{
dispose
}
=
popup
(
defineAsyncComponent
(()
=>
import
(
'
@/components/MkAnnouncementDialog.vue
'
)),
{
...
...
@@ -122,7 +123,9 @@ export async function mainBoot() {
closed
:
()
=>
dispose
(),
});
}
});
}
stream
.
on
(
'
announcementCreated
'
,
onAnnouncementCreated
);
if
(
$i
.
isDeleted
)
{
alert
({
...
...
@@ -315,6 +318,9 @@ export async function mainBoot() {
updateAccount
({
hasUnreadAnnouncement
:
false
});
});
// 個人宛てお知らせが発行されたとき
main
.
on
(
'
announcementCreated
'
,
onAnnouncementCreated
);
// トークンが再生成されたとき
// このままではMisskeyが利用できないので強制的にサインアウトさせる
main
.
on
(
'
myTokenRegenerated
'
,
()
=>
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment