HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions
26619 commits 62 branches 1619 tags 552 MiB
Commit graph

2279 commits

Author SHA1 Message Date
Marie
8f6dfa611e fix: keep alt text of file if present 2024-02-13 22:01:53 +00:00
Marie
8b90c6c045 merge: Never return broken notifications #409 (!415) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/415

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-13 18:23:37 +00:00
tamaina
c1514ce91d (re) update SPDX-FileCopyrightText 
Fix  #13290
 2024-02-13 15:59:27 +00:00
tamaina
311c2172d7 Revert "update SPDX-FileCopyrightText" 
This reverts commit 9b5aeb76d8.
 2024-02-13 15:50:11 +00:00
dakkar
1015901a9d avoid parsing undefined 
I don't understand why upstream wouldn't have this same problem ☹

We already have this same conditional in `ApRenderService.renderNote`
and `ApRenderService.renderUpNote`, and Misskey doesn't
 2024-02-13 14:04:07 +00:00
Marie
fef5dbb6e2 fix: note edits being federated incorrectly 2024-02-13 13:08:44 +00:00
Acid Chicken (硫酸鶏)
309a943528
perf: omit search for immutable static requests (#13265) 
* perf: omit search for immutable static requests

* perf: also applies to /files

* fix: exclude /proxy

* /files/:key/*を301 redirectに

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-02-13 10:43:06 +09:00
tamaina
32c5c43b6d
enhance: 禁止ワードはリモートノートも対象に (#13280) 
Resolve #13279
 2024-02-13 04:54:01 +09:00
syuilo
a1e12c0ec3 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-02-12 11:37:55 +09:00
syuilo
9b5aeb76d8 update SPDX-FileCopyrightText 2024-02-12 11:37:45 +09:00
Acid Chicken (硫酸鶏)
3dc095d1c9
feat: provide tarball (#13260) 
* feat: provide tarball

* build: pack on build-assets

* chore: use ignore-walk

* chore: debug

* build: dependencies
 2024-02-12 10:02:27 +09:00
dakkar
421f8d49e5 Never return broken notifications #409 
Since notifications are stored in Redis, we can't expect relational
integrity: deleting a user will *not* delete notifications that
mention it.

But if we return notifications with missing bits (a `follow` without a
`user`, for example), the frontend will get very confused and throw an
exception while trying to render them.

This change makes sure we never expose those broken notifications. For
uniformity, I've applied the same logic to notes and roles mentioned
in notifications, even if nobody reported breakage in those cases.

Tested by creating a few types of notifications with a `notifierId`,
then deleting their user.
 2024-02-11 12:25:50 +00:00
Marie
2e7df3297c
fix: diff between NoteCreateService and NoteEditService 2024-02-09 19:51:41 +01:00
Marie
85355813ad
merge: latest changes 2024-02-09 19:22:06 +01:00
syuilo
7fc1d77893 update deps 2024-02-09 17:10:16 +09:00
おさむのひと
614c9a0fc6
fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 (#13210) 
* fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加

* Serviceでチェックするように変更
 2024-02-09 10:07:18 +09:00
かっこかり
0f7918c51b
refactor(backend): exist -> exists (#13203) 
* refactor(backend): exist -> exists

* fix
 2024-02-08 16:04:41 +09:00
Marie
af5ebdfced
merge: more upstream changes 2024-02-07 21:52:27 +01:00
MeiMei
e89d760240
Enhance: 連合向けのノート配信を軽量化 (#13192) 
* AP HTML表現をシンプルに

* a

* CHANGELOG

* リンク
 2024-02-07 19:57:59 +09:00
Marie
6a94a52131
merge: upstream 2024-02-06 21:23:37 +01:00
MeiMei
d6cb68b091
AP Key の JSON-LD 表現を修正 (#13170) 2024-02-06 16:51:14 +09:00
1Step621
74245df382
Enhance(frontend): フロント側でもリアクション権限のチェックをするように (#13134) 
* フロント側でもリアクション権限のチェックをするように

* update CHANGELOG.md

* lint fixes

* remove unrelated diffs

* deny -> reject
denyは「(信用しないことを理由に)拒否する」という意味らしい

* allow -> accept

* EmojiSimpleにlocalOnlyを含めるように

* リアクション権限のない絵文字は打てないように(ダイアログを出すのではなく)

* regenerate type definitions

* lint fix

* remove unused locales

* remove unnecessary async
 2024-02-06 16:45:21 +09:00
Marie
0aadc302c3 fix: quote being returned as null instead of false on mastodon api 2024-02-05 19:38:00 +00:00
Gianni Ceccarelli
dabf1867fd
keep cached avatar&banner when refresh fails to get new values (#13145) 
* keep cached avatar&banner when refresh fails to get new values

when the remote explicitly tells us a user image is gone, we remove
our cached value, but if we fail to get the image, we keep whatever
value we already have

this should minimise the problem of avatars randomly disappearing

* autogen bits

* pnpm run build-misskey-js-with-types

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-02-04 21:03:49 +09:00
Gianni Ceccarelli
bafef1f8b4
ignore instance.actor when checking if there are local users (#13146) 
* ignore `instance.actor` when checking if there are local users

We've seen this happen a few times:

* there was some AP software at $some_domain
* it gets replaced by Misskey
* before the first user can be created, an AP activity comes in
* Misskey resolves the activity
* to do this, it creates the `instance.actor` to sign its request
* now there *is* a local user, so the `meta` endpoint returns
  `requireSetup:false`
* the admin is very confused

This commit factors out the check, and doesn't count the
`instance.actor` as a real user.

* autogen bits
 2024-02-04 20:46:28 +09:00
atsuchan
2c4ba4723f
fix(backend): メール配信機能が無効ならばメールを送ることのないように (#13152) 
Do not send email if email delivery is disabled
 2024-02-04 20:44:35 +09:00
Marie
11628e4b6a
merge: upstream 2024-02-03 20:19:44 +01:00
Marie
f93a8e2d38 merge: Fix sfm-js linkage (!399) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/399

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-03 18:28:47 +00:00
Marie
d3d0e510d8 merge: DeepLX-JS support (!396) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/396

Closes #324

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-03 17:54:59 +00:00
Marie
469c3f3f1a
upd: remove https 2024-02-03 18:41:47 +01:00
Marie
75bce2228f merge: some fixes to NoteEdit and muting (!376) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/376

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-03 17:25:17 +00:00
Marie
f091b84c6e
chore: change sfm registry and name 2024-02-03 15:01:09 +01:00
dakkar
4bc517ca89 import fs/promises the right way 
thanks Marie
 2024-02-03 12:55:56 +00:00
dakkar
bb3694bfed lint 2024-02-03 12:55:46 +00:00
dakkar
1bb5021c54 decode entity references from tweets 
apparently *some* tweets have those ☹
 2024-02-03 12:05:08 +00:00
dakkar
a981bca7a3 simpler logic 
thanks Alina
 2024-02-03 11:37:20 +00:00
dakkar
3a3a051bb5 make almost all fs ops async 
there's no `fs.promises.exists`
 2024-02-03 11:33:42 +00:00
dakkar
7684f45a5e simpler mapping 
thanks Alina
 2024-02-03 11:30:39 +00:00
dakkar
25948c9232 simpler json-isation 
thanks Alina for the suggestion
 2024-02-03 11:29:46 +00:00
yukineko
d8bdbd53ed
fix: api-docが開けない問題を修正 (#13132) 
* refactor: 自己参照を使用している箇所に`selfRef`を持たせるように

* feat: スキーマ生成時に自己参照を含むかどうかを指定できるように

* fix: api.jsonにselfRefが含まれているのを修正

* refactor: 他の箇所と同様にselfRefの除去を行うように

* remove: 不要なimportを削除
 2024-02-02 12:47:07 +09:00
おさむのひと
85809a240e
fix(backend): "誰でも新規登録できるようにする"の初期値をOFFにする (#13130) 
* fix(backend): "誰でも新規登録できるようにする"の初期値をOFFにする

* fix CHANGELOG.md

* fix
 2024-02-02 11:24:45 +09:00
KevinWh0
2a8e93e4be Fixed code injection from twitter import 2024-02-01 15:58:50 +01:00
tamaina
b0a38c0cae
fix: Hide reactions of all remote users / feat: moderators can see reactions of all users (#13128) 
* fix: Hide reactions of all remote users
https://github.com/misskey-dev/misskey/issues/12964

* feat: Moderators can see reactions of all users
https://github.com/misskey-dev/misskey/issues/13127

* modify CHANGELOG.md

* fix iAmModerator
 2024-02-01 20:05:45 +09:00
zyoshoka
2db5b61616
refactor(backend): User関連のスキーマ/型の指定を強くする (#12808) 
* refactor(backend): User関連のスキーマ/型の指定を強くする

* refactor(backend): `pack()`の引数にスキーマを指定するように

* chore: fix ci

* fix: 変更漏れ

* fix ci

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-31 15:45:35 +09:00
syuilo
e90dea4be9 update deps 2024-01-30 20:59:44 +09:00
yukineko
a6a91fec3a
refactor: frontendのcomponentsの型エラーを改善 (#12926) 
* add: safeFloatParserを追加

* fix: 欠けていた型を追加

* refactor: pageBlockTypesをjson-schemaに移植

* refactor: components/global内の型エラーが出ている箇所を修正

* lint: fix null check style

* refactor: fix type error

* refactor: fix some type errors

* fix: 翻訳が抜けていた箇所を修正

* refactor: getJsonSchemaで正しいスキーマが返されるように修正

* fix: MkChartの型エラーとbytesオプションが機能していない問題を修正

* fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正

* refactor: fix some type errors

* change: Captcha読み込み中の文言をLoadingに変更

* refactor(backend/misskey-js): MainEventの型を改善

* refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正

* update: misskey-js.api.md

* refactor: fix some type errors

* fix: backendのtypecheckが落ちていたのを修正

* update: misskey-js.api.md

* add: json-schemaのnoteにpollの型定義を追加

* refactor: noteのjson-schemaの型を改善

* refactor: MkPoll

* refactor: fix some type errors

* change: UserLiteにisLockedを持たせるように

* fix: notificationスキーマにroleが含まれていないのを修正

* Revert "change: UserLiteにisLockedを持たせるように"

This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5.

* fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正

* refactor: noteスキーマのvisibilityにenumを追加

* change: deepCloneのCloneableTypeにundefinedを追加

* refactor: fix some type errors

* refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え

* enhance: API 'retension' のresponseの型を追加

* fix: Chart関連のtooltipが正しい位置に表示されない問題を修正

* refactor: fix some type errors

* fix: 型情報が不足していたのを修正

* enhance: announcementスキーマにenumを追加

* enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植

* refactor: policiesを`ref: RolePolicies`に統一

* fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正

* refactor: fix some type errors

* fix: backendのlintが落ちているのを修正

* fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正

* fix: backendのtypecheckが落ちているのを修正

* update: run build-misskey-js-with-types

* fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正

* update: CHANGELOG.md

* refactor: MkUserSelectDialogの型を改善

* fix: deepCloneでundefinedはcloneしないように (#9207)

* change: frontendのcloneをbackend側にも反映

* update: CHANGELOG.md

* fix: RoleServiceからPackを通して型RolePoliciesに依存させないように

* Update packages/frontend/src/scripts/get-note-summary.ts

* revert RoleService.ts changes

* change:  optional chaining -> non-null assertion

* remove: unused import

* fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正

* change: fix null check style

* refactor: fix type error

* change: fix null check style

* Update packages/frontend/src/components/MkDrive.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* refactor: css moduleでglobalを使わないように

* refactor: roleのiconUrlは必ず存在するものとして扱うように

* enhance: MenuButtonのactiveにcomputedを受け付けられるように

* Update packages/frontend/src/components/MkNotePreview.vue

* Update MkWindow.vue

* refactor: notification.noteは必ず存在するものとして扱うように

* Update packages/frontend/src/components/MkNotification.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正

* Update packages/frontend/src/scripts/clone.ts

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* refactor: 不要な返り値の型を削除

* refactor: 不要なnullチェックを削除

* update: misskey-js-autogen

* update: clone.ts

* refactor

* Update MkNotification.vue

* Update MkNotification.vue

* ✌️

* Update MkNotification.vue

* Update MkNotification.vue

* Update MkNotification.vue

* Update MkNotifications.vue

* Update MkUserSetupDialog.Profile.vue

* Update MkUserCardMini.vue

* ✌️

* Update MkMenu.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-30 19:53:53 +09:00
dakkar
b77c025245 link twitter names to twitter, not nitter #382 
nitter seems very dead
 2024-01-28 16:06:16 +00:00
woxtu
cdac3988b5
fix(backend): Fix typos in job configurations (#13086) 
* Fix typos

* Update CHANGELOG
 2024-01-28 15:08:45 +09:00
Marie
c6e3ec07d1
add: DeepLX-JS support 
Closes #324
 2024-01-26 21:29:38 +01:00
dakkar
e93e73673a probably more correct muting logic 
we want to notify if neither the thread nor the user are muted;
otherwise, for example, notes in a muted thread from a non-muted user
would get notified
 2024-01-26 18:09:25 +00:00
dakkar
b0fcc11d9e null-ify text after trimming 
this comes from upstream, it's already present in the "import"
section, I think it was missed in a merge
 2024-01-26 18:07:49 +00:00
dakkar
83e9057b27 apply to NoteEditService all recent changes from NoteCreateService 2024-01-26 18:07:34 +00:00
Marie
e5c060eecf
fix: don't show mentions and boosts towards muted user posts in timeline 
Closes #336
 2024-01-26 01:59:19 +01:00
Marie
c8c505fb92
fix: allow viewing of muted users posts 
This would allow admins and mods to see muted users posts as well as normal users to view them if they ever get a link sent to them.
 2024-01-26 01:39:53 +01:00
Marie
47cf7f6822
fix: don't show replies to muted users in timelines 
Closes #337
 2024-01-26 01:39:01 +01:00
Marie
6c6ccdc1e0
fix: properly mute notifications when mentioned by muted users 
Closes #339
 2024-01-26 01:24:26 +01:00
Marie
1bec69df16
fix: reactions being shown on muted/blocked users 
Closes #342
 2024-01-26 01:00:12 +01:00
Marie
e89f4ff3c8
fix: boosts not being muted when muting thread 
Closes #347
 2024-01-25 19:39:41 +01:00
Marie
913dd581ef
merge: upstream 2024-01-25 14:21:42 +01:00
Marie
92ee0a5863
fix: notes/versions not checking visibility 
Issue reported by fEmber
 2024-01-25 14:17:57 +01:00
syuilo
60156a40b2 fix(reversi/backend): refactor and fixes 2024-01-24 16:44:12 +09:00
syuilo
5719a929ad enhance(reversi): 変則なしマッチングを可能に 2024-01-24 16:37:06 +09:00
syuilo
d27b3525cd enhance(reversi): improve matching system 2024-01-24 15:18:50 +09:00
syuilo
a97d4fa4ef fix(reversi): wait redis operation to improve stability 2024-01-24 13:53:55 +09:00
syuilo
908e0f3b8b perf(reversi): set expire matchSpecific and matchAny 2024-01-24 13:51:16 +09:00
syuilo
b68446b289 enhance(reversi): tweak MATCHING_TIMEOUT_MS 2024-01-24 13:32:08 +09:00
syuilo
547be1973d fix of 65557d5f27 2024-01-24 10:35:44 +09:00
syuilo
65557d5f27 enhance(reversi): more robust matching process 2024-01-24 10:16:05 +09:00
syuilo
cc420c245f enhance(reversi): 準備中の自分の対局も一覧に表示するように 2024-01-24 09:41:22 +09:00
syuilo
e8ba0b3f54 enhance(reversi): improve desync handling 2024-01-23 10:51:59 +09:00
Marie
d15e4a85bb
chore: typecheck 2024-01-22 22:13:10 +01:00
Marie
fd69a2fbbd
merge: upstream 2024-01-22 19:58:43 +01:00
syuilo
e0ad066382 fix lint 2024-01-22 18:32:32 +09:00
おさむのひと
850d38414e
fix: 2024-01-22 10:50時点のdevelopにてCIがコケている (#13060) 
* fix: バブルゲームのビルド失敗修正

* fix: api.jsonの定義誤りを修正

* fix: lint.yml(typecheck)

* fix: fix eslint error

* fix: frontend vitest version

* fix: frontend vitest version

* fix:

* fix: cypress

* fix: misskey-js test

* fix: misskey-js tsd(tsdはpakcage.jsonのexportsをサポートしない？)

* fix: conflict

* fix: 間違えて上書きしたところを修正

* fix: 再

* fix: api.json

* fix: api.json

* fix: タイムアウト延長

* Update packages/misskey-js/jest.config.cjs

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
 2024-01-22 18:01:54 +09:00
syuilo
d380ed36de fix lint 2024-01-22 18:00:46 +09:00
syuilo
5c8888d6a8 enhance(reversi): render ogp 2024-01-22 17:59:12 +09:00
syuilo
4af3640bd3 fix lint 2024-01-22 17:44:03 +09:00
syuilo
94e282b612 perf(reversi): improve performance of reversi backend 2024-01-22 15:41:29 +09:00
syuilo
259992c65f enhance(reversi): some tweaks 2024-01-22 12:03:32 +09:00
syuilo
a431dde537 refactor(reversi): refactoring of reversi backend 2024-01-22 09:29:06 +09:00
syuilo
1a01a85182 perf(reversi): improve performance of reversi backend 2024-01-22 08:39:38 +09:00
Marie
013032dd93
fix: downgrade eslint to fix bug 
prefer-nullish-coalescing broke in the 6.19.0 update with a funky bug which has an open PR to be fixed https://github.com/typescript-eslint/typescript-eslint/issues/8261
 2024-01-21 14:18:47 +01:00
Marie
db012fc8c3
merge: upstream (1) 2024-01-21 13:11:23 +01:00
syuilo
f4657eb16f update deps 2024-01-21 18:43:01 +09:00
かっこかり
fb309f3d4f
return a Vary: Accept header for all dual-format endpoints #365 (#13044) 
`/users/:user`, `/@:user`, `/notes/:note` return different responses
depending on the request's `Accept:` header. If we don't consistently
return a `Vary: Accept` header, browsers and caching proxies will get
confused, and return AP representations when HTML was requested, or
vice versa.

Co-authored-by: dakkar <dakkar@thenautilus.net>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-21 18:14:42 +09:00
syuilo
6039f27bd5 enhance(reversi): tweak reversi 2024-01-21 12:05:51 +09:00
syuilo
a17251d913 enhance(reversi): tweak reversi 2024-01-21 10:07:43 +09:00
syuilo
fcd7ffe956 enhance(reversi): tweak reversi 2024-01-20 21:23:33 +09:00
syuilo
b9a81edae5 enhance(reversi): tweak reversi 2024-01-20 13:14:46 +09:00
syuilo
bc7b2f1876 lint fix 2024-01-20 09:56:13 +09:00
syuilo
a637b4e282 feat: reversi 
Resolve #12962
 2024-01-19 20:51:49 +09:00
AsukaMari
b17eb8e537
fix: Some fixes for #12850 (#12862) 
- refinement the error message when trueMail validation fails
- the settings of trueMail are not displayed after saving
- changing how `Active Email Validation` is saved
 2024-01-19 18:48:30 +09:00
Marie
0d766a6310 merge: fix make sure that signToActivityPubGet defaults to true (#352) 
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/352
Reviewed-by: dakkar <dakkar@noreply.git.joinshakrey.org>
 2024-01-17 17:01:39 +01:00
syuilo
945d6a2b09 enhance(drop-and-fusion): ゲームバランスの調整など 2024-01-17 20:11:32 +09:00
a
0283142d0e
Fix: properly handle cc followers (#13009) 
* Fix: properly handle cc followers

Fix #13001

* Update CHANGELOG.md

* Fix syntax error
 2024-01-17 18:19:20 +09:00
Marie
4c1f6be735
merge: upstream 2024-01-15 12:07:35 +01:00
かっこかり
8b0fdfcd69
enhance: 動画・音声周りのUIと動作改良 (#12925) 
* wip

* (fix) `/files` をバイトレンジリクエストに対応させる

* video

* audio

* fix

* fix

* spdx

* fix (rangeRequest)

* fix

* Update CHANGELOG.md

* (add) ボリュームを保存できるように

* (fix) ミュート復帰時に音量が固定される

* named export

* tweak design

* Add sensitive class for audio component

* Refactor seekbar styles

* Refactor hms

* Revert "(add) ボリュームを保存できるように"

This reverts commit 6271f9493b63f96d0dd9915207e97fe120ef9037.

* Revert "(fix) ミュート復帰時に音量が固定される"

This reverts commit a65002b56ecdcb10f76bcc2debbe38593a69643f.

* revert revert changes

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-15 18:17:01 +09:00
YS
d92aaf81c4
refactor: noteテーブルのインデックス整理と配列カラムへのクエリでインデックスを使うように (#12993) 
* Optimize note model index

* enhance(backend): ANY()をやめる (MisskeyIO#239)

* add small e2e test drive endpoint

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-01-15 08:19:27 +09:00
GrapeApple0
ec4e57bb67
fix: isPrivateIpで検証時にipバージョンが一致するかを確認するように (#12988) 
* fix: isPrivateIpで検証時にipバージョンが一致するかを確認するように

* Update CHANGELOG.md

* Update CHANGELOG.md
 2024-01-14 15:57:26 +09:00
ShittyKopper
de66ecbbd0 fix: actually make signToActivityPubGet default to true 2024-01-13 14:47:55 +03:00