Jeff Becker
|
5c10ecb2e9
|
Merge branch 'master' of ssh://github.com/majestrate/nntpchan
|
2018-05-06 08:06:07 -04:00 |
|
Jeff Becker
|
cb41b06cb7
|
* enable cross compile srndv2
* fix up kqueue code in nntpchan-daemon
|
2018-05-06 08:05:31 -04:00 |
|
Jeff
|
e08fc8881d
|
update readme
|
2018-05-05 14:07:26 -04:00 |
|
Jeff Becker
|
8bd528aa50
|
more kqueue code
|
2018-05-04 10:08:09 -04:00 |
|
Jeff Becker
|
54573f3cd9
|
add initial kqueue stuff, not done
|
2018-05-04 09:52:54 -04:00 |
|
Jeff Becker
|
7545efc8d3
|
fix tools, use std::unique_ptr
|
2018-05-04 08:38:34 -04:00 |
|
Jeff Becker
|
7ccd554c2d
|
abstract out epoll and make room for kqueue
|
2018-05-04 08:17:49 -04:00 |
|
Jeff Becker
|
b227bf6ff1
|
correct buffering
|
2018-05-03 14:05:35 -04:00 |
|
Jeff Becker
|
0c41298fe0
|
more
|
2018-05-03 13:38:35 -04:00 |
|
Jeff Becker
|
4df3bc0672
|
Merge branch 'master' of ssh://github.com/majestrate/nntpchan
|
2018-05-03 11:47:39 -04:00 |
|
Jeff Becker
|
34fdc0a154
|
use epoll
|
2018-05-03 11:47:20 -04:00 |
|
Jeff
|
bae6e1186c
|
i fucking hate css god fucking damnit how does drybones do this shit?
|
2018-05-02 18:14:26 -04:00 |
|
Jeff
|
45dfa1c32c
|
css fix
|
2018-05-02 18:01:55 -04:00 |
|
Jeff
|
eef7a0442b
|
fix css
|
2018-05-02 17:58:14 -04:00 |
|
Jeff
|
4c9c34cb9f
|
fix
|
2018-05-02 17:52:16 -04:00 |
|
Jeff
|
1d9f6b09f6
|
fix
|
2018-05-02 17:50:33 -04:00 |
|
Jeff Becker
|
caf9378073
|
more
|
2018-03-09 16:24:57 -05:00 |
|
Jeff Becker
|
58464582bd
|
expose frontend pubkey to templates
|
2018-03-09 16:19:08 -05:00 |
|
Jeff Becker
|
69f868ecb9
|
add frontend key based blocking (initial)
|
2018-03-09 16:16:41 -05:00 |
|
Jeff Becker
|
a0ff118323
|
add newboard link to navbar
|
2018-03-09 15:35:05 -05:00 |
|
Jeff Becker
|
43df30c5bf
|
fix css again
|
2018-03-09 15:31:08 -05:00 |
|
Jeff Becker
|
60a12169a0
|
css update
|
2018-03-09 15:28:43 -05:00 |
|
Jeff Becker
|
3899989f2e
|
bump version
|
2018-03-09 10:57:31 -05:00 |
|
Jeff Becker
|
ce7f112be8
|
update default templates
|
2018-03-09 10:56:15 -05:00 |
|
Jeff Becker
|
e6417b3bd7
|
more
|
2018-03-09 10:28:15 -05:00 |
|
Jeff Becker
|
8a72b29d45
|
more
|
2018-03-09 10:26:47 -05:00 |
|
Jeff Becker
|
fcd5a97225
|
more
|
2018-03-09 10:23:09 -05:00 |
|
Jeff Becker
|
7c5546c0c0
|
morte
|
2018-03-09 10:18:47 -05:00 |
|
Jeff Becker
|
7abd41eecd
|
more
|
2018-03-09 10:12:50 -05:00 |
|
Jeff Becker
|
c5479e2386
|
more
|
2018-03-09 10:05:03 -05:00 |
|
Jeff Becker
|
b61c22898e
|
fixes
|
2018-03-09 09:58:56 -05:00 |
|
Jeff Becker
|
e2de5edd43
|
fix
|
2018-03-09 09:54:31 -05:00 |
|
Jeff Becker
|
2449cb1adc
|
fixes
|
2018-03-09 09:52:16 -05:00 |
|
Jeff Becker
|
2adcc73d92
|
add inverted pagination for archive mode
|
2018-03-09 09:48:29 -05:00 |
|
Jeff Becker
|
55ba1e6c7c
|
update configs
|
2018-03-09 08:50:01 -05:00 |
|
Jeff Becker
|
4bef3d8964
|
fix
|
2018-03-09 08:10:57 -05:00 |
|
Jeff Becker
|
aecd4ca291
|
fix
|
2018-03-09 08:08:14 -05:00 |
|
Jeff Becker
|
222a905c3a
|
fix
|
2018-03-09 08:06:15 -05:00 |
|
Jeff Becker
|
777cb0941a
|
smarter delete
|
2018-03-09 08:03:33 -05:00 |
|
Jeff Becker
|
f06cb1d9a2
|
csstweak
|
2018-03-09 07:18:43 -05:00 |
|
Jeff Becker
|
ef1fc85a8a
|
css fix
|
2018-03-09 07:18:18 -05:00 |
|
Jeff Becker
|
f1d3c0a6b5
|
update css
|
2018-03-09 07:15:41 -05:00 |
|
Jeff Becker
|
e8e6812a25
|
css fix
|
2018-03-09 07:11:44 -05:00 |
|
Jeff Becker
|
6754947dc2
|
fix
|
2018-03-09 07:09:57 -05:00 |
|
Jeff Becker
|
5683e6eba0
|
fix
|
2018-03-09 07:07:44 -05:00 |
|
Jeff Becker
|
95e96db324
|
fix
|
2018-03-09 07:06:08 -05:00 |
|
Jeff Becker
|
024f773a7c
|
add bumplock css
|
2018-03-09 07:01:33 -05:00 |
|
Jeff Becker
|
702ab469cd
|
poll varnish connections
|
2018-03-04 07:03:10 -05:00 |
|
Jeff Becker
|
6abc6f4021
|
Revert "re add pow captcha (initial)"
This reverts commit c3426871d2.
|
2018-02-22 09:48:03 -05:00 |
|
Jeff Becker
|
c3426871d2
|
re add pow captcha (initial)
|
2018-02-22 07:53:34 -05:00 |
|
cathugger
|
81653a5415
|
small sync tweak
|
2018-01-26 14:46:59 +00:00 |
|
cathugger
|
6b039265d9
|
small insignificant fix
|
2018-01-24 16:21:51 +00:00 |
|
cathugger
|
9fba95b58d
|
fix even more braindamage of mine
|
2018-01-24 15:57:13 +00:00 |
|
cathugger
|
8894cf6814
|
im retarded
|
2018-01-24 15:39:37 +00:00 |
|
cathugger
|
d752312868
|
specify correct range in XOVER when mirroring
|
2018-01-24 15:26:51 +00:00 |
|
cathugger
|
337a61dd7f
|
some NNTP improvements
|
2018-01-23 22:32:14 +00:00 |
|
cathugger
|
8cb044a5e3
|
some fixes
|
2018-01-22 17:15:25 +00:00 |
|
Jeff Becker
|
91cfa9441e
|
Revert "send posts the other side doesn't have on stream start"
This reverts commit f80acbecc2.
|
2018-01-15 10:37:57 -05:00 |
|
Jeff Becker
|
f80acbecc2
|
send posts the other side doesn't have on stream start
|
2018-01-12 09:49:55 -05:00 |
|
Jeff Becker
|
53522b98eb
|
be concise
|
2018-01-07 09:33:39 -05:00 |
|
Jeff Becker
|
517338264d
|
f-feeeeeeeex'd
|
2018-01-07 09:28:39 -05:00 |
|
Jeff Becker
|
2752676013
|
commit which fixes invalid line shit
|
2018-01-04 15:51:26 -05:00 |
|
Jeff Becker
|
aadb4ae230
|
commit which fixes invalid line shit
|
2018-01-04 15:46:49 -05:00 |
|
Jeff Becker
|
df021531cb
|
commit which fixes invalid line shit
|
2018-01-04 15:45:26 -05:00 |
|
Jeff Becker
|
37e6129261
|
commit which fixes invalid line shit
|
2018-01-04 15:43:55 -05:00 |
|
Jeff Becker
|
0266deee2b
|
fix
|
2018-01-04 15:23:10 -05:00 |
|
Jeff Becker
|
3e6a80f58c
|
again
|
2017-12-29 13:15:48 -05:00 |
|
Jeff Becker
|
cdef33af7c
|
fix last commit
|
2017-12-29 13:15:19 -05:00 |
|
Jeff Becker
|
e0350ecb98
|
more fixes
|
2017-12-29 13:08:42 -05:00 |
|
Jeff Becker
|
cff6f50d63
|
also check for temp article when checking for local existence
|
2017-12-29 11:21:03 -05:00 |
|
Jeff Becker
|
a4c8de953a
|
don't download articles if we already have it locally
|
2017-12-29 11:06:59 -05:00 |
|
Jeff Becker
|
9c89baf68e
|
fix http proxy
|
2017-12-29 10:47:54 -05:00 |
|
Jeff Becker
|
29ab733808
|
add http proxy support to feeds
|
2017-12-29 10:24:03 -05:00 |
|
Jeff Becker
|
9e644eb004
|
add a sleep
|
2017-12-29 09:37:09 -05:00 |
|
Jeff Becker
|
a7e72e2aff
|
implement temp article directory
|
2017-12-29 09:31:56 -05:00 |
|
Jeff Becker
|
f4640e82c4
|
try getting rid of race condition
|
2017-12-28 17:11:04 -05:00 |
|
Jeff Becker
|
95a9c1bda9
|
css
|
2017-11-30 08:04:16 -05:00 |
|
Jeff Becker
|
936782b616
|
fix thumbnailing and make it work
|
2017-11-12 08:18:42 -05:00 |
|
Jeff Becker
|
feb43b1ed8
|
forgot file
|
2017-11-12 07:59:38 -05:00 |
|
Jeff Becker
|
e093864ee7
|
* configurable thumbnails
* start working on spam folder
|
2017-11-12 07:58:30 -05:00 |
|
Jeff Becker
|
a7718e9a0a
|
fix /b/ug
|
2017-11-11 09:49:05 -05:00 |
|
Jeff Becker
|
9230349b30
|
fix sa hook
|
2017-11-07 15:07:10 -05:00 |
|
Jeff Becker
|
26d4f5dffb
|
fix sa hook
|
2017-11-07 14:59:53 -05:00 |
|
Jeff Becker
|
a88334e985
|
fix sa hook
|
2017-11-07 14:57:05 -05:00 |
|
Jeff Becker
|
d3ca9dfa33
|
fix sa hook
|
2017-11-07 14:33:41 -05:00 |
|
Jeff Becker
|
58cc8c2365
|
fix sa hook
|
2017-11-07 14:32:37 -05:00 |
|
Jeff Becker
|
8cd93abe4f
|
fix sa hook
|
2017-11-07 14:30:34 -05:00 |
|
Jeff Becker
|
a07f4a30d6
|
fix sa hook
|
2017-11-07 14:27:52 -05:00 |
|
Jeff Becker
|
69359700b4
|
fix sa hook
|
2017-11-07 14:25:42 -05:00 |
|
Jeff Becker
|
d2552c5cd1
|
fix sa hook
|
2017-11-07 14:22:34 -05:00 |
|
Jeff Becker
|
210a2109a7
|
fix sa hook
|
2017-11-07 14:19:47 -05:00 |
|
Jeff Becker
|
2195c0a29c
|
fix sa hook
|
2017-11-07 14:16:23 -05:00 |
|
Jeff Becker
|
96a931de3e
|
fix sa hook
|
2017-11-07 14:13:17 -05:00 |
|
Jeff Becker
|
c4d5ab431a
|
fix sa hook
|
2017-11-07 14:07:55 -05:00 |
|
Jeff Becker
|
3ce810775e
|
fix sa hook
|
2017-11-07 14:05:36 -05:00 |
|
Jeff Becker
|
d89a811611
|
fix sa hook
|
2017-11-07 14:05:19 -05:00 |
|
Jeff Becker
|
c6dab2125e
|
fix sa hook
|
2017-11-07 13:54:15 -05:00 |
|
Jeff Becker
|
b8fa8fff80
|
fix sa hook
|
2017-11-07 13:52:27 -05:00 |
|
Jeff Becker
|
78606e95de
|
fix sa hook
|
2017-11-07 13:47:20 -05:00 |
|
Jeff Becker
|
b919c095a8
|
fix
|
2017-11-07 13:37:22 -05:00 |
|
Jeff Becker
|
666549e1e4
|
gay bullshit
|
2017-11-06 19:09:45 -05:00 |
|
Jeff Becker
|
99a3403ed8
|
mlurrrrr
|
2017-11-06 18:40:54 -05:00 |
|
Jeff Becker
|
e7c6100691
|
blurrrrr
|
2017-11-06 18:32:39 -05:00 |
|
Jeff Becker
|
bf357a3461
|
durr
|
2017-11-06 18:22:51 -05:00 |
|
Jeff Becker
|
c06b503efd
|
hurr
|
2017-11-06 18:16:27 -05:00 |
|
Jeff Becker
|
cda181e820
|
spamassassin integration
|
2017-11-06 18:12:18 -05:00 |
|
Jeff Becker
|
ba16d5d717
|
fix internationalization on default templates
|
2017-11-05 10:05:59 -05:00 |
|
Jeff Becker
|
de253fb204
|
fix
|
2017-11-02 08:48:37 -04:00 |
|
Jeff Becker
|
835c912053
|
more
|
2017-11-02 08:47:51 -04:00 |
|
Jeff Becker
|
c53d4ba9ee
|
fix
|
2017-11-02 08:45:58 -04:00 |
|
Jeff Becker
|
b25ce88232
|
more
|
2017-11-02 08:45:17 -04:00 |
|
Jeff Becker
|
9ef6d119c3
|
more mod panel stuff
|
2017-11-02 08:43:58 -04:00 |
|
Jeff Becker
|
75670aa1b7
|
hurr
|
2017-11-02 08:39:59 -04:00 |
|
Jeff Becker
|
6d0ff936ce
|
add scoped mods to mod ui
|
2017-11-02 08:37:31 -04:00 |
|
Jeff Becker
|
5367b53570
|
finish template fixes for installer
|
2017-11-02 07:58:29 -04:00 |
|
Jeff Becker
|
f5fc7c0ff3
|
fix previous commit
|
2017-11-02 07:40:10 -04:00 |
|
Jeff Becker
|
38a162e416
|
add support for alternative template implementation
|
2017-11-02 07:32:24 -04:00 |
|
Jeff Becker
|
3c0122e8a2
|
Revert "fix"
This reverts commit 62bb1b7b32.
|
2017-10-31 12:46:06 -04:00 |
|
Jeff Becker
|
55dc52daf2
|
fix
|
2017-10-31 12:44:45 -04:00 |
|
Jeff Becker
|
62bb1b7b32
|
fix
|
2017-10-31 12:41:01 -04:00 |
|
Jeff Becker
|
882da39b87
|
try fix
|
2017-10-31 12:03:15 -04:00 |
|
Jeff Becker
|
f11f67190c
|
try fix
|
2017-10-31 11:52:59 -04:00 |
|
l-n-s
|
53330eef69
|
Update site.css
Correct cursor styling for style-switching labels
|
2017-10-25 17:45:33 +00:00 |
|
Jeff Becker
|
09504ca363
|
xpat
|
2017-10-24 08:51:21 -04:00 |
|
Jeff Becker
|
3b83f184ea
|
fix issue #148
|
2017-10-24 05:35:09 -04:00 |
|
Jeff Becker
|
841c5c6afe
|
clang format
|
2017-10-17 10:29:56 -04:00 |
|
Jeff Becker
|
85248787fc
|
try varnish invalidation with all languages
|
2017-10-17 08:50:47 -04:00 |
|
Jeff Becker
|
1f24f03cf5
|
more
|
2017-10-17 08:42:53 -04:00 |
|
Jeff Becker
|
53ba50541f
|
more translation strings
|
2017-10-17 08:39:09 -04:00 |
|
Jeff Becker
|
7c94ff329a
|
enable postform button translation
|
2017-10-17 08:34:52 -04:00 |
|
Jeff Becker
|
2740229d6b
|
more template internationalization
|
2017-10-17 08:24:53 -04:00 |
|
Jeff Becker
|
5834df6cf2
|
fix typos
|
2017-10-17 08:15:58 -04:00 |
|
Jeff Becker
|
123057d608
|
more internationalization
|
2017-10-17 08:06:50 -04:00 |
|
Jeff Becker
|
24a25d5e20
|
more localization
|
2017-10-17 07:59:07 -04:00 |
|
Jeff Becker
|
311503884d
|
spoilers in lua
|
2017-10-13 08:29:27 -04:00 |
|
Jeff Becker
|
8df0d9bbc2
|
spoiler text
|
2017-10-13 08:27:12 -04:00 |
|
Jeff Becker
|
f17f865f79
|
mor css
|
2017-10-13 08:09:57 -04:00 |
|
Jeff Becker
|
e9c88ffd28
|
nntpchan-daeom code
|
2017-10-13 07:58:41 -04:00 |
|
Jeff Becker
|
c583a03f81
|
allow lua stuff and fix it up
|
2017-10-13 07:58:10 -04:00 |
|
Jeff Becker
|
12bb8c4936
|
more nntpchan-daemon stuff
|
2017-10-11 09:48:27 -04:00 |
|
Jeff Becker
|
ec7a17a647
|
fix template
|
2017-10-10 13:30:54 -04:00 |
|
Jeff Becker
|
c6cc0b17c0
|
try fix navbar
|
2017-10-10 13:27:27 -04:00 |
|
Jeff Becker
|
529b1dd0f4
|
more i18n
|
2017-10-10 12:50:51 -04:00 |
|
Jeff Becker
|
36243cb2eb
|
more i18n stuff
|
2017-10-10 12:47:01 -04:00 |
|
Jeff Becker
|
ce2e1eb7a8
|
more i18n
|
2017-10-10 12:40:25 -04:00 |
|
Jeff Becker
|
78797c680f
|
more i18n stuff
|
2017-10-10 12:39:16 -04:00 |
|
Jeff Becker
|
0848412aa0
|
update i18n stuff
|
2017-10-10 12:34:39 -04:00 |
|
Jeff Becker
|
e25b84c686
|
dynamic translations
|
2017-10-10 12:17:38 -04:00 |
|
Jeff Becker
|
579bf619f4
|
fix segfaults
|
2017-10-09 12:51:49 -04:00 |
|
Jeff Becker
|
e67e7a20bd
|
* more nntpchan-daemon code
* fix keepalive
|
2017-10-09 11:48:10 -04:00 |
|
Jeff Becker
|
c54820a198
|
use correct names
|
2017-10-08 10:03:40 -04:00 |
|
Jeff Becker
|
24fea24b03
|
japanese translations
|
2017-10-08 09:54:19 -04:00 |
|
Jeff Becker
|
93cc2ff803
|
mor
|
2017-10-01 12:01:18 -04:00 |
|
Jeff Becker
|
8038663b0a
|
fug
|
2017-10-01 11:59:41 -04:00 |
|
Jeff Becker
|
334ac0e4f2
|
js sux
|
2017-10-01 11:58:20 -04:00 |
|
Jeff Becker
|
b439795e04
|
meh
|
2017-10-01 11:57:12 -04:00 |
|
Jeff Becker
|
6f00406f99
|
i hate firefox
|
2017-10-01 11:55:23 -04:00 |
|
Jeff Becker
|
a0495130cc
|
fix syntax error
|
2017-10-01 11:47:36 -04:00 |
|
Jeff Becker
|
54c0821339
|
construct formdata manually
|
2017-10-01 11:46:28 -04:00 |
|
Jeff Becker
|
b3d65dc5b9
|
tabify
|
2017-09-30 16:55:22 -04:00 |
|
Jeff Becker
|
54fde6ae2e
|
fix js mor
|
2017-09-30 12:13:28 -04:00 |
|
Jeff Becker
|
2284fac632
|
fix js
|
2017-09-30 12:11:58 -04:00 |
|
Jeff Becker
|
6ec930a54a
|
fix js
|
2017-09-30 12:10:07 -04:00 |
|
Jeff Becker
|
394a4a65e1
|
i hate js
|
2017-09-30 09:06:10 -04:00 |
|
Jeff Becker
|
b823223bd1
|
fix js
|
2017-09-30 09:02:59 -04:00 |
|
Jeff Becker
|
c951473310
|
focus on our post if posted
|
2017-09-30 09:00:10 -04:00 |
|
Jeff Becker
|
23b4f11e6d
|
invalidate json endpoints
|
2017-09-30 08:55:38 -04:00 |
|
Jeff Becker
|
93b4558b27
|
reset values
|
2017-09-30 08:46:46 -04:00 |
|
Jeff Becker
|
493565257e
|
mor js
|
2017-09-30 08:42:21 -04:00 |
|
Jeff Becker
|
d6bbe584de
|
mor js
|
2017-09-30 08:40:18 -04:00 |
|
Jeff Becker
|
796d3480ba
|
fix json rendering
|
2017-09-30 08:32:51 -04:00 |
|
Jeff Becker
|
ef024977df
|
fix url
|
2017-09-30 08:18:02 -04:00 |
|
Jeff Becker
|
cbe6af7349
|
mor js
|
2017-09-30 08:15:55 -04:00 |
|
Jeff Becker
|
dcba36873e
|
syntax error
|
2017-09-30 08:08:31 -04:00 |
|
Jeff Becker
|
065e79026e
|
more
|
2017-09-30 08:07:46 -04:00 |
|
Jeff Becker
|
1fd5588457
|
param order
|
2017-09-30 08:06:32 -04:00 |
|
Jeff Becker
|
203e67a017
|
fix name
|
2017-09-30 08:05:27 -04:00 |
|
Jeff Becker
|
86896b6c52
|
fix param order
|
2017-09-30 08:04:25 -04:00 |
|
Jeff Becker
|
9cc9609ef6
|
use correct value
|
2017-09-30 08:03:33 -04:00 |
|
Jeff Becker
|
c8563f5fb4
|
fix typo
|
2017-09-30 08:02:10 -04:00 |
|
Jeff Becker
|
5a7eabc0d0
|
add js stuff for form resubmit
|
2017-09-30 08:01:21 -04:00 |
|
Jeff Becker
|
d245462373
|
revert captcha, add stuff to js
|
2017-09-30 07:35:01 -04:00 |
|
Jeff Becker
|
534e023526
|
try fixing captcha
|
2017-09-30 07:32:01 -04:00 |
|
Jeff Becker
|
6274fff05b
|
fix captcha bug
|
2017-09-30 07:28:55 -04:00 |
|
Jeff Becker
|
0148aeb6af
|
make it compile
|
2017-09-30 07:03:49 -04:00 |
|
Jeff Becker
|
7371db736d
|
invalidate ukko
|
2017-09-30 07:02:10 -04:00 |
|
Jeff Becker
|
42cc7f26c4
|
remove more channels to prevent deadlocks
|
2017-09-30 06:57:17 -04:00 |
|
Jeff Becker
|
be7efb24cd
|
implement more of XHDR
|
2017-09-26 10:15:52 -04:00 |
|
Jeff Becker
|
3ee449062e
|
try fixing deadlock
|
2017-09-26 09:50:14 -04:00 |
|
Jeff Becker
|
73cf6da65d
|
default to allow all if no rules specified
|
2017-09-26 09:38:05 -04:00 |
|
Jeff Becker
|
713cec5f45
|
make it work
|
2017-09-24 10:32:06 -04:00 |
|
Jeff Becker
|
da7ad5a7fe
|
update query to go in order
|
2017-09-24 10:29:42 -04:00 |
|
Jeff Becker
|
5a2f3692cf
|
fix sql query
|
2017-09-24 10:21:56 -04:00 |
|
Jeff Becker
|
b634fa2665
|
fix previous commit
|
2017-09-24 10:18:31 -04:00 |
|
Jeff Becker
|
ab37624a7a
|
try fixing scrape from inn2
|
2017-09-24 10:16:08 -04:00 |
|
Jeff Becker
|
61c35b7652
|
* change feed defaults to be sane
* update docs
* add git revision to version
* bump to 2.5.1
|
2017-09-24 10:00:03 -04:00 |
|
Jeff Becker
|
69fac43124
|
add test target in main makefile
|
2017-09-24 08:18:56 -04:00 |
|
Jeff Becker
|
dee8c005fd
|
add git version to srnd version string
|
2017-09-24 08:10:35 -04:00 |
|
Jeff Becker
|
b61012fc43
|
make it work
|
2017-09-23 09:58:29 -04:00 |
|
Jeff Becker
|
d2887a99b4
|
use correct table
|
2017-09-23 09:33:42 -04:00 |
|