Kainoa Kanter
|
76f23bec19
|
Merge pull request '[PR]: Fix Mastodon compatibility string' (#10447) from mkljczk/calckey:develop into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10447
|
2023-07-09 21:26:48 +00:00 |
|
naskya
|
f7185169ed
|
Nya-ify capital Greek alphabets
|
2023-07-09 21:19:09 +00:00 |
|
Kainoa Kanter
|
278181d63e
|
Merge pull request '[PR]: enhance: Implement speak-as-cat for Chinese and Greek' (#10449) from sinofp/calckey:miao into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10449
|
2023-07-09 21:09:51 +00:00 |
|
freeplay
|
455591d376
|
Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream
|
2023-07-09 15:06:18 -04:00 |
|
freeplay
|
52caeaacbb
|
style: link underlines
|
2023-07-09 15:05:39 -04:00 |
|
sinofp
|
0d36fb9ea3
|
Implement speak-as-cat for Chinese and Greek
The Chinese meow character is 喵, whose pinyin is miāo.
妙, 庙, 描, 渺, 瞄, 秒, 苗, and 藐 are all the miao characters from *3500 commonly used Chinese characters.xls*
@naskya proposed to include 廟 and να.
Download the spreadsheet from https://faculty.blcu.edu.cn/xinghb/zh_CN/article/167473/content/1045.htm
See the discussion at https://codeberg.org/calckey/calckey/issues/9746#issuecomment-974699
|
2023-07-09 18:54:12 +01:00 |
|
marcin mikołajczak
|
bc6b064ed6
|
Merge branch 'develop' into develop
|
2023-07-09 16:36:13 +00:00 |
|
marcin mikołajczak
|
081a3177b8
|
Fix Mastodon compatibility string
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-07-09 18:22:53 +02:00 |
|
naskya
|
dd434a739b
|
fix reactions_not_public condition
|
2023-07-09 13:58:58 +00:00 |
|
freeplay
|
141ab4a96b
|
fix: error if no banner
|
2023-07-09 00:42:49 -04:00 |
|
freeplay
|
b800864752
|
style fix
|
2023-07-09 00:32:55 -04:00 |
|
freeplay
|
aa62f417b2
|
fix: nav post button gradient transition (#10401) + half refactor ?
|
2023-07-09 00:22:17 -04:00 |
|
freeplay
|
621cdccd40
|
Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream
|
2023-07-08 23:21:29 -04:00 |
|
freeplay
|
25b30d7417
|
fix: MkMedia #10429 ? + styling
|
2023-07-08 23:21:02 -04:00 |
|
Laura Hausmann
|
6ce6a94ba7
|
[mastodon-client] enforce limit for notifications
|
2023-07-09 03:44:41 +02:00 |
|
Laura Hausmann
|
2080078b20
|
[mastodon-client] always sort timelines by id (descending)
|
2023-07-09 03:24:23 +02:00 |
|
freeplay
|
50e0eb1d4f
|
style; proper styling for url preview
|
2023-07-08 20:30:24 -04:00 |
|
ThatOneCalculator
|
70ae862e91
|
fix: 💄 url preview title size
|
2023-07-08 17:21:32 -07:00 |
|
ThatOneCalculator
|
a9b09f5b29
|
chore: 🎨 format
|
2023-07-08 16:21:15 -07:00 |
|
ThatOneCalculator
|
e88ab6cb0f
|
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
|
2023-07-08 16:20:55 -07:00 |
|
ThatOneCalculator
|
4d8853b7f5
|
fix: 🐛 server stats setting, meta fetching
|
2023-07-08 16:20:38 -07:00 |
|
Laura Hausmann
|
57f35be999
|
[mastodon-client] populate user details for account following/followers
|
2023-07-09 00:58:45 +02:00 |
|
Laura Hausmann
|
d7e63edbd7
|
[mastodon-client] enforce limits for /following and /followers
|
2023-07-09 00:58:45 +02:00 |
|
Laura Hausmann
|
d0fb97649e
|
[mastodon-client] TODO/FIXME cleanup
|
2023-07-09 00:58:45 +02:00 |
|
Laura Hausmann
|
8180f4d494
|
[mastodon-client] drive file name fixup
|
2023-07-09 00:58:45 +02:00 |
|
Laura Hausmann
|
994f08d735
|
[mastodon-client] media caption support
|
2023-07-09 00:58:45 +02:00 |
|
Laura Hausmann
|
c7d031e7ec
|
[mastodon-client] send proper user preferences
|
2023-07-09 00:58:45 +02:00 |
|
Laura Hausmann
|
8f7f078f08
|
[mastodon-client] send actual default post privacy instead of fallback value
|
2023-07-09 00:58:45 +02:00 |
|
Laura Hausmann
|
32210f636d
|
[mastodon-client] remove reactions reply
|
2023-07-09 00:58:44 +02:00 |
|
Kainoa Kanter
|
eb97cff37b
|
Merge pull request '[PR]: feat: notify announcements with popups' (#10441) from naskya/calckey:feat/announcement-popup into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10441
|
2023-07-08 22:41:54 +00:00 |
|
naskya
|
18fcec6384
|
fix
|
2023-07-08 22:37:15 +00:00 |
|
naskya
|
88e14729c2
|
better locale & style
|
2023-07-08 22:29:36 +00:00 |
|
Syuilo
|
9c8447c70a
|
fix: 🐛 prevent creation of empty antennas
|
2023-07-08 15:06:59 -07:00 |
|
naskya
|
1d29a0063b
|
Don't show announcement popups if the tutorial isn't completed
|
2023-07-08 21:47:06 +00:00 |
|
naskya
|
8870a88d58
|
Remove unnecessary imports
|
2023-07-08 21:21:16 +00:00 |
|
naskya
|
54ac36868c
|
Refactor MkAnnouncement
|
2023-07-08 21:17:13 +00:00 |
|
naskya
|
8f3c0f480b
|
Navigate to /announcements if there are more than three unreads
|
2023-07-08 21:02:11 +00:00 |
|
naskya
|
6ca2753536
|
Don't show more then three announcement popups (because it can be annoying for new users)
|
2023-07-08 20:31:18 +00:00 |
|
naskya
|
2c71530e74
|
oops (remove debug logs)
|
2023-07-08 20:22:04 +00:00 |
|
naskya
|
1d0bd45274
|
Fix isRead not being saved on closing popups
|
2023-07-08 20:15:08 +00:00 |
|
naskya
|
fdb6f9f185
|
Show popups at client init
|
2023-07-08 20:09:40 +00:00 |
|
naskya
|
1b8b6a8dd0
|
Add showPopup, isGoodNews to announcement setting UI
|
2023-07-08 20:01:16 +00:00 |
|
naskya
|
e2d4781610
|
chore: Use css module
|
2023-07-08 19:57:26 +00:00 |
|
naskya
|
a2a207e08c
|
Create MkAnnouncement component
|
2023-07-08 19:55:38 +00:00 |
|
naskya
|
290f047a6e
|
Merge remote-tracking branch 'calckey/develop' into feat/announcement-popup
|
2023-07-08 19:52:49 +00:00 |
|
naskya
|
e1188641a7
|
Add showPopup, isGoodNews & Update API
|
2023-07-08 19:48:20 +00:00 |
|
freeplay
|
5bd5a8cc65
|
fix: banner blur
|
2023-07-08 13:06:56 -04:00 |
|
Kainoa Kanter
|
df11946d52
|
revert 679d89fa59bf4628e6e27ca73af8630080d7a063
revert build: ⚡ build megalodon with swc
Do it right this time
|
2023-07-08 16:56:54 +00:00 |
|
ThatOneCalculator
|
a4d4bb40f2
|
build: ⚡ build megalodon with swc
Do it right this time
|
2023-07-07 20:44:41 -07:00 |
|
Laura Hausmann
|
1d42fe37ee
|
increase ap/show rate limit
|
2023-07-08 04:11:41 +02:00 |
|
Laura Hausmann
|
a5be7c3ac8
|
[mastodon-client] handle user & note URLs in search
|
2023-07-08 04:11:41 +02:00 |
|
Laura Hausmann
|
7f7eb301a0
|
[mastodon-client] render bio newlines correctly
|
2023-07-08 04:11:41 +02:00 |
|
Laura Hausmann
|
9d37f01113
|
[mastodon-client] fix polls
|
2023-07-08 04:11:41 +02:00 |
|
Laura Hausmann
|
524c8f07ec
|
[mastodon-client] fix local instance mentions
|
2023-07-08 04:11:40 +02:00 |
|
freeplay
|
a14659f19f
|
style: make background banner blur static
|
2023-07-07 21:50:45 -04:00 |
|
Laura Hausmann
|
22825ae76a
|
[mastodon-client] fix search type param
|
2023-07-07 23:47:21 +02:00 |
|
Laura Hausmann
|
4cf8c70bf5
|
[mastodon-client] populate details for quote and reblog fields
|
2023-07-07 23:18:43 +02:00 |
|
Laura Hausmann
|
90e1eaa62d
|
[mastodon-client] populate user data for favorited_by and reblogged_by
|
2023-07-07 22:51:07 +02:00 |
|
Laura Hausmann
|
a94bf84f04
|
[mastodon-client] implement favorited_by
|
2023-07-07 22:42:39 +02:00 |
|
Laura Hausmann
|
c02fec7f36
|
[mastodon-client] populate note details for notifications
|
2023-07-07 22:06:26 +02:00 |
|
Laura Hausmann
|
afc9cf3259
|
[mastodon-client] populate user details for all notes
|
2023-07-07 21:50:42 +02:00 |
|
Laura Hausmann
|
3d5da39d83
|
[mastodon-client] Don't display unsupported notification types
|
2023-07-07 19:45:08 +02:00 |
|
Laura Hausmann
|
197977c3a8
|
[mastodon-client] Fix global timeline
|
2023-07-07 19:30:23 +02:00 |
|
Laura Hausmann
|
acff402e21
|
[mastodon-client] Fail gracefully if user resolve fails
|
2023-07-07 19:06:42 +02:00 |
|
ThatOneCalculator
|
9c96419e3d
|
fix: 🚸 switch account when adding existing account
|
2023-07-06 17:44:32 -07:00 |
|
ThatOneCalculator
|
6decfe88e7
|
docs: 📝 KeyDB, megalodon
|
2023-07-06 17:29:29 -07:00 |
|
Kainoa Kanter
|
655cc039f3
|
Merge pull request '[PR]: Cache server' (#10419) from refactor/cache-server into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10419
|
2023-07-06 21:55:44 +00:00 |
|
Kainoa Kanter
|
bdca7d2f8e
|
revert 49fd4034744f7642210bb66a3558d544d67e13b8
revert fix: 🐛 fix quotes with CW-only quotes
|
2023-07-06 21:53:44 +00:00 |
|
Namekuji
|
f835cccccf
|
refactor: cache relays for a longer time
|
2023-07-06 17:49:41 -04:00 |
|
Namekuji
|
1ea8f8b4fe
|
perf: use msgpackr to encode and decode
|
2023-07-06 17:22:15 -04:00 |
|
Namekuji
|
e505b0f207
|
fix: use host as prefix of cacheServer if undefined
|
2023-07-06 17:06:31 -04:00 |
|
Kainoa Kanter
|
f0acadea11
|
revert 6355bb604290a09a4a3b7c68b791234a0c1771ea
revert build: ⚡ build megalodon with swc
|
2023-07-06 21:04:39 +00:00 |
|
ThatOneCalculator
|
d1117ca6d4
|
refactor: 🔒 password input for object storage secret key
|
2023-07-06 13:03:39 -07:00 |
|
ThatOneCalculator
|
956d009107
|
Revert "refactor: 💫 tweak photoswipe animation speed"
This reverts commit 96f740477b95e23511bf12a48a14a606214c066d.
|
2023-07-06 12:50:05 -07:00 |
|
ThatOneCalculator
|
171cb1c210
|
chore: 🎨 format
|
2023-07-06 12:47:33 -07:00 |
|
Johann150
|
f9b3951c3a
|
fix: 🐛 fix quotes with CW-only quotes
|
2023-07-06 12:46:19 -07:00 |
|
ThatOneCalculator
|
fa19b64901
|
fix: use unique key for my galleries
|
2023-07-06 12:41:34 -07:00 |
|
ThatOneCalculator
|
20366f8305
|
fix: use unique key for my page query
|
2023-07-06 12:41:29 -07:00 |
|
ThatOneCalculator
|
46c7b3648f
|
fix: use unique key for my galleries
|
2023-07-06 12:26:37 -07:00 |
|
ThatOneCalculator
|
264641ff7d
|
fix: use unique key for my page query
|
2023-07-06 12:25:54 -07:00 |
|
ThatOneCalculator
|
f5c7b6f55f
|
feat: ⚡ cache server
|
2023-07-06 11:50:34 -07:00 |
|
Syuilo
|
53ec5f7048
|
refactor: 💫 tweak photoswipe animation speed
|
2023-07-06 00:20:48 -07:00 |
|
ThatOneCalculator
|
bbf2ca94db
|
fix: 🐛 fallback locales for skin tone labels
Closes #10406
|
2023-07-05 23:42:34 -07:00 |
|
ThatOneCalculator
|
f4b275f7b0
|
build: ⚡ build megalodon with swc
|
2023-07-05 23:28:47 -07:00 |
|
Laura Hausmann
|
cbf07d133c
|
[mastodon-client] Remove even more debug messages
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
837fb327da
|
PR cleanup
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
52b4fdf0d2
|
[mastodon-client] code cleanup, remove redundant function calls
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
4e2c73dba9
|
Remove debug logging
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
dc95aa83a9
|
[mastodon-client] fix mentions
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
3fa7e2af7d
|
[mastodon-client] remove debug logging
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
d2a23a3b6b
|
[mastodon-client] Remove compiled megalodon code
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
8347855a11
|
[mastodon-client] general code cleanup, rename megalodon package
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
fbeb809874
|
[mastodon-client] Disable emoji reactions preview in TL
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
adb0f365ba
|
[mastodon-client] Move megalodon to main repo
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
8a6a1cfc43
|
[mastodon-client] Code formatting pass
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
37b21f973f
|
[mastodon-client] Fix posting statuses with attachment
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
1f8c735889
|
[mastodon-client] megalodon compat changes
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
8cf7a24e9f
|
[mastodon-client] Add transparent.png asset
|
2023-07-06 02:16:51 +00:00 |
|
Laura Hausmann
|
23d57eb79f
|
[mastodon-client] Add endpoints
|
2023-07-06 02:16:51 +00:00 |
|
ThatOneCalculator
|
94b16ba9a3
|
refactor: ♻️ read patrons from local file for fallback instead of empty array
|
2023-07-05 18:44:29 -07:00 |
|
ThatOneCalculator
|
c4d4e850b2
|
chore: ⬆️ up prettier, pnpm
|
2023-07-05 18:28:27 -07:00 |
|
freeplay
|
0930e0edef
|
remove unneeded property
|
2023-07-04 21:39:41 -04:00 |
|
freeplay
|
3927086608
|
style: truncate long URL's
|
2023-07-04 21:37:50 -04:00 |
|
freeplay
|
f540438740
|
fix: add back channel display in timeline
|
2023-07-04 13:47:31 -04:00 |
|
freeplay
|
7a160d3c8f
|
style: add back scrollbar-color for firefox
|
2023-07-04 13:33:56 -04:00 |
|
freeplay
|
fd4840f24e
|
style: accent color in plyr
|
2023-07-04 12:00:48 -04:00 |
|
Namekuji
|
f13d8548d2
|
fix: do not deliver poll result if local-only
|
2023-07-04 01:59:43 -04:00 |
|
Kainoa Kanter
|
3955d8f51b
|
fix: 🐛query search endpoint for local userselect, disregard host
|
2023-07-04 01:29:57 +00:00 |
|
freeplay
|
3caba40faf
|
fix: videos not appearing when don't play animated images is one
|
2023-07-03 16:01:54 -04:00 |
|
ThatOneCalculator
|
f99e8b3726
|
fix: ⚡ immediately fail jobs with invalid signature
|
2023-07-03 10:29:52 -07:00 |
|
ThatOneCalculator
|
03c8bb5b88
|
chore: 🎨 format
|
2023-07-02 23:08:33 -07:00 |
|
ThatOneCalculator
|
d1b883d73b
|
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
|
2023-07-02 23:07:51 -07:00 |
|
ThatOneCalculator
|
dd36424cf3
|
fix: 💄 form switch padding
|
2023-07-02 23:06:25 -07:00 |
|
freeplay
|
6c3d382d9d
|
Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream
|
2023-07-03 00:03:23 -04:00 |
|
freeplay
|
bcb62f1c16
|
feat: show alt button even when content hidden
|
2023-07-03 00:02:36 -04:00 |
|
freeplay
|
27625b67da
|
refactor: combine MediaVideo & MediaImage components
|
2023-07-02 23:41:38 -04:00 |
|
Namekuji
|
6f5e07de5d
|
rename arg
|
2023-07-02 23:14:43 -04:00 |
|
Namekuji
|
b36cc31e9b
|
throw error if failed
|
2023-07-02 22:25:58 -04:00 |
|
Syuilo
|
6919477820
|
refactor: ⚡ make identicons and server metrics optional
Co-authored-by: Kainoa Kanter <kainoa@t1c.dev>
|
2023-07-02 19:23:55 -07:00 |
|
Namekuji
|
284c0db1fd
|
no more infinity caches
|
2023-07-02 22:14:31 -04:00 |
|
Namekuji
|
9d26e08032
|
add cache prefix
|
2023-07-02 20:55:20 -04:00 |
|
Namekuji
|
ef724a49fe
|
store cache values to redis
|
2023-07-02 20:37:46 -04:00 |
|
Kainoa Kanter
|
ccaad82ed8
|
Merge pull request '[PR]: Render instance description in about page as HTML' (#10393) from esm/calckey:fix/about-page-html into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10393
|
2023-07-02 23:23:52 +00:00 |
|
Syuilo
|
821320f51b
|
refactor: ⚡ make identicons and server metrics optional
Co-authored-by: Kainoa Kanter <kainoa@t1c.dev>
|
2023-07-02 16:23:11 -07:00 |
|
Kainoa Kanter
|
1d23f3c904
|
Merge pull request '[PR]: Temp fix for null metadata' (#10390) from yawhn/trickey:fix_avatar_errors into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10390
|
2023-07-02 22:54:56 +00:00 |
|
Kainoa Kanter
|
305d6e8b2e
|
Merge pull request '[PR]: Embedded all attachment, renotes and discussion history into rss feed content & improve title, and not generate feed for locked account' (#10388) from cgsama/calckey:feedenhance into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10388
|
2023-07-02 21:50:09 +00:00 |
|
Essem
|
1f6568ce22
|
Render instance description as HTML
|
2023-07-02 18:23:02 +00:00 |
|
ThatOneCalculator
|
5089cef8ad
|
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
|
2023-07-02 10:10:43 -07:00 |
|
ThatOneCalculator
|
466ef220da
|
Revert "Merge pull request '[PR]: fix: use redis-based mutex to prevent memory leak' (#10389) from nmkj/calckey:fix-cache-leak into develop"
This reverts commit 224b1d585bb1cb95531a9213cf4a69fc2f049e7d, reversing
changes made to b5907fb86db2b9eacea633bb5d69547982326afa.
|
2023-07-02 10:10:25 -07:00 |
|
Kainoa Kanter
|
387b3b1e96
|
Merge pull request '[PR]: Add aria labels to notification settings/mark as read buttons' (#10392) from esm/calckey:fix/notif-button-a11y into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10392
|
2023-07-02 17:08:37 +00:00 |
|
freeplay
|
4f32a9b1d7
|
Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream
|
2023-07-02 13:01:54 -04:00 |
|
freeplay
|
5b45dfae4b
|
style: visible button w/out hovering in url preview
|
2023-07-02 13:01:50 -04:00 |
|
Essem
|
9373875d93
|
Add aria labels to notification buttons
|
2023-07-02 12:00:29 -05:00 |
|
ThatOneCalculator
|
4e37acc19c
|
fix: 🐛 display emoji stat properly
|
2023-07-02 09:26:03 -07:00 |
|
ThatOneCalculator
|
6de6f68790
|
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
|
2023-07-02 08:30:25 -07:00 |
|
yawhn
|
4529d65f51
|
fix: temp fix for null metadata
|
2023-07-02 16:16:01 +03:00 |
|
ThatOneCalculator
|
63b9a26621
|
adjust timeout for indexing notes
|
2023-07-02 00:47:55 -07:00 |
|
ThatOneCalculator
|
d384ab5c7c
|
me when codeberg
|
2023-07-02 00:20:14 -07:00 |
|
ThatOneCalculator
|
02825ee694
|
fix: 🐛 patron timeout
|
2023-07-02 00:16:01 -07:00 |
|
Namekuji
|
7aa05c26e9
|
set log level to debug
|
2023-07-02 02:03:14 -04:00 |
|
Namekuji
|
9b721da06d
|
fix: use redis-semaphore for global mutex and memory leak prevention
|
2023-07-02 01:47:11 -04:00 |
|
ThatOneCalculator
|
c6821f0619
|
chore: 🎨 format
|
2023-07-01 22:37:28 -07:00 |
|
ThatOneCalculator
|
99c90c6e6e
|
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
|
2023-07-01 22:35:45 -07:00 |
|
ThatOneCalculator
|
867c232ae7
|
fix
|
2023-07-01 22:35:38 -07:00 |
|
Kainoa Kanter
|
a5ef273484
|
Merge pull request '[PR]: fix: publication logic involving relays' (#10383) from nmkj/calckey:fix-boost-publication into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10383
|
2023-07-02 05:28:01 +00:00 |
|
ThatOneCalculator
|
7574018a13
|
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
|
2023-07-01 22:07:51 -07:00 |
|
Laura Hausmann
|
d6b3c9af59
|
Fix mastodon api conversion for new note id type
|
2023-07-01 22:07:08 -07:00 |
|
naskya
|
0265fe2786
|
Please let me revert this (appearNote in getWordSoftMute) for now
This reverts commit cda1c19454ee8aec4d29b55954129cf6f3716da8.
|
2023-07-02 04:47:11 +00:00 |
|
ThatOneCalculator
|
14aeda32ab
|
drive todo
|
2023-07-01 21:03:11 -07:00 |
|
CGsama
|
78a479312c
|
Embedded all attachment, renotes and discussion history into rss feed content & improve title, and not generate feed for locked account
|
2023-07-01 23:58:36 -04:00 |
|