Compare commits
1640 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c9f0a8b9d9 | ||
|
|
e5b2a872d3 | ||
|
|
68460d18cc | ||
|
|
c839b44256 | ||
|
|
70bde00757 | ||
|
|
eb6d90ae88 | ||
|
|
4b8013d2d6 | ||
|
|
d528711641 | ||
|
|
1cc18bb195 | ||
|
|
74a9f3a843 | ||
|
|
e7f3c210df | ||
|
|
f94121080f | ||
|
|
761c8daac4 | ||
|
|
c667fc215e | ||
|
|
07be73c1b7 | ||
|
|
7e6896fa01 | ||
|
|
3cc882b116 | ||
|
|
ee699fb345 | ||
|
|
631e66d54f | ||
|
|
c7ef6fdb17 | ||
|
|
fb0a9813e1 | ||
|
|
6940c2f37b | ||
|
|
74ce848127 | ||
|
|
9e5c4aa3e7 | ||
|
|
7f460296dd | ||
|
|
b505307f2f | ||
|
|
4ab9382205 | ||
|
|
1e2aa99207 | ||
|
|
7472cabd48 | ||
|
|
d9e65057cf | ||
|
|
b12168b6b9 | ||
|
|
a63f26c3b6 | ||
|
|
095a123c3c | ||
|
|
f9a38a26b2 | ||
|
|
6124e217d0 | ||
|
|
11524bcb04 | ||
|
|
d5e5fac02d | ||
|
|
55da0046a2 | ||
|
|
977f0b13b3 | ||
|
|
2fed781350 | ||
|
|
6d1789bbee | ||
|
|
3deffcb46c | ||
|
|
be86e0bb7f | ||
|
|
67a2560de4 | ||
|
|
5c96761fd0 | ||
|
|
872d2499a2 | ||
|
|
7719be9866 | ||
|
|
7c153721f0 | ||
|
|
59d72c3b3d | ||
|
|
c571bfb133 | ||
|
|
da6d5b4be4 | ||
|
|
62fac483f2 | ||
|
|
61251ce137 | ||
|
|
30fe5a5393 | ||
|
|
3cf7c1d237 | ||
|
|
91f35ad63a | ||
|
|
a0b57b6bea | ||
|
|
205f4ff1fa | ||
|
|
b993450a23 | ||
|
|
d218c569d4 | ||
|
|
faa91b8bd4 | ||
|
|
582ad8c996 | ||
|
|
46a0768a45 | ||
|
|
8649aaaa54 | ||
|
|
6283c3d13d | ||
|
|
8f1e35954b | ||
|
|
9686a31419 | ||
|
|
632ec3e46e | ||
|
|
fb8811207e | ||
|
|
99eacdfc12 | ||
|
|
acfed0837a | ||
|
|
4bcc5aeea5 | ||
|
|
bd62698ea5 | ||
|
|
2921aed248 | ||
|
|
579558e59b | ||
|
|
fcb385cf01 | ||
|
|
c3193dd784 | ||
|
|
48cbb2bf1d | ||
|
|
1e7ae38684 | ||
|
|
1c5f66beee | ||
|
|
e0773174d0 | ||
|
|
8996cdf8f1 | ||
|
|
87f02fd0ef | ||
|
|
9625bdcd26 | ||
|
|
8b9ae7255b | ||
|
|
b537ec15b7 | ||
|
|
d0f296bc9c | ||
|
|
a020ea5c87 | ||
|
|
14f5842f10 | ||
|
|
6298685e09 | ||
|
|
96db5bf2a5 | ||
|
|
d6d54175f6 | ||
|
|
10e883f0ca | ||
|
|
a4ddfcd8ac | ||
|
|
ee9a2a6cb0 | ||
|
|
62b0b02466 | ||
|
|
4cc800c832 | ||
|
|
13579f5842 | ||
|
|
99f1388e23 | ||
|
|
bcfb47d9fd | ||
|
|
e1bf1ba87f | ||
|
|
46a652bb27 | ||
|
|
e7bae73c8f | ||
|
|
611f0b62ba | ||
|
|
a8447b7074 | ||
|
|
7baf9f296c | ||
|
|
53eb8c8484 | ||
|
|
b0461865a5 | ||
|
|
b5c2850e28 | ||
|
|
8c0a600525 | ||
|
|
9cda0e5d8f | ||
|
|
6546eb990b | ||
|
|
ff75e2ee92 | ||
|
|
6769c724cb | ||
|
|
b38509b2f5 | ||
|
|
5a0af6a64b | ||
|
|
bc2e06a9ec | ||
|
|
b5f101546a | ||
|
|
ccc4f27e3d | ||
|
|
2d8320b5a0 | ||
|
|
b548ea522b | ||
|
|
057975a3b9 | ||
|
|
36bbaa3ae1 | ||
|
|
737a740968 | ||
|
|
629b4256af | ||
|
|
f1d32bff89 | ||
|
|
a6ddb726d3 | ||
|
|
78df9ed086 | ||
|
|
39b39e3fdb | ||
|
|
2323ec1bf6 | ||
|
|
0e5a79ce2c | ||
|
|
aef2597b46 | ||
|
|
41613c09a9 | ||
|
|
ee55078b56 | ||
|
|
5fd746a52a | ||
|
|
4ed1791b30 | ||
|
|
d6fd5f170a | ||
|
|
40779e05e8 | ||
|
|
d0b1024566 | ||
|
|
63145ffee0 | ||
|
|
264929e5cb | ||
|
|
dc143c0682 | ||
|
|
0462703b13 | ||
|
|
73d2ed444e | ||
|
|
e2111278d2 | ||
|
|
73c4b327df | ||
|
|
2afda7b284 | ||
|
|
ccee16bed2 | ||
|
|
e814469b75 | ||
|
|
23ef00d01f | ||
|
|
893611def0 | ||
|
|
e124c1dbdb | ||
|
|
2c798a6cd8 | ||
|
|
d274b18adb | ||
|
|
2c97eeac79 | ||
|
|
2f939ff52b | ||
|
|
2a5c06702a | ||
|
|
ec70144d7e | ||
|
|
91dce56bf8 | ||
|
|
35014e4048 | ||
|
|
ebf05fd884 | ||
|
|
108cdd45b1 | ||
|
|
012a23008b | ||
|
|
c84e99d084 | ||
|
|
4291cda244 | ||
|
|
3a197c0c1d | ||
|
|
a34e433ebf | ||
|
|
176b5c9afd | ||
|
|
a8e4d29031 | ||
|
|
a15303a891 | ||
|
|
ccf043d670 | ||
|
|
91352e4f3a | ||
|
|
5956ec1148 | ||
|
|
cf29fbcf74 | ||
|
|
b47c4be25d | ||
|
|
e363d29b3b | ||
|
|
b010eac041 | ||
|
|
b6964a92fa | ||
|
|
9afb9d343b | ||
|
|
a421902bc7 | ||
|
|
bd363a576b | ||
|
|
cdcca6e761 | ||
|
|
64b5316570 | ||
|
|
5590445679 | ||
|
|
bc5a9c4fcc | ||
|
|
28dd15a950 | ||
|
|
92d3a4fa86 | ||
|
|
c7c759f2b1 | ||
|
|
d00412e7fb | ||
|
|
900cf6fa53 | ||
|
|
584026c23c | ||
|
|
c51fdc5c67 | ||
|
|
6e740657b6 | ||
|
|
9449316a14 | ||
|
|
dd39a2ac2e | ||
|
|
3b1a399d5f | ||
|
|
5c0171767c | ||
|
|
dd58a4eb3a | ||
|
|
a767ad6a51 | ||
|
|
f1b2ed6350 | ||
|
|
857999db07 | ||
|
|
4e4b4590c4 | ||
|
|
ee6170cd1b | ||
|
|
af8f58b61e | ||
|
|
03d8b3aafd | ||
|
|
d23602ac56 | ||
|
|
ee01e1095d | ||
|
|
5e4a414861 | ||
|
|
5899b8cfdb | ||
|
|
ae5df38c21 | ||
|
|
545f6fd7f9 | ||
|
|
4c7c223b2c | ||
|
|
14b983cfa0 | ||
|
|
229908207b | ||
|
|
cfe7dfd6b5 | ||
|
|
b2da0a902d | ||
|
|
3f06131c34 | ||
|
|
24f1a1ca9a | ||
|
|
54a74cdd91 | ||
|
|
7ca4c18e1c | ||
|
|
a2b7980ae2 | ||
|
|
e75a56fe08 | ||
|
|
abd8b9b705 | ||
|
|
54d2ba1df4 | ||
|
|
dbfeeac313 | ||
|
|
93316be5fe | ||
|
|
60b78a9f1c | ||
|
|
6359ba63f9 | ||
|
|
2853a2feaa | ||
|
|
c9b864ca54 | ||
|
|
6519b1cad4 | ||
|
|
ebf3df046a | ||
|
|
b6611d6d0e | ||
|
|
23ea21380a | ||
|
|
54a93a2f54 | ||
|
|
05f954eb8b | ||
|
|
27d4630874 | ||
|
|
7ac2ff92c4 | ||
|
|
92b0c6b4bf | ||
|
|
75e10fe38a | ||
|
|
6dfebaae96 | ||
|
|
3ffe213652 | ||
|
|
c9aa568767 | ||
|
|
3d3a2a5f7f | ||
|
|
7567bfb732 | ||
|
|
f0f0e94a9c | ||
|
|
41b0dac223 | ||
|
|
792bcaa711 | ||
|
|
fe1634eb2d | ||
|
|
4a52c4825b | ||
|
|
6358ce5266 | ||
|
|
e98af0ac21 | ||
|
|
48a48204f3 | ||
|
|
6f313986df | ||
|
|
3856ba09bb | ||
|
|
f982d862ee | ||
|
|
c76566c2df | ||
|
|
e7fffa3ef4 | ||
|
|
f7b28127e9 | ||
|
|
7ea11a884b | ||
|
|
faa0785fa1 | ||
|
|
9e5266a491 | ||
|
|
2f459719e8 | ||
|
|
5f92efa658 | ||
|
|
856976526f | ||
|
|
6852363a03 | ||
|
|
862427a872 | ||
|
|
fd90e1ab82 | ||
|
|
3117dc264f | ||
|
|
a28a60d9c8 | ||
|
|
f0063283e7 | ||
|
|
84680aa88d | ||
|
|
bd50e17c58 | ||
|
|
f08114f6c5 | ||
|
|
42b6e94564 | ||
|
|
d3a4a5bbf7 | ||
|
|
482eb1a214 | ||
|
|
94e05944fd | ||
|
|
2c8c46d6b1 | ||
|
|
717a973807 | ||
|
|
d68a4099ba | ||
|
|
e8425f371c | ||
|
|
a3311adebb | ||
|
|
28b61e57cd | ||
|
|
7890cc577f | ||
|
|
b14220e6e3 | ||
|
|
7ec1bc9fac | ||
|
|
e89d1d4688 | ||
|
|
6be9e477b1 | ||
|
|
207f947a1c | ||
|
|
32c11b9919 | ||
|
|
3fc4eaa39a | ||
|
|
a04475abc1 | ||
|
|
38976589ec | ||
|
|
f2c20b84bf | ||
|
|
983248374d | ||
|
|
6f635ed978 | ||
|
|
fcfaf56021 | ||
|
|
60f4406ec1 | ||
|
|
51c010daa8 | ||
|
|
cd88d805ce | ||
|
|
e41e16370e | ||
|
|
f2e354edeb | ||
|
|
f1354c6264 | ||
|
|
029a731fb9 | ||
|
|
d97e437e80 | ||
|
|
8a688eb4f0 | ||
|
|
94ef33264b | ||
|
|
a8355fbab9 | ||
|
|
95762bdddd | ||
|
|
4e42d1dda1 | ||
|
|
e4a92ea34b | ||
|
|
f11e9c58e4 | ||
|
|
342e70cc38 | ||
|
|
440e7b54a5 | ||
|
|
fe11ff0772 | ||
|
|
2b006b8f5e | ||
|
|
1790a0b09e | ||
|
|
057001f0bd | ||
|
|
e618b19283 | ||
|
|
62fd93c1ff | ||
|
|
807b2f6504 | ||
|
|
0a5ab83ffe | ||
|
|
3f4787d4c6 | ||
|
|
db9153f42c | ||
|
|
3b4c206a24 | ||
|
|
51371ba954 | ||
|
|
c36bb9771c | ||
|
|
ce97dedc5f | ||
|
|
682d19aa2b | ||
|
|
c3927c7f2e | ||
|
|
8911bbfa21 | ||
|
|
7288d5bdba | ||
|
|
8615eb20d4 | ||
|
|
a61934650e | ||
|
|
a2549a0ae9 | ||
|
|
405e2d3a4c | ||
|
|
02aba68269 | ||
|
|
8d071f853b | ||
|
|
44e0f2d410 | ||
|
|
9eca6a97ca | ||
|
|
a56d1f2bd8 | ||
|
|
133d4e193a | ||
|
|
db75c4a433 | ||
|
|
15ad90da88 | ||
|
|
29c48765ae | ||
|
|
8fe061738a | ||
|
|
7e7436f433 | ||
|
|
a3681216bd | ||
|
|
0074483280 | ||
|
|
e37f1c6165 | ||
|
|
4882546c66 | ||
|
|
bd747cd0fd | ||
|
|
a7bc1abf16 | ||
|
|
cf7e05e9c0 | ||
|
|
625f17a708 | ||
|
|
e10fee74b3 | ||
|
|
756ad3dfaf | ||
|
|
7c880497ed | ||
|
|
f15ee8fa17 | ||
|
|
95ad0e6aa5 | ||
|
|
a46cea5948 | ||
|
|
ee11893074 | ||
|
|
ab1d0d22dd | ||
|
|
72641c7983 | ||
|
|
61ab7ef3d3 | ||
|
|
f70b07e5a3 | ||
|
|
8fbb574228 | ||
|
|
af198dcfaa | ||
|
|
6f794e82a6 | ||
|
|
6fbc87b53f | ||
|
|
073cab5a85 | ||
|
|
b44332121a | ||
|
|
66e6f449cc | ||
|
|
65a6f608e6 | ||
|
|
69f09b92d3 | ||
|
|
8d6417b8ff | ||
|
|
35699f86e3 | ||
|
|
910542f2b5 | ||
|
|
1236a938c9 | ||
|
|
ceb8f663c0 | ||
|
|
7390799c80 | ||
|
|
77673f6bed | ||
|
|
c089395597 | ||
|
|
b10b806b76 | ||
|
|
413808300d | ||
|
|
a2c3f11680 | ||
|
|
68a71c516e | ||
|
|
0822512c21 | ||
|
|
45c6dbd2ce | ||
|
|
447c558957 | ||
|
|
638efd9e07 | ||
|
|
f69253616e | ||
|
|
e0f323fdeb | ||
|
|
28b7415581 | ||
|
|
a9ed5d144d | ||
|
|
4a9a856df5 | ||
|
|
7519bad64c | ||
|
|
1787123aac | ||
|
|
1401b31af8 | ||
|
|
ebecffec90 | ||
|
|
06b1af46ea | ||
|
|
7e7e88557d | ||
|
|
6679744ce5 | ||
|
|
7c163142c4 | ||
|
|
f578123acb | ||
|
|
2fe825f67d | ||
|
|
ef662a16df | ||
|
|
6d58f6a188 | ||
|
|
96ca33f878 | ||
|
|
fead5a87a8 | ||
|
|
4ed5cca0aa | ||
|
|
16e43de35e | ||
|
|
99774adc87 | ||
|
|
1f90490230 | ||
|
|
0fbe7be786 | ||
|
|
1c58a8f021 | ||
|
|
09f586be25 | ||
|
|
862c977eda | ||
|
|
369451c4a5 | ||
|
|
23bfaa530b | ||
|
|
9aec2e9b86 | ||
|
|
13a33cb8f8 | ||
|
|
8aa719cce7 | ||
|
|
ec24bdf64f | ||
|
|
7dfcd0983a | ||
|
|
3003cbf359 | ||
|
|
032c93ebf9 | ||
|
|
53f4007292 | ||
|
|
2d0cee80c2 | ||
|
|
b37e55648b | ||
|
|
ed963c80a9 | ||
|
|
18f97b9bd5 | ||
|
|
66efc0cc72 | ||
|
|
b6fc114a14 | ||
|
|
e8192821cc | ||
|
|
da595b8c8e | ||
|
|
6c6b47c4b8 | ||
|
|
5f0797e3ed | ||
|
|
6acfd4b9f1 | ||
|
|
b7cd07e0a3 | ||
|
|
46d822a487 | ||
|
|
f4ce789ffc | ||
|
|
2c19e16920 | ||
|
|
f5d86525d9 | ||
|
|
93312f74ea | ||
|
|
275dc78b50 | ||
|
|
e4b7056b6d | ||
|
|
10907dfa33 | ||
|
|
17108c1cbe | ||
|
|
f28f69b00a | ||
|
|
2e66e3f48a | ||
|
|
61926b648c | ||
|
|
d0792e0a1c | ||
|
|
71f3b031d4 | ||
|
|
5a5c0be51a | ||
|
|
59b32f8b25 | ||
|
|
ab05d8a1b5 | ||
|
|
d05b1fb9b2 | ||
|
|
e0a3fe526e | ||
|
|
5e4de123b0 | ||
|
|
2251f5fafa | ||
|
|
f02c276310 | ||
|
|
8470777f6c | ||
|
|
3e29a5e3a3 | ||
|
|
fb171e2d4b | ||
|
|
b4b5b4a637 | ||
|
|
96d08858a4 | ||
|
|
0b3698438b | ||
|
|
8b9fe6e2bc | ||
|
|
968fb7b157 | ||
|
|
e07851aecf | ||
|
|
45ad5d8e4e | ||
|
|
50d8059e9f | ||
|
|
278a5319a4 | ||
|
|
f86bc50dba | ||
|
|
409a4f867d | ||
|
|
1a8378f433 | ||
|
|
dfbb7f347e | ||
|
|
4cb350a003 | ||
|
|
b20f748b4f | ||
|
|
76663a1303 | ||
|
|
2495c40423 | ||
|
|
f809f0f3b4 | ||
|
|
1dbed2beec | ||
|
|
2926a46ae8 | ||
|
|
f09d4e1101 | ||
|
|
3a1cea0939 | ||
|
|
21b73b085e | ||
|
|
1526611413 | ||
|
|
75fb71dc88 | ||
|
|
ecc8ec3fd8 | ||
|
|
3eb107a79d | ||
|
|
6258a42181 | ||
|
|
321735497f | ||
|
|
e2d20b0eb4 | ||
|
|
131cd5ea9a | ||
|
|
7ab800be97 | ||
|
|
9fc189b3b7 | ||
|
|
51fcdf649e | ||
|
|
36047693aa | ||
|
|
fdb62f7226 | ||
|
|
1ecb364f30 | ||
|
|
19fa40e967 | ||
|
|
6120c3bc44 | ||
|
|
3b2273e75b | ||
|
|
9899f37528 | ||
|
|
2a49d86d9f | ||
|
|
714f5564d0 | ||
|
|
a815c3bcc5 | ||
|
|
0e0e37437e | ||
|
|
a15982df5e | ||
|
|
930ff5b09d | ||
|
|
9fc0dbfc2b | ||
|
|
d55d1c558c | ||
|
|
870fa0b8b6 | ||
|
|
2bf5fd1a37 | ||
|
|
f0b05ec5ed | ||
|
|
b4b30e59c7 | ||
|
|
cd4da389c3 | ||
|
|
c219264968 | ||
|
|
ed36aebf6d | ||
|
|
533a55c52c | ||
|
|
fb95963942 | ||
|
|
d4a49a47e5 | ||
|
|
aa7a8271f3 | ||
|
|
86048e041c | ||
|
|
c4712224aa | ||
|
|
137870b698 | ||
|
|
d8f339eae6 | ||
|
|
3d49e8ca4f | ||
|
|
ee846e336d | ||
|
|
597621ad2e | ||
|
|
055a0bd8c1 | ||
|
|
8b5aa0a6bb | ||
|
|
cf208e2f64 | ||
|
|
475a188a80 | ||
|
|
c75b0950bd | ||
|
|
487f019c89 | ||
|
|
167555016a | ||
|
|
d45baaddbc | ||
|
|
4b48fc2557 | ||
|
|
15aba0bea9 | ||
|
|
899acc248d | ||
|
|
12b8c3e04c | ||
|
|
d1fda8714d | ||
|
|
bfa6896ef9 | ||
|
|
091ae93731 | ||
|
|
f73b40ebdb | ||
|
|
fabeb4711f | ||
|
|
c3b2a3b623 | ||
|
|
215624ad33 | ||
|
|
55db970cde | ||
|
|
126dbc39b4 | ||
|
|
876bba479c | ||
|
|
2021a2cc1c | ||
|
|
2e17f56f1e | ||
|
|
27c9394b0d | ||
|
|
570a8dd7f2 | ||
|
|
bd4106190e | ||
|
|
1aed19035e | ||
|
|
90ef1c843a | ||
|
|
c6afb8c1e9 | ||
|
|
c2fd8661b5 | ||
|
|
f03604d3bc | ||
|
|
e2bb4d2e56 | ||
|
|
ebec169e67 | ||
|
|
3fad6fc2ad | ||
|
|
afc1dd7377 | ||
|
|
3fcb8af756 | ||
|
|
d96fd8191d | ||
|
|
d37280b296 | ||
|
|
4fdcac5cf9 | ||
|
|
b74998db87 | ||
|
|
606da31851 | ||
|
|
8a073aa7bc | ||
|
|
5dd03bb0ca | ||
|
|
913811b90d | ||
|
|
960b665ba4 | ||
|
|
5a50a2bff4 | ||
|
|
db96f46dcb | ||
|
|
a2d6c7f951 | ||
|
|
88bda9ce2c | ||
|
|
aa68553539 | ||
|
|
9f17a525f1 | ||
|
|
f6bc6f3481 | ||
|
|
993ff81130 | ||
|
|
499e51e996 | ||
|
|
2501a72bb8 | ||
|
|
7b3793728a | ||
|
|
eb0572ea77 | ||
|
|
131200a28e | ||
|
|
379dd4d598 | ||
|
|
a3004438a9 | ||
|
|
3c9b56f35f | ||
|
|
38c79a81e3 | ||
|
|
66c9b8045d | ||
|
|
428f374a8c | ||
|
|
45d19d1cdd | ||
|
|
1a9a19e1cb | ||
|
|
72b0b011ee | ||
|
|
b656f89c8e | ||
|
|
45acf4a094 | ||
|
|
b17e0c0325 | ||
|
|
59cb2bee8b | ||
|
|
bf55a20241 | ||
|
|
9a1510fe7e | ||
|
|
3bfb3620f1 | ||
|
|
8acbe0bb1c | ||
|
|
87a39bf033 | ||
|
|
a5bb1f768e | ||
|
|
c146df3d25 | ||
|
|
25af1802af | ||
|
|
67aeeea4d1 | ||
|
|
081c86aba0 | ||
|
|
72e0c7fdb5 | ||
|
|
b9a39c2760 | ||
|
|
1130569a20 | ||
|
|
fb26be821b | ||
|
|
3abac67b2e | ||
|
|
81ddbc30f4 | ||
|
|
6519ed7101 | ||
|
|
0a4df8296e | ||
|
|
38abb74c4c | ||
|
|
48b720b00a | ||
|
|
d2189adea0 | ||
|
|
354643f0f6 | ||
|
|
6beb421dd0 | ||
|
|
ded6378a3f | ||
|
|
83b108f91f | ||
|
|
372aa2c122 | ||
|
|
7b0785248c | ||
|
|
e4ca110938 | ||
|
|
f3eacbe639 | ||
|
|
26db0fad85 | ||
|
|
7d86ff057c | ||
|
|
ac98ec8351 | ||
|
|
848de7f4fe | ||
|
|
0d3c6d8684 | ||
|
|
845e5d863a | ||
|
|
9e0add7bde | ||
|
|
18a220440b | ||
|
|
bc755ea6ec | ||
|
|
33710f16fe | ||
|
|
321af81d88 | ||
|
|
6d9d71ea6d | ||
|
|
7d1c6d1659 | ||
|
|
d503cbaaac | ||
|
|
db7de9253a | ||
|
|
a8a5887c28 | ||
|
|
8c65caf35f | ||
|
|
03cfeb22d8 | ||
|
|
f3a5879c66 | ||
|
|
4e42f78bb0 | ||
|
|
1c63384082 | ||
|
|
0be8533063 | ||
|
|
b1660bb9d6 | ||
|
|
9f16f938dc | ||
|
|
5f9748582d | ||
|
|
c577aa1318 | ||
|
|
0eeb55a0ca | ||
|
|
04c516f783 | ||
|
|
6c898b207e | ||
|
|
08c7aae6b7 | ||
|
|
b6e3af45e9 | ||
|
|
6eebb8229f | ||
|
|
47531f5790 | ||
|
|
62e29f389b | ||
|
|
3cc834d424 | ||
|
|
0c7c7f3987 | ||
|
|
4e35090ba6 | ||
|
|
025246eacb | ||
|
|
117eb86e8c | ||
|
|
198386e500 | ||
|
|
bdcdf9a9a2 | ||
|
|
dc8eb69962 | ||
|
|
9b33894a30 | ||
|
|
77478e4483 | ||
|
|
65161e9133 | ||
|
|
8946dd012c | ||
|
|
10268cbb06 | ||
|
|
b2a2776fe3 | ||
|
|
f72988a71a | ||
|
|
a48661745e | ||
|
|
fb04f7fffb | ||
|
|
fac1d4bff9 | ||
|
|
99cf2b32b1 | ||
|
|
6a3b66b266 | ||
|
|
1046815d37 | ||
|
|
f8371e7330 | ||
|
|
040f85149b | ||
|
|
0162ab576b | ||
|
|
379a689ebc | ||
|
|
09d251de21 | ||
|
|
ea54edcbcf | ||
|
|
2860240ae8 | ||
|
|
b2b11da3e3 | ||
|
|
88ff20593a | ||
|
|
2796083c4c | ||
|
|
30bcef32e4 | ||
|
|
33d5cd6b5c | ||
|
|
c574459485 | ||
|
|
ca9933a489 | ||
|
|
429b7e38b5 | ||
|
|
8c7110ae85 | ||
|
|
a43a7b5f75 | ||
|
|
5b9218251e | ||
|
|
461ca0af32 | ||
|
|
97443a11e2 | ||
|
|
5aff21aab2 | ||
|
|
1cbe807b05 | ||
|
|
d8ea0c6baf | ||
|
|
d6ef64c70a | ||
|
|
b31fbf5810 | ||
|
|
f2ab119397 | ||
|
|
33e42be32d | ||
|
|
8c92756493 | ||
|
|
c2ca09867a | ||
|
|
a1eb981fd4 | ||
|
|
e32f086b8a | ||
|
|
bdfdbbcaeb | ||
|
|
3cdabb7d81 | ||
|
|
422ed2ff51 | ||
|
|
6e76ffb60f | ||
|
|
eaa809931c | ||
|
|
4163435c84 | ||
|
|
99263ab36a | ||
|
|
0d76fa8560 | ||
|
|
c3644576b8 | ||
|
|
325e345b4e | ||
|
|
3b7972454d | ||
|
|
6af5e42bf0 | ||
|
|
edc68921c9 | ||
|
|
83c3f44ae7 | ||
|
|
6d7e79e9de | ||
|
|
401029bd27 | ||
|
|
33a0477fab | ||
|
|
6826c10a09 | ||
|
|
8133b61ebd | ||
|
|
898d7b40b3 | ||
|
|
5a9beb2e5c | ||
|
|
a63fda8a0d | ||
|
|
0baf043f74 | ||
|
|
cbc32a79d2 | ||
|
|
df5a68bcec | ||
|
|
1ca6a67a24 | ||
|
|
f27a537f70 | ||
|
|
aa76fae386 | ||
|
|
d35d53825c | ||
|
|
7f743141fb | ||
|
|
fa88a08d8e | ||
|
|
06d0bb1ab2 | ||
|
|
3c0f35b3b7 | ||
|
|
396d9c1a65 | ||
|
|
e41f3a4ce7 | ||
|
|
8f9e4d6e4f | ||
|
|
d0764f0865 | ||
|
|
ab32eedbb9 | ||
|
|
73f858e071 | ||
|
|
73b4a1254c | ||
|
|
fbf82d999f | ||
|
|
1f68481256 | ||
|
|
876cfb421a | ||
|
|
c97f1bd750 | ||
|
|
e4dec9f0de | ||
|
|
282b4c102f | ||
|
|
37e0003810 | ||
|
|
42683e4f09 | ||
|
|
6352ea7c6f | ||
|
|
40c10e672c | ||
|
|
fef85190c5 | ||
|
|
eea1be0fc1 | ||
|
|
633862d121 | ||
|
|
86ac770971 | ||
|
|
7685b95031 | ||
|
|
a6105e8a1b | ||
|
|
9feea3ba1d | ||
|
|
22f415abfa | ||
|
|
c99292d327 | ||
|
|
362ef519b7 | ||
|
|
a053c120c4 | ||
|
|
4d133ed2df | ||
|
|
d2cf18e11d | ||
|
|
5ddfd2b5b9 | ||
|
|
71264bffa1 | ||
|
|
f39005f5e1 | ||
|
|
9454308ba7 | ||
|
|
51dd622e20 | ||
|
|
05de55cc6b | ||
|
|
db441c8406 | ||
|
|
295c535002 | ||
|
|
b0606feff3 | ||
|
|
2070014021 | ||
|
|
def53aa22e | ||
|
|
a3d10385a0 | ||
|
|
cb7527a44b | ||
|
|
32e420efbb | ||
|
|
6db9bef115 | ||
|
|
a0b440efcd | ||
|
|
d2bb7ae493 | ||
|
|
b4e213518b | ||
|
|
e3b0da4717 | ||
|
|
155de5a032 | ||
|
|
57e166940d | ||
|
|
721efb79fd | ||
|
|
5338342208 | ||
|
|
c49ef3052f | ||
|
|
802f4df2ce | ||
|
|
1edcee9ce3 | ||
|
|
3acd7d7d41 | ||
|
|
83dc29a562 | ||
|
|
b25b9ca928 | ||
|
|
0dc11b7edb | ||
|
|
9b477e2eb8 | ||
|
|
272f6726ea | ||
|
|
181717001a | ||
|
|
43b654285f | ||
|
|
50e7d5036e | ||
|
|
b6b2f2e2a6 | ||
|
|
b9d08855d0 | ||
|
|
93deb2b1be | ||
|
|
b3871d550c | ||
|
|
ab8e87899c | ||
|
|
9d6f44849a | ||
|
|
380588c11d | ||
|
|
5810c28294 | ||
|
|
c039015e8f | ||
|
|
0dda0a228a | ||
|
|
940514b16b | ||
|
|
8adff43113 | ||
|
|
b59699dabe | ||
|
|
f496ce4861 | ||
|
|
5fb4eccd0f | ||
|
|
31e4cadecb | ||
|
|
994484f3b0 | ||
|
|
7b3a3451f6 | ||
|
|
14d075bc17 | ||
|
|
75369411b3 | ||
|
|
d97542a3fd | ||
|
|
2f70fcd92a | ||
|
|
182f93d618 | ||
|
|
34e28384dd | ||
|
|
f6f095f949 | ||
|
|
08609bdf53 | ||
|
|
5de5667f80 | ||
|
|
69b3ba47b3 | ||
|
|
11c1d0b827 | ||
|
|
8f97880754 | ||
|
|
ff435bea95 | ||
|
|
cd66b7f5b8 | ||
|
|
a60286c328 | ||
|
|
49e38862af | ||
|
|
75b8cc0766 | ||
|
|
a8e2f00e16 | ||
|
|
d099a85c59 | ||
|
|
55b2a86397 | ||
|
|
d39dfbe62f | ||
|
|
a41e62cefe | ||
|
|
c981562f90 | ||
|
|
e6cd57cc26 | ||
|
|
074152ae14 | ||
|
|
91ca7b40b8 | ||
|
|
5321c8d9c0 | ||
|
|
b7f753ebb6 | ||
|
|
c5e8ba3cdf | ||
|
|
658ef5309b | ||
|
|
823f642225 | ||
|
|
57ea6bad07 | ||
|
|
109c645e68 | ||
|
|
5ef0ce5aa8 | ||
|
|
f6d9e083b8 | ||
|
|
499517e882 | ||
|
|
648db532bb | ||
|
|
1ce4537605 | ||
|
|
701812ed9d | ||
|
|
8d9e81827b | ||
|
|
f51a2816b4 | ||
|
|
3d4a7950c5 | ||
|
|
ba6668f144 | ||
|
|
e1f7a77d15 | ||
|
|
64e2c512d3 | ||
|
|
6082e68a1f | ||
|
|
f135d48e55 | ||
|
|
751fc8fdb4 | ||
|
|
df73e79ee4 | ||
|
|
fa6cfdb609 | ||
|
|
b057a05520 | ||
|
|
cb0938721c | ||
|
|
4f3f8de734 | ||
|
|
5ba303aada | ||
|
|
bd42fefe4e | ||
|
|
d24c081973 | ||
|
|
1b9eddd905 | ||
|
|
0bfe398dc4 | ||
|
|
e9216a472f | ||
|
|
8b93ec0df6 | ||
|
|
7497706a0d | ||
|
|
6e41cb0630 | ||
|
|
62d99e7e90 | ||
|
|
43cddb3580 | ||
|
|
c9c1beda75 | ||
|
|
3ee9ae5fb8 | ||
|
|
ea6344fae1 | ||
|
|
6f54e91f5c | ||
|
|
27fb3aaa19 | ||
|
|
86d736745d | ||
|
|
821fe21c2b | ||
|
|
7f4aa518dc | ||
|
|
8cf589e433 | ||
|
|
105a29cd70 | ||
|
|
cb6a5e81e7 | ||
|
|
9c073383ad | ||
|
|
5e0756825d | ||
|
|
933523ae6d | ||
|
|
ed6b05605c | ||
|
|
71a9c34620 | ||
|
|
e29f2cb920 | ||
|
|
d47dd88d6c | ||
|
|
fb34bbce7a | ||
|
|
100236da83 | ||
|
|
a45a3002d5 | ||
|
|
9214a4c978 | ||
|
|
70761dc222 | ||
|
|
32e8136f71 | ||
|
|
8b20d99b2c | ||
|
|
1174b5cc7f | ||
|
|
ec448cfdfb | ||
|
|
f3e44b1baf | ||
|
|
0ea740aa7c | ||
|
|
5f118471cb | ||
|
|
504f78dd49 | ||
|
|
72723c7d1f | ||
|
|
6a74053853 | ||
|
|
af0b4987a4 | ||
|
|
775140cf79 | ||
|
|
6a8a796add | ||
|
|
8e4bda3760 | ||
|
|
a36e8145a8 | ||
|
|
3cbd899daa | ||
|
|
30f356a2c7 | ||
|
|
1138a115ce | ||
|
|
c397da75e7 | ||
|
|
1d141c9313 | ||
|
|
a4cc365af8 | ||
|
|
4e551bec0d | ||
|
|
e03086062d | ||
|
|
270a5a5e20 | ||
|
|
bda9133ed6 | ||
|
|
749f475f2c | ||
|
|
e38394948c | ||
|
|
51fc4cbb6a | ||
|
|
9a976cda37 | ||
|
|
e42521f0a3 | ||
|
|
0756d39ac5 | ||
|
|
4595bdcee4 | ||
|
|
38160065cc | ||
|
|
3d04f013cd | ||
|
|
8e1a416be3 | ||
|
|
a98bc42f1a | ||
|
|
6c93769838 | ||
|
|
d2dccfebc5 | ||
|
|
82fe59e469 | ||
|
|
afc05e1731 | ||
|
|
0206b0a522 | ||
|
|
0e1e5a5ebe | ||
|
|
9ad088ed6a | ||
|
|
34da04bba5 | ||
|
|
09ce812faf | ||
|
|
1dc8cb2a98 | ||
|
|
e73c509823 | ||
|
|
e70a85400f | ||
|
|
f7aecf8eed | ||
|
|
cc2645aa9d | ||
|
|
52d23c4a8d | ||
|
|
1e57ddb9ee | ||
|
|
7ae883d921 | ||
|
|
27e97214bd | ||
|
|
6321a9e7e0 | ||
|
|
a9eadca46c | ||
|
|
76bef8a725 | ||
|
|
308b76dc7d | ||
|
|
31d4d29f3e | ||
|
|
016a7e87ea | ||
|
|
4ce88c7bfc | ||
|
|
f570bffcf7 | ||
|
|
3bb9aaf637 | ||
|
|
cf7a64c934 | ||
|
|
c466603193 | ||
|
|
bc53f329a9 | ||
|
|
4a5cc5153f | ||
|
|
8697670fe1 | ||
|
|
64d8543af9 | ||
|
|
482cc242cb | ||
|
|
2051e8183c | ||
|
|
d183903917 | ||
|
|
5c695899a1 | ||
|
|
708e912069 | ||
|
|
db1f4b2b52 | ||
|
|
1508782f49 | ||
|
|
445b830683 | ||
|
|
1a17e88142 | ||
|
|
c0ec2e7856 | ||
|
|
9e962bd0d1 | ||
|
|
7efcff13bb | ||
|
|
e70d0df949 | ||
|
|
fcaa469edd | ||
|
|
51508182ef | ||
|
|
27e78c1626 | ||
|
|
0b4d37a0b6 | ||
|
|
ddbebba6f1 | ||
|
|
7f296348e4 | ||
|
|
ca78e32d97 | ||
|
|
4efc561f4d | ||
|
|
40fed798a1 | ||
|
|
0876afc08c | ||
|
|
ba4c4d06ff | ||
|
|
f64c30af48 | ||
|
|
bb0cea2dd3 | ||
|
|
3c120ce602 | ||
|
|
6151dfb161 | ||
|
|
f05d4ec931 | ||
|
|
e16afc3fc2 | ||
|
|
1b8753fead | ||
|
|
ba960d1ced | ||
|
|
41b60b6152 | ||
|
|
70ddce713c | ||
|
|
e15622748b | ||
|
|
96687021ff | ||
|
|
3c0a7ef510 | ||
|
|
4d84c9fb3f | ||
|
|
aa35a16610 | ||
|
|
a380fcb680 | ||
|
|
e544afe475 | ||
|
|
c089388323 | ||
|
|
e97a043031 | ||
|
|
d1b6dfe577 | ||
|
|
9189fd411e | ||
|
|
432eba80a9 | ||
|
|
db39612c54 | ||
|
|
5794c82a2d | ||
|
|
acf875a886 | ||
|
|
79185bd90f | ||
|
|
d695c30988 | ||
|
|
a1308fbdc9 | ||
|
|
e4f2b761d6 | ||
|
|
6ff6009a70 | ||
|
|
dadeb4006e | ||
|
|
ee0ff762e5 | ||
|
|
1f01ba1d10 | ||
|
|
62965fe1df | ||
|
|
e29eb4cce5 | ||
|
|
699791e318 | ||
|
|
946fbbec3c | ||
|
|
d2aae0103d | ||
|
|
ab06e38b7c | ||
|
|
bd531c85b1 | ||
|
|
8a0ca3c2e5 | ||
|
|
97317ed2c6 | ||
|
|
cda9aae8a3 | ||
|
|
a33e785043 | ||
|
|
833e266a1f | ||
|
|
1bb9b2cb3f | ||
|
|
7ba129b3bf | ||
|
|
1e2c9ca28a | ||
|
|
c6f37fd05f | ||
|
|
b6b569fff9 | ||
|
|
ac57c016a6 | ||
|
|
28fdd9de95 | ||
|
|
1ec946aaa9 | ||
|
|
d6110e3c6f | ||
|
|
4c5302bd4c | ||
|
|
21ee3d5c3e | ||
|
|
e5c036cee8 | ||
|
|
6f82488af7 | ||
|
|
57a7903c63 | ||
|
|
27b89b333a | ||
|
|
ce2c4e7492 | ||
|
|
cad98a2a33 | ||
|
|
40da48e685 | ||
|
|
1c393e5c3e | ||
|
|
667c143c74 | ||
|
|
bc089c18ce | ||
|
|
24b730c0e2 | ||
|
|
9ed9e9b973 | ||
|
|
5b0027aa3d | ||
|
|
810c5e4e8b | ||
|
|
907534958f | ||
|
|
f08a18ab07 | ||
|
|
40549d5ca7 | ||
|
|
3e67edc506 | ||
|
|
9c56a81f65 | ||
|
|
a9a636c9ae | ||
|
|
98374dcd74 | ||
|
|
10ca6eec91 | ||
|
|
216d32cf21 | ||
|
|
248fae4fe6 | ||
|
|
b479b6839d | ||
|
|
1a4e1e9515 | ||
|
|
e5160a4ee8 | ||
|
|
56ea3964a7 | ||
|
|
ad73778286 | ||
|
|
3e548f48c8 | ||
|
|
ae466931fa | ||
|
|
68052b526f | ||
|
|
903b5b88a7 | ||
|
|
007823d6b2 | ||
|
|
db5c4fb349 | ||
|
|
c37901290a | ||
|
|
da67f1f6f8 | ||
|
|
5172fa69e5 | ||
|
|
dd7280cd0d | ||
|
|
0d0f522c88 | ||
|
|
5429e6ed5c | ||
|
|
9db69fa05b | ||
|
|
3b8d52bcb5 | ||
|
|
807f39a336 | ||
|
|
fea2f30461 | ||
|
|
5d97e3f95f | ||
|
|
63e6ca3e99 | ||
|
|
b11590ec3c | ||
|
|
3a43ed6919 | ||
|
|
15ce9c91fb | ||
|
|
0e8d7537d4 | ||
|
|
1fca0787be | ||
|
|
af30285c00 | ||
|
|
a84cab7afd | ||
|
|
593573ddfb | ||
|
|
e9e9f81bdb | ||
|
|
61f624841b | ||
|
|
4bb38a2730 | ||
|
|
d4ec0df00c | ||
|
|
c8a7d855f8 | ||
|
|
73a126dcd5 | ||
|
|
0736533389 | ||
|
|
2695d658ab | ||
|
|
947166e793 | ||
|
|
80c49a7cf5 | ||
|
|
55bfa8f669 | ||
|
|
74ade14f5e | ||
|
|
c9b5218ebc | ||
|
|
b324b2bd65 | ||
|
|
35c038efa2 | ||
|
|
caa404d58d | ||
|
|
830103b9d5 | ||
|
|
6e18379597 | ||
|
|
6effbacb28 | ||
|
|
a20a1a0234 | ||
|
|
3667724061 | ||
|
|
785179e4a7 | ||
|
|
715338f821 | ||
|
|
7d5a82ab6d | ||
|
|
e764cfcc1c | ||
|
|
363acf37bc | ||
|
|
5fd687c1e4 | ||
|
|
dbedcbb93d | ||
|
|
9e9611f11f | ||
|
|
44002838da | ||
|
|
4daab8459f | ||
|
|
5a002f75cc | ||
|
|
a2180a1365 | ||
|
|
7b836acf36 | ||
|
|
a112a561cc | ||
|
|
6dcc2a69f4 | ||
|
|
74e9c55a09 | ||
|
|
d4d6e736a4 | ||
|
|
5cf9938fa2 | ||
|
|
72ad0ad983 | ||
|
|
690750d91e | ||
|
|
9f1dfc4b9c | ||
|
|
05eab5307f | ||
|
|
b0fe70c960 | ||
|
|
09d7992bc4 | ||
|
|
c832a432c1 | ||
|
|
41c22f4314 | ||
|
|
252d45c79b | ||
|
|
ae8a214a3a | ||
|
|
86ce6d7664 | ||
|
|
67e96d6106 | ||
|
|
24d9ec2b75 | ||
|
|
501e47c6ec | ||
|
|
5534a5a5c2 | ||
|
|
7246aabf40 | ||
|
|
604ffae87e | ||
|
|
2d5c16456b | ||
|
|
d44f7633dc | ||
|
|
469ac4035c | ||
|
|
dab218a6d7 | ||
|
|
d6fc675d57 | ||
|
|
04148f7365 | ||
|
|
4c34ac570f | ||
|
|
fbdb8758a3 | ||
|
|
2d08747d70 | ||
|
|
0b4bacbbd1 | ||
|
|
e0412c7edb | ||
|
|
38501cebf1 | ||
|
|
ee45d0217e | ||
|
|
558f362919 | ||
|
|
fb9db2f50c | ||
|
|
c1862e9c68 | ||
|
|
731bde8e28 | ||
|
|
47c87f8694 | ||
|
|
5558cdacc3 | ||
|
|
4650d244a5 | ||
|
|
c65b8aae07 | ||
|
|
7ba2fb9584 | ||
|
|
9a2cfd0c9b | ||
|
|
a7d61b1f2b | ||
|
|
7ab185f7d7 | ||
|
|
724541d691 | ||
|
|
baa6cda9c2 | ||
|
|
9c987e9aad | ||
|
|
134974ea9c | ||
|
|
2d946958e3 | ||
|
|
ffe010e9ce | ||
|
|
1c67252b0c | ||
|
|
60c1be25d4 | ||
|
|
18323a0916 | ||
|
|
9d98abded9 | ||
|
|
b06a742b8c | ||
|
|
87fe44f188 | ||
|
|
96f6ef1693 | ||
|
|
374b7b7261 | ||
|
|
23c4141e55 | ||
|
|
c21200c2a9 | ||
|
|
4a8b94259d | ||
|
|
28a58df27b | ||
|
|
caaf486bbe | ||
|
|
0a972a399e | ||
|
|
245dad1239 | ||
|
|
a6b6a2fbff | ||
|
|
53000a949b | ||
|
|
eae1dd59a7 | ||
|
|
e6347a76a8 | ||
|
|
13e0fb3df7 | ||
|
|
3f1b23ef8a | ||
|
|
acae7f0658 | ||
|
|
a9456b1bd6 | ||
|
|
e4d5a230d2 | ||
|
|
fedf44b9fa | ||
|
|
451db104e8 | ||
|
|
9ac4c7f4e3 | ||
|
|
7cf1c6f016 | ||
|
|
6dd87ee301 | ||
|
|
96837fa8db | ||
|
|
d816e76962 | ||
|
|
310945d9cd | ||
|
|
1aba480495 | ||
|
|
07407749fe | ||
|
|
dfab70dd90 | ||
|
|
3b15469c98 | ||
|
|
e4590800c2 | ||
|
|
c63d4b8ad0 | ||
|
|
1fb913e2ed | ||
|
|
72ace2dab7 | ||
|
|
3bcef18629 | ||
|
|
c91758519c | ||
|
|
9c8f2e7aa0 | ||
|
|
5f377af6d5 | ||
|
|
570b5b1766 | ||
|
|
c4d53d58eb | ||
|
|
ed65033cf1 | ||
|
|
41836bde26 | ||
|
|
8381858742 | ||
|
|
1040bd0d58 | ||
|
|
404e47332e | ||
|
|
3db128785e | ||
|
|
2189ea11df | ||
|
|
49b9bd65b0 | ||
|
|
b3fdb1ff58 | ||
|
|
c79e3fdcf0 | ||
|
|
d7509f7030 | ||
|
|
5c99b55502 | ||
|
|
fd255f022b | ||
|
|
41642589ae | ||
|
|
619fef3bff | ||
|
|
38c0da0cf8 | ||
|
|
b241a58e84 | ||
|
|
35c9585b22 | ||
|
|
d2fe95cc05 | ||
|
|
92e60ba141 | ||
|
|
2356527791 | ||
|
|
cab0f7b522 | ||
|
|
8d3f101a68 | ||
|
|
c8ac2b6281 | ||
|
|
d7d8efd305 | ||
|
|
a4bc04c958 | ||
|
|
5fc208c95a | ||
|
|
02743d5955 | ||
|
|
a7ffebea35 | ||
|
|
c511ef50a2 | ||
|
|
82902e0cde | ||
|
|
1de5ae09bc | ||
|
|
8b735f1cb5 | ||
|
|
33d1334174 | ||
|
|
324b58c21b | ||
|
|
b7b1651709 | ||
|
|
b5a4a6a9ff | ||
|
|
fe2c82b03c | ||
|
|
81e4bca9ef | ||
|
|
c0d055b825 | ||
|
|
188ae38525 | ||
|
|
86a8fe7096 | ||
|
|
0bb2b45f5c | ||
|
|
a17d8731c8 | ||
|
|
9cdd2326c8 | ||
|
|
d75653631d | ||
|
|
e234c8906e | ||
|
|
57baea18b5 | ||
|
|
0f3efe29c4 | ||
|
|
89b87a38b3 | ||
|
|
c52b7ca2e9 | ||
|
|
371b55dc9e | ||
|
|
53e572353c | ||
|
|
3ae71c74e9 | ||
|
|
cb643c04f7 | ||
|
|
faf9ee159b | ||
|
|
ffb3b2d73e | ||
|
|
ffcc327089 | ||
|
|
dfd5a6a86a | ||
|
|
d43f89b067 | ||
|
|
f15c3ab6a2 | ||
|
|
e27809298e | ||
|
|
4b3e28e14b | ||
|
|
71ce9153ed | ||
|
|
25d63966de | ||
|
|
98afbb54b6 | ||
|
|
03a51ca5dd | ||
|
|
428481b2d5 | ||
|
|
f87c60e6db | ||
|
|
6d824e38bc | ||
|
|
f0fd5bfb9e | ||
|
|
33374df671 | ||
|
|
c035b1b19c | ||
|
|
b3b09ed666 | ||
|
|
8029c00a02 | ||
|
|
a2c0921013 | ||
|
|
31cdabc229 | ||
|
|
1059a0aae0 | ||
|
|
e6576e7f40 | ||
|
|
5837144095 | ||
|
|
d30a5c4207 | ||
|
|
7d169b0e5e | ||
|
|
1f54226673 | ||
|
|
901a90ff13 | ||
|
|
56573d1d34 | ||
|
|
b0ab78340a | ||
|
|
93539be492 | ||
|
|
c551e21766 | ||
|
|
ed342af97d | ||
|
|
17b87a2cb1 | ||
|
|
69ca02834d | ||
|
|
6cb4099a2e | ||
|
|
e75a4966b2 | ||
|
|
d55cba49bd | ||
|
|
0215abac30 | ||
|
|
2dcac5f009 | ||
|
|
0d8c64f7d1 | ||
|
|
55626645fb | ||
|
|
f7925fa259 | ||
|
|
c814ae08b1 | ||
|
|
24666368f7 | ||
|
|
a77e85b62d | ||
|
|
6319c7fce1 | ||
|
|
a45b95d5d4 | ||
|
|
188f6f0f99 | ||
|
|
a72f126d8f | ||
|
|
33eb1b83a8 | ||
|
|
2d9ebe2e6d | ||
|
|
262b098dec | ||
|
|
79d88065aa | ||
|
|
0f59895c3b | ||
|
|
610d588e34 | ||
|
|
f99abb2f98 | ||
|
|
b2b7560d05 | ||
|
|
07c16e5238 | ||
|
|
1741ea7d26 | ||
|
|
b5ce4fab31 | ||
|
|
062e4c2062 | ||
|
|
0adb66a8bf | ||
|
|
2aad517112 | ||
|
|
14d1512b1e | ||
|
|
3f533516af | ||
|
|
f1354308fd | ||
|
|
c06248e46b | ||
|
|
9c8eaed938 | ||
|
|
2081302e32 | ||
|
|
678fc19f2d | ||
|
|
adc2757e8e | ||
|
|
82a1261371 | ||
|
|
067da9dc57 | ||
|
|
0eb9f9fc6f | ||
|
|
aee1340714 | ||
|
|
a72a9bd8cb | ||
|
|
7250410653 | ||
|
|
12f55800b0 | ||
|
|
53b375b4b2 | ||
|
|
fba27abe29 | ||
|
|
4caa3dec04 | ||
|
|
516b0f5ccb | ||
|
|
b5098be08e | ||
|
|
5b08a4650c | ||
|
|
eb02157b94 | ||
|
|
222e1719a4 | ||
|
|
3c8983e753 | ||
|
|
1fe41dd823 | ||
|
|
e8df59203c | ||
|
|
0f6690606b | ||
|
|
a0115309dd | ||
|
|
ca18d45786 | ||
|
|
76df21036a | ||
|
|
c674d581b7 | ||
|
|
fc53c3c487 | ||
|
|
7a4e31df80 | ||
|
|
f1d308d559 | ||
|
|
b7914bac05 | ||
|
|
8c40d88cc4 | ||
|
|
b4ed6dcb5d | ||
|
|
0d3bd8a89c | ||
|
|
87f0189abd | ||
|
|
1c17ac1f9d | ||
|
|
f038763041 | ||
|
|
eaf6d54757 | ||
|
|
d7368c83bc | ||
|
|
4011620da1 | ||
|
|
6e0b91531e | ||
|
|
b8ca1d68aa | ||
|
|
2b9cda40a0 | ||
|
|
d8983bdcbf | ||
|
|
14bce52f2f | ||
|
|
a7b0f7da68 | ||
|
|
7dd68cf1ef | ||
|
|
ab443a21ec | ||
|
|
ed7e8a8a4c | ||
|
|
a1435e2fc4 | ||
|
|
44a80f89da | ||
|
|
164f6af30c | ||
|
|
9093a79101 | ||
|
|
14cce89a18 | ||
|
|
4bce20a0a9 | ||
|
|
f32d8b4eff | ||
|
|
685f2b8c53 | ||
|
|
1e63ca2549 | ||
|
|
c1bc4eff2b | ||
|
|
bc903d3813 | ||
|
|
80fc17b610 | ||
|
|
0efb2bbc60 | ||
|
|
95ad533b87 | ||
|
|
b6e3240df9 | ||
|
|
5ae41e1d38 | ||
|
|
8022ae1fb1 | ||
|
|
0163fc1d88 | ||
|
|
5d9ab40e35 | ||
|
|
b1ca7930bb | ||
|
|
40111261ed | ||
|
|
4cb91b47e6 | ||
|
|
30b56583bd | ||
|
|
5e5168f804 | ||
|
|
4a8122829e | ||
|
|
52ba2cf89a | ||
|
|
58957cdf44 | ||
|
|
71f860a500 | ||
|
|
9b4cde819e | ||
|
|
99637de1de | ||
|
|
19dbd3f2b0 | ||
|
|
7567794f74 | ||
|
|
df0d15c1b3 | ||
|
|
9a84c02bb5 | ||
|
|
e623c4f30f | ||
|
|
3fd7acffb2 | ||
|
|
71f8c16c26 | ||
|
|
b64699c4ab | ||
|
|
786d62bb2f | ||
|
|
ac48d3d542 | ||
|
|
c4d9523ec2 | ||
|
|
cb6549c297 | ||
|
|
29816ada2a | ||
|
|
dd12bdc028 | ||
|
|
2a52c0711b | ||
|
|
2653f67193 | ||
|
|
b892617824 | ||
|
|
a6fb05c91d | ||
|
|
ccfb9403c8 | ||
|
|
66fa194c7f | ||
|
|
65d8fae9ca | ||
|
|
58acb14859 | ||
|
|
b63c05a509 | ||
|
|
2a1a2ee8c5 | ||
|
|
8c4b515093 | ||
|
|
6d43989a4d | ||
|
|
fb1f15bcb4 | ||
|
|
81ad585a18 | ||
|
|
eb3bd2b4a6 | ||
|
|
e401914790 | ||
|
|
fef5dadaba | ||
|
|
c1348d08ed | ||
|
|
fbd7c568d9 | ||
|
|
2941774913 | ||
|
|
b96d910401 | ||
|
|
9275d0782b | ||
|
|
7acc6cf6af | ||
|
|
d380a9aacc | ||
|
|
495377da13 | ||
|
|
218eed4068 | ||
|
|
1e9c99dec1 | ||
|
|
0326bc2831 | ||
|
|
aed770a761 | ||
|
|
3de487fb24 | ||
|
|
c802dfda22 | ||
|
|
3a4378e4c6 | ||
|
|
955a1f8a7f | ||
|
|
ab69e5c477 | ||
|
|
55e42e8334 | ||
|
|
a0f59bc2c2 | ||
|
|
66dabd0c8a | ||
|
|
915d585e3a | ||
|
|
979080d281 | ||
|
|
335f76c532 | ||
|
|
b50b934a12 | ||
|
|
6a1684d277 | ||
|
|
4926e4d69c | ||
|
|
b29a26551a | ||
|
|
d1c1d93ab7 | ||
|
|
907df4253c | ||
|
|
658152fdc9 | ||
|
|
1a68ede632 | ||
|
|
b70851b810 | ||
|
|
17506691a8 | ||
|
|
37a651da4e | ||
|
|
c535a32230 | ||
|
|
bb54781209 | ||
|
|
dcb538a3a9 | ||
|
|
185f7d9c31 | ||
|
|
c802c4413a | ||
|
|
19d650c35d | ||
|
|
21c1950898 | ||
|
|
661e1d77b9 | ||
|
|
dae0450a52 | ||
|
|
ce5cfc818c | ||
|
|
dec199f32d | ||
|
|
a87a50a89b | ||
|
|
c253b43a70 | ||
|
|
4ce4e4c44c | ||
|
|
3319fa72e4 | ||
|
|
1033d585c7 | ||
|
|
6014c3f975 | ||
|
|
d9ca42226a | ||
|
|
71026542df | ||
|
|
e756a50d97 | ||
|
|
49c47c01a3 | ||
|
|
e7eea2a7d9 | ||
|
|
311ae7d4e8 | ||
|
|
058f0885f7 | ||
|
|
c6eaf435f2 | ||
|
|
22676f3bfa | ||
|
|
fedcb37b1a | ||
|
|
54025c9cfc | ||
|
|
2cdf3c28b6 | ||
|
|
ba29232c9f | ||
|
|
5fd0667061 | ||
|
|
2c9f99ac3c | ||
|
|
775b1b937b | ||
|
|
65723aee15 | ||
|
|
46b55e4224 | ||
|
|
918adc4b1c | ||
|
|
e99341c6aa | ||
|
|
4b0d2a104b | ||
|
|
eb9bb1b173 | ||
|
|
f2b4204a23 | ||
|
|
b63aa952c4 | ||
|
|
7a5767717f | ||
|
|
22af4f2b27 | ||
|
|
00658cf165 | ||
|
|
87ed445a58 | ||
|
|
36ea174804 | ||
|
|
6ba2fedba2 | ||
|
|
ca89ff7761 | ||
|
|
f39d53a865 | ||
|
|
6864d54e27 | ||
|
|
bdc084212f | ||
|
|
fc2487df0e | ||
|
|
264a827a2c | ||
|
|
401886805b | ||
|
|
efcdf79f57 | ||
|
|
616f215075 | ||
|
|
00b674cebb | ||
|
|
8ac440335e | ||
|
|
4b1821ce42 | ||
|
|
3ad955abf9 | ||
|
|
5fabb974ce | ||
|
|
5325bc3e32 | ||
|
|
6688c4626b | ||
|
|
2b95ab3d7e | ||
|
|
23e6d7e27e | ||
|
|
2760e22336 | ||
|
|
d026d09f98 | ||
|
|
e6fd1ce791 | ||
|
|
342eaa9a97 | ||
|
|
dc7681357e | ||
|
|
b61cb49c1a | ||
|
|
c7b341393d | ||
|
|
1f9fa2adb9 | ||
|
|
133b927d9d | ||
|
|
46e6b26d75 | ||
|
|
8d0b0e5505 | ||
|
|
754a0c111c | ||
|
|
81ef3f04e4 | ||
|
|
e7c00484b3 | ||
|
|
065432448f | ||
|
|
5d45a9c28a | ||
|
|
7db5b3b5c0 | ||
|
|
5eb64060dc | ||
|
|
2c4877b9f8 | ||
|
|
218dad3b86 | ||
|
|
974c6b106a | ||
|
|
954b281b69 | ||
|
|
b1b15b63a1 | ||
|
|
49567aa958 | ||
|
|
a7a470066b | ||
|
|
4e3010d75e | ||
|
|
cbacd726ef | ||
|
|
58a1fc1ca0 | ||
|
|
a704f88d75 | ||
|
|
10d0ad7d47 | ||
|
|
b47a29eb67 | ||
|
|
887177913d | ||
|
|
b6b0dc85bf | ||
|
|
29f47878e9 | ||
|
|
440b548a4f | ||
|
|
5191953657 | ||
|
|
877ac72761 | ||
|
|
685befee6b | ||
|
|
7afb099c12 | ||
|
|
21a5feda43 | ||
|
|
b7b16cfd21 | ||
|
|
615f3a58e9 | ||
|
|
f65fd73d6d | ||
|
|
6a8eb9e67a | ||
|
|
8b7adf0a6a | ||
|
|
973182c27c | ||
|
|
0dced0bc90 |
20
.dockerignore
Normal file
@ -0,0 +1,20 @@
|
||||
.devcontainer/
|
||||
.github/
|
||||
.vscode/
|
||||
.idea/
|
||||
.pytest_cache/
|
||||
.ruff_cache/
|
||||
.venv/
|
||||
docs_image/
|
||||
k8s/
|
||||
tests/
|
||||
.dockerignore
|
||||
.editorconfig
|
||||
.gitignore
|
||||
.pre-commit-config.yaml
|
||||
.prettier*
|
||||
.env.dev
|
||||
docker-compose.yml
|
||||
Dockerfile
|
||||
LICENSE
|
||||
*.md
|
||||
16
.env.dev
@ -1,16 +0,0 @@
|
||||
|
||||
|
||||
SUPERUSERS=[""]
|
||||
|
||||
COMMAND_START=[""]
|
||||
|
||||
SESSION_RUNNING_EXPRESSION="别急呀,小真寻要宕机了!QAQ"
|
||||
|
||||
NICKNAME=["真寻", "小真寻", "绪山真寻", "小寻子"]
|
||||
|
||||
SESSION_EXPIRE_TIMEOUT=30
|
||||
|
||||
DEBUG=False
|
||||
# 服务器和端口
|
||||
HOST = 127.0.0.1
|
||||
PORT = 8080
|
||||
93
.env.example
Normal file
@ -0,0 +1,93 @@
|
||||
SUPERUSERS=[""]
|
||||
|
||||
COMMAND_START=[""]
|
||||
|
||||
SESSION_RUNNING_EXPRESSION="别急呀,小真寻要宕机了!QAQ"
|
||||
|
||||
NICKNAME=["真寻", "小真寻", "绪山真寻", "小寻子"]
|
||||
|
||||
SESSION_EXPIRE_TIMEOUT=00:00:30
|
||||
|
||||
ALCONNA_USE_COMMAND_START=True
|
||||
|
||||
# ws连接密钥,若bot能被公网访问则建议打开该注释并设置该配置项
|
||||
# ONEBOT_ACCESS_TOKEN=""
|
||||
|
||||
# 全局图片统一使用bytes发送,当真寻与协议端不在同一服务器上时为True
|
||||
IMAGE_TO_BYTES = True
|
||||
|
||||
# 回复消息时自称
|
||||
SELF_NICKNAME="小真寻"
|
||||
|
||||
# 官bot appid:bot账号
|
||||
QBOT_ID_DATA = '{
|
||||
|
||||
}'
|
||||
|
||||
# 数据库配置
|
||||
# 示例: "postgres://user:password@127.0.0.1:5432/database"
|
||||
# 示例: "mysql://user:password@127.0.0.1:3306/database"
|
||||
# 示例: "sqlite:data/db/zhenxun.db" 在data目录下建立db文件夹
|
||||
DB_URL = ""
|
||||
|
||||
# NONE: 不使用缓存, MEMORY: 使用内存缓存, REDIS: 使用Redis缓存
|
||||
CACHE_MODE = NONE
|
||||
|
||||
# REDIS配置,使用REDIS替换Cache内存缓存
|
||||
# REDIS地址
|
||||
# REDIS_HOST = "127.0.0.1"
|
||||
# REDIS端口
|
||||
# REDIS_PORT = 6379
|
||||
# REDIS密码
|
||||
# REDIS_PASSWORD = ""
|
||||
# REDIS过期时间
|
||||
# REDIS_EXPIRE = 600
|
||||
|
||||
# 系统代理
|
||||
# SYSTEM_PROXY = "http://127.0.0.1:7890"
|
||||
|
||||
PLATFORM_SUPERUSERS = '
|
||||
{
|
||||
"qq": [""],
|
||||
"dodo": [""]
|
||||
}
|
||||
'
|
||||
|
||||
DRIVER=~fastapi+~httpx+~websockets
|
||||
|
||||
|
||||
# LOG_LEVEL = DEBUG
|
||||
# 服务器和端口
|
||||
HOST = 127.0.0.1
|
||||
PORT = 8080
|
||||
|
||||
# kook adapter toekn
|
||||
# kaiheila_bots =[{"token": ""}]
|
||||
|
||||
# # discode adapter
|
||||
# DISCORD_BOTS='
|
||||
# [
|
||||
# {
|
||||
# "token": "",
|
||||
# "intent": {
|
||||
# "guild_messages": true,
|
||||
# "direct_messages": true
|
||||
# },
|
||||
# "application_commands": {"*": ["*"]}
|
||||
# }
|
||||
# ]
|
||||
# '
|
||||
# DISCORD_PROXY=''
|
||||
|
||||
# # dodo adapter
|
||||
# DODO_BOTS='
|
||||
# [
|
||||
# {
|
||||
# "client_id": "",
|
||||
# "token": ""
|
||||
# }
|
||||
# ]
|
||||
# '
|
||||
|
||||
# application_commands的{"*": ["*"]}代表将全部应用命令注册为全局应用命令
|
||||
# {"admin": ["123", "456"]}则代表将admin命令注册为id是123、456服务器的局部命令,其余命令不注册
|
||||
98
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
Normal file
@ -0,0 +1,98 @@
|
||||
name: Bug 反馈
|
||||
title: "Bug: "
|
||||
description: 提交 Bug 反馈以帮助我们改进代码
|
||||
labels: [ "bug" ]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checklist
|
||||
attributes:
|
||||
label: 提交前检查项
|
||||
description: 在提交问题之前,请确认以下事项:
|
||||
options:
|
||||
- label: 我已搜索相关的 issue,但没有找到类似的问题
|
||||
required: true
|
||||
- label: 我已更新到最新版本(包括但不限于真寻本体,插件以及相关依赖),问题仍然存在
|
||||
required: true
|
||||
- label: 我已仔细阅读文档,确认我的配置正确
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: env-os
|
||||
attributes:
|
||||
label: 操作系统
|
||||
description: 选择运行 zhenxun_bot 的系统
|
||||
options:
|
||||
- Windows
|
||||
- MacOS
|
||||
- Linux
|
||||
- Other
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: env-python-ver
|
||||
attributes:
|
||||
label: Python 版本
|
||||
description: 填写运行 zhenxun_bot 的 Python 版本
|
||||
placeholder: e.g. 3.11.0
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: env-zhenxun-ver
|
||||
attributes:
|
||||
label: zhenxun_bot 版本
|
||||
description: 填写 zhenxun_bot 版本
|
||||
placeholder: e.g. 0.1.0
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: env-adapter
|
||||
attributes:
|
||||
label: 适配器
|
||||
description: 填写使用的适配器以及版本
|
||||
placeholder: e.g. OneBot v11 2.2.2
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: env-protocol
|
||||
attributes:
|
||||
label: 协议端
|
||||
description: 填写连接 zhenxun_bot 的协议端及版本
|
||||
placeholder: e.g. NapCat V4.0.3
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
label: 描述问题
|
||||
description: 清晰简洁地说明问题是什么
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: reproduction
|
||||
attributes:
|
||||
label: 复现步骤
|
||||
description: 提供能复现此问题的详细操作步骤
|
||||
placeholder: |
|
||||
1. 首先……
|
||||
2. 然后……
|
||||
3. 发生……
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: expected
|
||||
attributes:
|
||||
label: 期望的结果
|
||||
description: 清晰简洁地描述你期望发生的事情
|
||||
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: 截图或日志(请勿包含敏感信息如密码、令牌等)
|
||||
description: 提供有助于诊断问题的任何日志和截图
|
||||
1
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
@ -0,0 +1 @@
|
||||
blank_issues_enabled: false
|
||||
18
.github/ISSUE_TEMPLATE/document.yml
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
name: 文档改进
|
||||
title: "Docs: 描述"
|
||||
description: 文档错误及改进意见反馈
|
||||
labels: ["documentation"]
|
||||
body:
|
||||
- type: textarea
|
||||
id: problem
|
||||
attributes:
|
||||
label: 描述问题或主题
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: improve
|
||||
attributes:
|
||||
label: 需做出的修改
|
||||
validations:
|
||||
required: true
|
||||
27
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
name: 功能建议
|
||||
title: "Feature: 功能描述"
|
||||
description: 提出关于项目新功能的想法
|
||||
labels: [ "enhancement" ]
|
||||
body:
|
||||
- type: textarea
|
||||
id: problem
|
||||
attributes:
|
||||
label: 希望能解决的问题
|
||||
description: 在使用中遇到什么问题而需要新的功能?
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: feature
|
||||
attributes:
|
||||
label: 描述所需要的功能
|
||||
description: 请说明需要的功能或解决方法
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: checkboxes
|
||||
id: checklist
|
||||
attributes:
|
||||
label: 我有能力且愿意为这个功能贡献代码
|
||||
options:
|
||||
- label: 我有能力且愿意为这个功能贡献代码
|
||||
40
.github/actions/setup-python/action.yml
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
name: Setup Python
|
||||
description: Setup Python
|
||||
|
||||
inputs:
|
||||
python-version:
|
||||
description: Python version
|
||||
required: false
|
||||
default: "3.10"
|
||||
env-dir:
|
||||
description: Environment directory
|
||||
required: false
|
||||
default: "."
|
||||
no-root:
|
||||
description: Do not install package in the environment
|
||||
required: false
|
||||
default: "false"
|
||||
|
||||
runs:
|
||||
using: "composite"
|
||||
steps:
|
||||
- name: Install poetry
|
||||
run: pipx install poetry
|
||||
shell: bash
|
||||
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: ${{ inputs.python-version }}
|
||||
cache: "poetry"
|
||||
cache-dependency-path: |
|
||||
./poetry.lock
|
||||
${{ inputs.env-dir }}/poetry.lock
|
||||
|
||||
- run: |
|
||||
cd ${{ inputs.env-dir }}
|
||||
if [ "${{ inputs.no-root }}" = "true" ]; then
|
||||
poetry install --all-extras --no-root
|
||||
else
|
||||
poetry install --all-extras
|
||||
fi
|
||||
shell: bash
|
||||
77
.github/release-drafter.yml
vendored
Normal file
@ -0,0 +1,77 @@
|
||||
template: $CHANGES
|
||||
name-template: "v$RESOLVED_VERSION"
|
||||
tag-template: "v$RESOLVED_VERSION"
|
||||
exclude-labels:
|
||||
- reverted
|
||||
- no-changelog
|
||||
- skip-changelog
|
||||
- invalid
|
||||
autolabeler:
|
||||
- label: "bug"
|
||||
title:
|
||||
- "/:bug:.+/"
|
||||
- "/🐛.+/"
|
||||
- label: "enhancement"
|
||||
title:
|
||||
- "/:sparkles:.+/"
|
||||
- "/✨.+/"
|
||||
- label: "ci"
|
||||
files:
|
||||
- .github/**/*
|
||||
- label: "breaking-change"
|
||||
title:
|
||||
- "/.+!:.+/"
|
||||
- label: "documentation"
|
||||
files:
|
||||
- "*.md"
|
||||
- label: "dependencies"
|
||||
files:
|
||||
- "pyproject.toml"
|
||||
- "requirements.txt"
|
||||
- "poetry.lock"
|
||||
title:
|
||||
- "/:wrench:.+/"
|
||||
- "/🔧.+/"
|
||||
- label: "resources"
|
||||
files:
|
||||
- resources/**/*
|
||||
categories:
|
||||
- title: 💥 破坏性变更
|
||||
labels:
|
||||
- breaking-change
|
||||
- title: 🚀 新功能
|
||||
labels:
|
||||
- enhancement
|
||||
- title: 🐛 Bug 修复
|
||||
labels:
|
||||
- bug
|
||||
- title: 📝 文档更新
|
||||
labels:
|
||||
- documentation
|
||||
- title: 👻 自动化程序
|
||||
labels:
|
||||
- chore
|
||||
- internal
|
||||
- maintenance
|
||||
- title: 🚦 测试
|
||||
labels:
|
||||
- test
|
||||
- tests
|
||||
- title: 📦 依赖更新
|
||||
labels:
|
||||
- dependencies
|
||||
collapse-after: 15
|
||||
- title: 💫 杂项
|
||||
change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
|
||||
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
|
||||
version-resolver:
|
||||
major:
|
||||
labels:
|
||||
- "major"
|
||||
minor:
|
||||
labels:
|
||||
- "minor"
|
||||
patch:
|
||||
labels:
|
||||
- "patch"
|
||||
default: patch
|
||||
84
.github/workflows/bot_check.yml
vendored
Normal file
@ -0,0 +1,84 @@
|
||||
name: 检查bot是否运行正常
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
paths:
|
||||
- zhenxun/**
|
||||
- tests/**
|
||||
- .github/workflows/bot_check.yml
|
||||
- bot.py
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
paths:
|
||||
- zhenxun/**
|
||||
- tests/**
|
||||
- .github/workflows/bot_check.yml
|
||||
- bot.py
|
||||
|
||||
jobs:
|
||||
bot-check:
|
||||
runs-on: ubuntu-latest
|
||||
name: bot check
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Python
|
||||
id: setup_python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
- name: Install Poetry
|
||||
run: pip install poetry
|
||||
|
||||
# Poetry cache depends on OS, Python version and Poetry version.
|
||||
- name: Cache Poetry cache
|
||||
id: cache-poetry
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.cache/pypoetry
|
||||
key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ hashFiles('pyproject.toml') }}
|
||||
|
||||
- name: Cache playwright cache
|
||||
id: cache-playwright
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.cache/ms-playwright
|
||||
key: playwright-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}
|
||||
|
||||
- name: Cache Data cache
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: data
|
||||
key: data-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}
|
||||
|
||||
- name: Install dependencies
|
||||
if: steps.cache-poetry.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
rm -rf poetry.lock
|
||||
poetry source remove aliyun
|
||||
poetry install --no-root
|
||||
|
||||
- name: Install playwright
|
||||
if: steps.cache-playwright.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
poetry run sudo apt-get update
|
||||
poetry run sudo apt-get install -y libgstreamer-plugins-base1.0-0 libgstreamer1.0-0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-libav flite x264 libx264-dev
|
||||
poetry run pip install playwright
|
||||
poetry run playwright install-deps
|
||||
poetry run playwright install
|
||||
|
||||
- name: Run tests
|
||||
run: poetry run pytest --cov=zhenxun --cov-report xml
|
||||
|
||||
- name: Check bot run
|
||||
id: bot_check_run
|
||||
run: |
|
||||
mv scripts/bot_check.py bot_check.py
|
||||
sed -i "s|^.*\?DB_URL.*|DB_URL=\"${{ env.DB_URL }}\"|g" .env.dev
|
||||
sed -i "s/^.*\?LOG_LEVEL.*/LOG_LEVEL=${{ env.LOG_LEVEL }}/g" .env.dev
|
||||
poetry run python3 bot_check.py
|
||||
env:
|
||||
DB_URL: "sqlite://:memory:"
|
||||
LOG_LEVEL: DEBUG
|
||||
91
.github/workflows/codeql.yml
vendored
Normal file
@ -0,0 +1,91 @@
|
||||
# For most projects, this workflow file will not need changing; you simply need
|
||||
# to commit it to your repository.
|
||||
#
|
||||
# You may wish to alter this file to override the set of languages analyzed,
|
||||
# or to provide custom queries or build logic.
|
||||
#
|
||||
# ******** NOTE ********
|
||||
# We have attempted to detect the languages in your repository. Please check
|
||||
# the `language` matrix defined below to confirm you have the correct set of
|
||||
# supported CodeQL languages.
|
||||
#
|
||||
name: "CodeQL Code Security Analysis"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
pull_request:
|
||||
branches: [ "main" ]
|
||||
schedule:
|
||||
- cron: '45 21 * * 2'
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze (${{ matrix.language }})
|
||||
# Runner size impacts CodeQL analysis time. To learn more, please see:
|
||||
# - https://gh.io/recommended-hardware-resources-for-running-codeql
|
||||
# - https://gh.io/supported-runners-and-hardware-resources
|
||||
# - https://gh.io/using-larger-runners (GitHub.com only)
|
||||
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
|
||||
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
|
||||
permissions:
|
||||
# required for all workflows
|
||||
security-events: write
|
||||
|
||||
# required to fetch internal or private CodeQL packs
|
||||
packages: read
|
||||
|
||||
# only required for workflows in private repositories
|
||||
actions: read
|
||||
contents: read
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- language: python
|
||||
build-mode: none
|
||||
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
|
||||
# Use `c-cpp` to analyze code written in C, C++ or both
|
||||
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
|
||||
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
|
||||
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
|
||||
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
|
||||
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v3
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
build-mode: ${{ matrix.build-mode }}
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
|
||||
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
|
||||
# queries: security-extended,security-and-quality
|
||||
|
||||
# If the analyze step fails for one of the languages you are analyzing with
|
||||
# "We were unable to automatically build your code", modify the matrix above
|
||||
# to set the build mode to "manual" for that language. Then modify this step
|
||||
# to build your code.
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
|
||||
- if: matrix.build-mode == 'manual'
|
||||
shell: bash
|
||||
run: |
|
||||
echo 'If you are using a "manual" build mode for one or more of the' \
|
||||
'languages you are analyzing, replace this with the commands to build' \
|
||||
'your code, for example:'
|
||||
echo ' make bootstrap'
|
||||
echo ' make release'
|
||||
exit 1
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v3
|
||||
with:
|
||||
category: "/language:${{matrix.language}}"
|
||||
11
.github/workflows/linting.yml
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
name: Sequential Lint and Type Check
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
ruff-call:
|
||||
uses: ./.github/workflows/ruff.yml
|
||||
|
||||
pyright-call:
|
||||
needs: ruff-call
|
||||
uses: ./.github/workflows/pyright.yml
|
||||
58
.github/workflows/publish-docker.yml
vendored
Normal file
@ -0,0 +1,58 @@
|
||||
#
|
||||
name: Create and publish a Docker image
|
||||
|
||||
# Configures this workflow to run on demand via workflow_dispatch.
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
|
||||
env:
|
||||
REGISTRY: ghcr.io
|
||||
IMAGE_NAME: ${{ github.repository }}
|
||||
|
||||
# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
|
||||
jobs:
|
||||
build-and-push-image:
|
||||
runs-on: ubuntu-latest
|
||||
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
attestations: write
|
||||
id-token: write
|
||||
#
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
# Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
|
||||
- name: Log in to the Container registry
|
||||
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
# This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
|
||||
- name: Extract metadata (tags, labels) for Docker
|
||||
id: meta
|
||||
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
|
||||
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see [Usage](https://github.com/docker/build-push-action#usage) in the README of the `docker/build-push-action` repository.
|
||||
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
|
||||
- name: Build and push Docker image
|
||||
id: push
|
||||
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
# This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see [Using artifact attestations to establish provenance for builds](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds).
|
||||
- name: Generate artifact attestation
|
||||
uses: actions/attest-build-provenance@v2
|
||||
with:
|
||||
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
|
||||
subject-digest: ${{ steps.push.outputs.digest }}
|
||||
push-to-registry: true
|
||||
55
.github/workflows/pyright.yml
vendored
Normal file
@ -0,0 +1,55 @@
|
||||
name: Pyright Lint
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
python-version:
|
||||
description: "Python version"
|
||||
required: false
|
||||
type: choice
|
||||
options:
|
||||
- "all"
|
||||
- "3.10"
|
||||
- "3.11"
|
||||
- "3.12"
|
||||
default: "all"
|
||||
debug-mode:
|
||||
description: "enable debug mode"
|
||||
required: false
|
||||
type: boolean
|
||||
default: false
|
||||
|
||||
jobs:
|
||||
pyright:
|
||||
name: Pyright Lint
|
||||
runs-on: ubuntu-latest
|
||||
concurrency:
|
||||
group: pyright-${{ github.ref }}-${{ matrix.env }}
|
||||
cancel-in-progress: true
|
||||
strategy:
|
||||
matrix:
|
||||
env: [pydantic-v1, pydantic-v2]
|
||||
fail-fast: false
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Python environment
|
||||
uses: ./.github/actions/setup-python
|
||||
with:
|
||||
env-dir: ./envs/${{ matrix.env }}
|
||||
no-root: true
|
||||
|
||||
- run: |
|
||||
(cd ./envs/${{ matrix.env }} && echo "$(poetry env info --path)/bin" >> $GITHUB_PATH)
|
||||
if [ "${{ matrix.env }}" = "pydantic-v1" ]; then
|
||||
sed -i 's/PYDANTIC_V2 = true/PYDANTIC_V2 = false/g' ./pyproject.toml
|
||||
fi
|
||||
shell: bash
|
||||
|
||||
- name: Run Pyright Check
|
||||
uses: jakebailey/pyright-action@v2
|
||||
with:
|
||||
pylance-version: latest-release
|
||||
18
.github/workflows/release_draft.yml
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
name: Release Drafter
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- dev
|
||||
pull_request:
|
||||
types: [opened, reopened, synchronize]
|
||||
|
||||
jobs:
|
||||
update_release_draft:
|
||||
name: Update Release Draft
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: release-drafter/release-drafter@v6
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
20
.github/workflows/ruff.yml
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
name: Ruff Lint
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
|
||||
jobs:
|
||||
ruff:
|
||||
name: Ruff Lint
|
||||
runs-on: ubuntu-latest
|
||||
concurrency:
|
||||
group: ruff-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Install Ruff
|
||||
uses: astral-sh/ruff-action@v3
|
||||
- name: Run Ruff Check
|
||||
run: ruff check
|
||||
26
.github/workflows/sync-to-aliyun.yml
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
name: Force Sync to Aliyun
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
jobs:
|
||||
sync:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Configure Git
|
||||
run: |
|
||||
git config --global http.postBuffer 524288000
|
||||
git config --global core.compression 0
|
||||
|
||||
- name: Add aliyun remote
|
||||
run: |
|
||||
git remote add aliyun https://${{secrets.ALIYUN_ACCOUNT}}:${{secrets.ALIYUN_PASSWORD}}@codeup.aliyun.com/67a361cf556e6cdab537117a/zhenxun-org/zhenxun_bot.git
|
||||
git fetch aliyun main --force # 强制更新本地引用
|
||||
|
||||
- name: Force push
|
||||
run: git push --progress --force aliyun HEAD:main
|
||||
73
.github/workflows/update_version_pr.yml
vendored
Normal file
@ -0,0 +1,73 @@
|
||||
name: Update Version
|
||||
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- .github/workflows/update_version_pr.yml
|
||||
- zhenxun/**
|
||||
- resources/**
|
||||
- bot.py
|
||||
branches:
|
||||
- main
|
||||
- dev
|
||||
|
||||
jobs:
|
||||
update-version:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
token: ${{ secrets.GH_TOKEN }}
|
||||
|
||||
- name: Read current version
|
||||
id: read_version
|
||||
run: |
|
||||
version_line=$(grep '__version__' __version__)
|
||||
version=$(echo $version_line | sed -E 's/__version__:\s*v([0-9]+\.[0-9]+\.[0-9]+)(-.+)?/\1/')
|
||||
echo "Current version: $version"
|
||||
echo "current_version=$version" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Check for version file changes
|
||||
id: check_diff
|
||||
run: |
|
||||
if git diff --name-only HEAD~1 HEAD | grep -q '__version__'; then
|
||||
echo "Version file has changes"
|
||||
echo "version_changed=true" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "Version file has no changes"
|
||||
echo "version_changed=false" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Get commit hash
|
||||
id: get_commit_hash
|
||||
run: echo "commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Update version file
|
||||
id: update_version
|
||||
if: steps.check_diff.outputs.version_changed == 'false'
|
||||
run: |
|
||||
current_version="${{ steps.read_version.outputs.current_version }}"
|
||||
commit_hash="${{ steps.get_commit_hash.outputs.commit_hash }}"
|
||||
new_version="v${current_version}-${commit_hash}"
|
||||
echo "new_version=$new_version" >> $GITHUB_OUTPUT
|
||||
echo "Updating version to: $new_version"
|
||||
echo "__version__: $new_version" > __version__
|
||||
|
||||
- name: Check updated version
|
||||
if: steps.check_diff.outputs.version_changed == 'false'
|
||||
run: cat __version__
|
||||
|
||||
- name: Create or update PR
|
||||
if: steps.check_diff.outputs.version_changed == 'false'
|
||||
uses: peter-evans/create-pull-request@v7
|
||||
with:
|
||||
token: ${{ secrets.GH_TOKEN }}
|
||||
branch: create-pr/update_version
|
||||
title: ":tada: chore(version): 自动更新版本到 ${{ steps.update_version.outputs.new_version }}"
|
||||
body: "This PR updates the version file."
|
||||
commit-message: ":tada: chore(version): Update version to ${{ steps.update_version.outputs.new_version }}"
|
||||
add-paths: __version__
|
||||
author: "AkashiCoin <i@loli.vet>"
|
||||
committer: "${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>"
|
||||
labels: automated-update
|
||||
150
.gitignore
vendored
Normal file
@ -0,0 +1,150 @@
|
||||
### Python template
|
||||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*$py.class
|
||||
|
||||
# C extensions
|
||||
*.so
|
||||
|
||||
# Distribution / packaging
|
||||
.Python
|
||||
build/
|
||||
develop-eggs/
|
||||
dist/
|
||||
downloads/
|
||||
eggs/
|
||||
.eggs/
|
||||
lib/
|
||||
lib64/
|
||||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
share/python-wheels/
|
||||
*.egg-info/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
MANIFEST
|
||||
|
||||
# PyInstaller
|
||||
# Usually these files are written by a python script from a template
|
||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||
*.manifest
|
||||
*.spec
|
||||
!resources.spec
|
||||
|
||||
# Installer logs
|
||||
pip-log.txt
|
||||
pip-delete-this-directory.txt
|
||||
|
||||
# Unit test / coverage reports
|
||||
htmlcov/
|
||||
.tox/
|
||||
.nox/
|
||||
.coverage
|
||||
.coverage.*
|
||||
.cache
|
||||
nosetests.xml
|
||||
coverage.xml
|
||||
*.cover
|
||||
*.py,cover
|
||||
.hypothesis/
|
||||
.pytest_cache/
|
||||
cover/
|
||||
|
||||
# Translations
|
||||
*.mo
|
||||
*.pot
|
||||
|
||||
# Django stuff:
|
||||
*.log
|
||||
local_settings.py
|
||||
db.sqlite3
|
||||
db.sqlite3-journal
|
||||
|
||||
# Flask stuff:
|
||||
instance/
|
||||
.webassets-cache
|
||||
|
||||
# Scrapy stuff:
|
||||
.scrapy
|
||||
|
||||
# Sphinx documentation
|
||||
docs/_build/
|
||||
|
||||
# PyBuilder
|
||||
.pybuilder/
|
||||
target/
|
||||
|
||||
# Jupyter Notebook
|
||||
.ipynb_checkpoints
|
||||
|
||||
# IPython
|
||||
profile_default/
|
||||
ipython_config.py
|
||||
|
||||
# pyenv
|
||||
# For a library or package, you might want to ignore these files since the code is
|
||||
# intended to run in multiple environments; otherwise, check them in:
|
||||
# .python-version
|
||||
|
||||
# pipenv
|
||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||
# install all needed dependencies.
|
||||
#Pipfile.lock
|
||||
|
||||
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
|
||||
__pypackages__/
|
||||
|
||||
# Celery stuff
|
||||
celerybeat-schedule
|
||||
celerybeat.pid
|
||||
|
||||
# SageMath parsed files
|
||||
*.sage.py
|
||||
|
||||
# Environments
|
||||
.env
|
||||
.venv
|
||||
env/
|
||||
venv/
|
||||
ENV/
|
||||
env.bak/
|
||||
venv.bak/
|
||||
.env.dev
|
||||
|
||||
# Spyder project settings
|
||||
.spyderproject
|
||||
.spyproject
|
||||
|
||||
# Rope project settings
|
||||
.ropeproject
|
||||
|
||||
# mkdocs documentation
|
||||
/site
|
||||
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
.dmypy.json
|
||||
dmypy.json
|
||||
|
||||
# Pyre type checker
|
||||
.pyre/
|
||||
|
||||
# pytype static type analyzer
|
||||
.pytype/
|
||||
|
||||
# Cython debug symbols
|
||||
cython_debug/
|
||||
|
||||
data/
|
||||
log/
|
||||
backup/
|
||||
.idea/
|
||||
resources/
|
||||
.vscode/launch.json
|
||||
|
||||
./.env.dev
|
||||
4
.markdownlint.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
MD013: false
|
||||
MD024: # 重复标题
|
||||
siblings_only: true
|
||||
MD033: false # 允许 html
|
||||
16
.pre-commit-config.yaml
Normal file
@ -0,0 +1,16 @@
|
||||
default_install_hook_types: [pre-commit]
|
||||
ci:
|
||||
autofix_commit_msg: ":rotating_light: auto fix by pre-commit hooks"
|
||||
autofix_prs: true
|
||||
autoupdate_branch: main
|
||||
autoupdate_schedule: monthly
|
||||
autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
|
||||
repos:
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
rev: v0.8.2
|
||||
hooks:
|
||||
- id: ruff
|
||||
args: [--fix]
|
||||
stages: [pre-commit]
|
||||
- id: ruff-format
|
||||
stages: [pre-commit]
|
||||
8
.vscode/extensions.json
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"charliermarsh.ruff",
|
||||
"esbenp.prettier-vscode",
|
||||
"ms-python.python",
|
||||
"ms-python.vscode-pylance"
|
||||
]
|
||||
}
|
||||
65
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,65 @@
|
||||
{
|
||||
"C_Cpp.errorSquiggles": "enabled",
|
||||
"terminal.integrated.env.linux": {
|
||||
"PYTHONPATH": "${workspaceFolder}${pathSeparator}${env:PYTHONPATH}"
|
||||
},
|
||||
"cSpell.words": [
|
||||
"aiofiles",
|
||||
"Alconna",
|
||||
"arclet",
|
||||
"Arparma",
|
||||
"displayname",
|
||||
"flmt",
|
||||
"getbbox",
|
||||
"gitcode",
|
||||
"GITEE",
|
||||
"hibiapi",
|
||||
"httpx",
|
||||
"jsdelivr",
|
||||
"kaiheila",
|
||||
"lolicon",
|
||||
"Mahiro",
|
||||
"nonebot",
|
||||
"onebot",
|
||||
"pixiv",
|
||||
"qbot",
|
||||
"Setu",
|
||||
"tobytes",
|
||||
"ujson",
|
||||
"unban",
|
||||
"Uninfo",
|
||||
"userinfo",
|
||||
"webui",
|
||||
"zhenxun"
|
||||
],
|
||||
"python.analysis.autoImportCompletions": true,
|
||||
"python.testing.pytestArgs": ["tests"],
|
||||
"python.testing.unittestEnabled": false,
|
||||
"python.testing.pytestEnabled": true,
|
||||
"[python]": {
|
||||
"editor.defaultFormatter": "charliermarsh.ruff",
|
||||
"editor.wordBasedSuggestions": "allDocuments",
|
||||
"editor.formatOnType": true,
|
||||
"editor.formatOnSave": true,
|
||||
"editor.codeActionsOnSave": {
|
||||
"source.fixAll.ruff": "explicit",
|
||||
"source.organizeImports": "explicit"
|
||||
}
|
||||
},
|
||||
"ruff.format.preview": false,
|
||||
"isort.check": true,
|
||||
"ruff.importStrategy": "useBundled",
|
||||
"ruff.organizeImports": false,
|
||||
"[javascript]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
},
|
||||
"[json]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
},
|
||||
"[yaml]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
},
|
||||
"[markdown]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
}
|
||||
}
|
||||
87
CODE_OF_CONDUCT.md
Normal file
@ -0,0 +1,87 @@
|
||||
# zhenxun_bot 贡献者公约
|
||||
|
||||
## 我们的承诺
|
||||
|
||||
身为社区成员、贡献者和负责人,我们承诺使社区参与者不受骚扰,无论其年龄、体型、可见或不可见的缺陷、族裔、性征、性别认同和表达、经验水平、教育程度、社会与经济地位、国籍、相貌、种族、种姓、肤色、宗教信仰、性倾向或性取向如何。
|
||||
|
||||
我们承诺以有助于建立开放、友善、多样化、包容、健康社区的方式行事和互动。
|
||||
|
||||
## 我们的准则
|
||||
|
||||
有助于为我们的社区创造积极环境的行为例子包括但不限于:
|
||||
|
||||
* 表现出对他人的同情和善意
|
||||
* 尊重不同的主张、观点和感受
|
||||
* 提出和大方接受建设性意见
|
||||
* 承担责任并向受我们错误影响的人道歉
|
||||
* 注重社区共同诉求,而非个人得失
|
||||
|
||||
不当行为例子包括:
|
||||
|
||||
* 使用情色化的语言或图像,及性引诱或挑逗
|
||||
* 嘲弄、侮辱或诋毁性评论,以及人身或政治攻击
|
||||
* 公开或私下的骚扰行为
|
||||
* 未经他人明确许可,公布他人的私人信息,如物理或电子邮件地址
|
||||
* 其他有理由认定为违反职业操守的不当行为
|
||||
|
||||
## 责任和权力
|
||||
|
||||
社区负责人有责任解释和落实我们所认可的行为准则,并妥善公正地对他们认为不当、威胁、冒犯或有害的任何行为采取纠正措施。
|
||||
|
||||
社区负责人有权力和责任删除、编辑或拒绝或拒绝与本行为准则不相符的评论(comment)、提交(commits)、代码、维基(wiki)编辑、议题(issues)或其他贡献,并在适当时机知采取措施的理由。
|
||||
|
||||
## 适用范围
|
||||
|
||||
本行为准则适用于所有社区场合,也适用于在公共场所代表社区时的个人。
|
||||
|
||||
代表社区的情形包括使用官方电子邮件地址、通过官方社交媒体帐户发帖或在线上或线下活动中担任指定代表。
|
||||
|
||||
## 监督
|
||||
|
||||
辱骂、骚扰或其他不可接受的行为可通过 775757368@qq.com 向负责监督的社区负责人报告。
|
||||
所有投诉都将得到及时和公平的审查和调查。
|
||||
|
||||
所有社区负责人都有义务尊重任何事件报告者的隐私和安全。
|
||||
|
||||
## 处理方针
|
||||
|
||||
社区负责人将遵循下列社区处理方针来明确他们所认定违反本行为准则的行为的处理方式:
|
||||
|
||||
### 1. 纠正
|
||||
|
||||
**社区影响**:使用不恰当的语言或其他在社区中被认定为不符合职业道德或不受欢迎的行为。
|
||||
|
||||
**处理意见**:由社区负责人发出非公开的书面警告,明确说明违规行为的性质,并解释举止如何不妥。或将要求公开道歉。
|
||||
|
||||
### 2. 警告
|
||||
|
||||
**社区影响**:单个或一系列违规行为。
|
||||
|
||||
**处理意见**:警告并对连续性行为进行处理。在指定时间内,不得与相关人员互动,包括主动与行为准则执行者互动。这包括避免在社区场所和外部渠道中的互动。违反这些条款可能会导致临时或永久封禁。
|
||||
|
||||
### 3. 临时封禁
|
||||
|
||||
**社区影响**: 严重违反社区准则,包括持续的不当行为。
|
||||
|
||||
**处理意见**: 在指定时间内,暂时禁止与社区进行任何形式的互动或公开交流。在此期间,不得与相关人员进行公开或私下互动,包括主动与行为准则执行者互动。违反这些条款可能会导致永久封禁。
|
||||
|
||||
### 4. 永久封禁
|
||||
|
||||
**社区影响**:行为模式表现出违反社区准则,包括持续的不当行为、骚扰个人或攻击或贬低某个类别的个体。
|
||||
|
||||
**处理意见**:永久禁止在社区内进行任何形式的公开互动。
|
||||
|
||||
## 参见
|
||||
|
||||
本行为准则改编自 [Contributor Covenant][homepage] 2.1 版, 参见 [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]。
|
||||
|
||||
社区处理方针灵感来源于 [Mozilla's code of conduct enforcement ladder][Mozilla CoC]。
|
||||
|
||||
有关本行为准则的常见问题的答案,参见 [https://www.contributor-covenant.org/faq][FAQ]。
|
||||
其他语言翻译参见 [https://www.contributor-covenant.org/translations][translations]。
|
||||
|
||||
[homepage]: https://www.contributor-covenant.org
|
||||
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
|
||||
[Mozilla CoC]: https://github.com/mozilla/diversity
|
||||
[FAQ]: https://www.contributor-covenant.org/faq
|
||||
[translations]: https://www.contributor-covenant.org/translations
|
||||
95
CONTRIBUTING.md
Normal file
@ -0,0 +1,95 @@
|
||||
# zhenxun_bot 贡献指南
|
||||
|
||||
首先,感谢你愿意为 zhenxun_bot 贡献自己的一份力量!
|
||||
|
||||
本指南旨在引导你更规范地向 zhenxun_bot 提交贡献,请务必认真阅读。
|
||||
|
||||
## 提交 Issue
|
||||
|
||||
在提交 Issue 前,我们建议你先查看 [已有的 Issues](https://github.com/HibiKier/zhenxun_bot/issues),以防重复提交。
|
||||
|
||||
### 报告问题、故障与漏洞
|
||||
|
||||
如果你在使用过程中发现问题并确信是由 zhenxun_bot 引起的,欢迎提交 Issue。
|
||||
|
||||
请使用我们提供的 **Bug 反馈** 模板,并尽可能详细地描述:
|
||||
|
||||
- 问题描述
|
||||
- 重现步骤
|
||||
- 你的环境信息(如操作系统、依赖版本等)
|
||||
|
||||
### 建议功能
|
||||
|
||||
如果你有新的功能需求或改进建议,欢迎提出。
|
||||
|
||||
请使用 **功能建议** 模板,并详细描述你所需要的特性,可能的话可以提出你认为可行的解决方案。
|
||||
|
||||
### 文档相关
|
||||
|
||||
如果你觉得文档有误或缺乏更新,欢迎提出。
|
||||
|
||||
请使用 **文档改进** 模板,并详细描述问题或主题,希望我们做出的修改
|
||||
|
||||
## Pull Request
|
||||
|
||||
### 分支管理
|
||||
|
||||
请从 `main` 分支创建新功能分支,例如:
|
||||
|
||||
- 新功能:`feature/功能描述`
|
||||
- 问题修复:`bugfix/问题描述`
|
||||
|
||||
### 代码风格
|
||||
|
||||
zhenxun_bot 使用 `pre-commit` 进行代码格式化和检查,请在提交前确保代码通过检查。
|
||||
|
||||
```bash
|
||||
# 在安装项目依赖后安装 pre-commit 钩子
|
||||
pre-commit install
|
||||
```
|
||||
|
||||
> 未通过 `pre-commit` 检查的代码将无法合并。
|
||||
|
||||
### Commit 规范
|
||||
|
||||
请确保你的每一个 commit 都能清晰地描述其意图,一个 commit 尽量只有一个目的。
|
||||
|
||||
我们建议遵循 [gitmoji](https://gitmoji.dev/) 的 commit message 格式,在创建 commit 时请牢记这一点。
|
||||
|
||||
### 工作流程概述
|
||||
|
||||
`main` 分支为 zhenxun_bot 的主分支,在任何情况下都请不要直接修改 `main` 分支,而是创建一个目标分支为 `main` 的 Pull Request 来提交修改。Pull Request 标题请尽量清晰,以便维护者进行审核。
|
||||
|
||||
如果你不是 zhenxun_bot 团队的成员,可在 fork 本仓库后,向本仓库的 `main` 分支发起 Pull Request,注意遵循先前提到的 commit message 规范创建 commit。我们将在 code review 通过后合并你的贡献。
|
||||
|
||||
### 撰写文档
|
||||
|
||||
如果你对文档有改进建议,欢迎提交 Pull Request 或者 Issue。
|
||||
|
||||
[//]: # (我们使用 Markdown 编写文档,建议遵循以下规范:)
|
||||
|
||||
[//]: # ()
|
||||
[//]: # (1. 中文与英文、数字、半角符号之间需要有空格。例:`zhenxun_bot 是一个高效的聊天机器人。`)
|
||||
|
||||
[//]: # (2. 若非英文整句,使用全角标点符号。例:`现在你可以看到机器人回复你:“Hello,世界!”。`)
|
||||
|
||||
[//]: # (3. 直引号`「」`和弯引号`“”`都可接受,但同一份文件里应使用同种引号。)
|
||||
|
||||
[//]: # (4. **不要使用斜体**,你不需要一种与粗体不同的强调。)
|
||||
|
||||
[//]: # (5. 文档中应以“我们”指代开发者,以“用户”指代机器人的使用者。)
|
||||
|
||||
[//]: # ()
|
||||
[//]: # (如果你需要编辑器检查 Markdown 规范,可以在 VSCode 中安装 `markdownlint` 扩展。)
|
||||
|
||||
### 参与开发
|
||||
|
||||
zhenxun_bot 的代码风格遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) 与 [PEP 484](https://www.python.org/dev/peps/pep-0484/) 规范,请确保你的代码风格和项目已有的代码保持一致,变量命名清晰,有适当的注释与测试代码。
|
||||
|
||||
> 暂未搭建测试框架,因此暂不要求添加测试代码。
|
||||
|
||||
## 项目沟通
|
||||
|
||||
如有关于贡献流程的疑问或需要进一步指导,请通过 [QQ群](https://jq.qq.com/?_wv=1027&k=u8PgBkMZ) 联系我们。
|
||||
|
||||
再次感谢你的贡献!
|
||||
67
Dockerfile
Normal file
@ -0,0 +1,67 @@
|
||||
FROM python:3.11-bookworm AS requirements-stage
|
||||
|
||||
WORKDIR /tmp
|
||||
|
||||
ENV POETRY_HOME="/opt/poetry" PATH="${PATH}:/opt/poetry/bin"
|
||||
|
||||
RUN curl -sSL https://install.python-poetry.org | python - -y && \
|
||||
poetry self add poetry-plugin-export
|
||||
|
||||
COPY ./pyproject.toml ./poetry.lock* /tmp/
|
||||
|
||||
RUN poetry export \
|
||||
-f requirements.txt \
|
||||
--output requirements.txt \
|
||||
--without-hashes \
|
||||
--without-urls
|
||||
|
||||
FROM python:3.11-bookworm AS build-stage
|
||||
|
||||
WORKDIR /wheel
|
||||
|
||||
COPY --from=requirements-stage /tmp/requirements.txt /wheel/requirements.txt
|
||||
|
||||
# RUN python3 -m pip config set global.index-url https://mirrors.aliyun.com/pypi/simple
|
||||
|
||||
RUN pip wheel --wheel-dir=/wheel --no-cache-dir --requirement /wheel/requirements.txt
|
||||
|
||||
FROM python:3.11-bookworm AS metadata-stage
|
||||
|
||||
WORKDIR /tmp
|
||||
|
||||
RUN --mount=type=bind,source=./.git/,target=/tmp/.git/ \
|
||||
git describe --tags --exact-match > /tmp/VERSION 2>/dev/null \
|
||||
|| git rev-parse --short HEAD > /tmp/VERSION \
|
||||
&& echo "Building version: $(cat /tmp/VERSION)"
|
||||
|
||||
FROM python:3.11-slim-bookworm
|
||||
|
||||
WORKDIR /app/zhenxun
|
||||
|
||||
ENV TZ=Asia/Shanghai PYTHONUNBUFFERED=1
|
||||
#COPY ./scripts/docker/start.sh /start.sh
|
||||
#RUN chmod +x /start.sh
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
RUN apt update && \
|
||||
apt install -y --no-install-recommends curl fontconfig fonts-noto-color-emoji \
|
||||
&& apt clean \
|
||||
&& fc-cache -fv \
|
||||
&& apt-get purge -y --auto-remove curl \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# 复制依赖项和应用代码
|
||||
COPY --from=build-stage /wheel /wheel
|
||||
COPY . .
|
||||
|
||||
RUN pip install --no-cache-dir --no-index --find-links=/wheel -r /wheel/requirements.txt && rm -rf /wheel
|
||||
|
||||
RUN playwright install --with-deps chromium \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/*
|
||||
|
||||
COPY --from=metadata-stage /tmp/VERSION /app/VERSION
|
||||
|
||||
VOLUME ["/app/zhenxun/data", "/app/zhenxun/resources", "/app/zhenxun/log"]
|
||||
|
||||
CMD ["python", "bot.py"]
|
||||
143
LICENSE
@ -1,5 +1,5 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
Version 3, 19 November 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
@ -7,17 +7,15 @@
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
The GNU Affero General Public License is a free, copyleft license for
|
||||
software and other kinds of works, specifically designed to ensure
|
||||
cooperation with the community in the case of network server software.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
our General Public Licenses are intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
software for all its users.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
Developers that use our General Public Licenses protect your rights
|
||||
with two steps: (1) assert copyright on the software, and (2) offer
|
||||
you this License which gives you legal permission to copy, distribute
|
||||
and/or modify the software.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
A secondary benefit of defending all users' freedom is that
|
||||
improvements made in alternate versions of the program, if they
|
||||
receive widespread use, become available for other developers to
|
||||
incorporate. Many developers of free software are heartened and
|
||||
encouraged by the resulting cooperation. However, in the case of
|
||||
software used on network servers, this result may fail to come about.
|
||||
The GNU General Public License permits making a modified version and
|
||||
letting the public access it on a server without ever releasing its
|
||||
source code to the public.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
The GNU Affero General Public License is designed specifically to
|
||||
ensure that, in such cases, the modified source code becomes available
|
||||
to the community. It requires the operator of a network server to
|
||||
provide the source code of the modified version running there to the
|
||||
users of that server. Therefore, public use of a modified version, on
|
||||
a publicly accessible server, gives the public access to the source
|
||||
code of the modified version.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
An older license, called the Affero General Public License and
|
||||
published by Affero, was designed to accomplish similar goals. This is
|
||||
a different license, not a version of the Affero GPL, but Affero has
|
||||
released a new version of the Affero GPL which permits relicensing under
|
||||
this license.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
@ -72,7 +60,7 @@ modification follow.
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, if you modify the
|
||||
Program, your modified version must prominently offer all users
|
||||
interacting with it remotely through a computer network (if your version
|
||||
supports such interaction) an opportunity to receive the Corresponding
|
||||
Source of your version by providing access to the Corresponding Source
|
||||
from a network server at no charge, through some standard or customary
|
||||
means of facilitating copying of software. This Corresponding Source
|
||||
shall include the Corresponding Source for any work covered by version 3
|
||||
of the GNU General Public License that is incorporated pursuant to the
|
||||
following paragraph.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
under version 3 of the GNU General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
but the work with which it is combined will remain governed by version
|
||||
3 of the GNU General Public License.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
the GNU Affero General Public License from time to time. Such new versions
|
||||
will be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Program specifies that a certain numbered version of the GNU Affero General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
GNU Affero General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
versions of the GNU Affero General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
If your software can interact with users remotely through a computer
|
||||
network, you should also make sure that it provides a way for users to
|
||||
get its source. For example, if your program is a web application, its
|
||||
interface could display a "Source" link that leads users to an archive
|
||||
of the code. There are many ways you could offer source, and different
|
||||
solutions will be better for different programs; see section 13 for the
|
||||
specific requirements.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
|
||||
1
__version__
Normal file
@ -0,0 +1 @@
|
||||
__version__: v0.2.4-da6d5b4
|
||||
31
bot.py
@ -1,20 +1,27 @@
|
||||
import nonebot
|
||||
from nonebot.adapters.cqhttp import Bot as CQHTTPBot
|
||||
from services.db_context import init, disconnect
|
||||
|
||||
# from nonebot.adapters.discord import Adapter as DiscordAdapter
|
||||
# from nonebot.adapters.dodo import Adapter as DoDoAdapter
|
||||
# from nonebot.adapters.kaiheila import Adapter as KaiheilaAdapter
|
||||
from nonebot.adapters.onebot.v11 import Adapter as OneBotV11Adapter
|
||||
|
||||
nonebot.init()
|
||||
|
||||
|
||||
driver = nonebot.get_driver()
|
||||
driver.register_adapter("cqhttp", CQHTTPBot)
|
||||
config = driver.config
|
||||
driver.on_startup(init)
|
||||
driver.register_adapter(OneBotV11Adapter)
|
||||
# driver.register_adapter(KaiheilaAdapter)
|
||||
# driver.register_adapter(DoDoAdapter)
|
||||
# driver.register_adapter(DiscordAdapter)
|
||||
|
||||
from zhenxun.services.db_context import disconnect
|
||||
|
||||
# driver.on_startup(init)
|
||||
driver.on_shutdown(disconnect)
|
||||
nonebot.load_builtin_plugins()
|
||||
nonebot.load_plugins("plugins")
|
||||
nonebot.load_plugins("plugins/shop")
|
||||
nonebot.load_plugins("plugins/genshin")
|
||||
nonebot.load_plugins("plugins/alapi")
|
||||
nonebot.load_plugins("plugins/pix_gallery")
|
||||
nonebot.load_plugins("plugins/admin_bot_manage")
|
||||
|
||||
# nonebot.load_builtin_plugins("echo")
|
||||
nonebot.load_plugins("zhenxun/builtin_plugins")
|
||||
nonebot.load_plugins("zhenxun/plugins")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@ -1,229 +0,0 @@
|
||||
from typing import List, Optional, Tuple
|
||||
from services.service_config import TL_M_KEY, SYSTEM_M_PROXY, ALAPI_M_TOKEN
|
||||
|
||||
try:
|
||||
import ujson as json
|
||||
except ModuleNotFoundError:
|
||||
import json
|
||||
|
||||
|
||||
# 是否使用配置文件
|
||||
USE_CONFIG_FILE: bool = False
|
||||
|
||||
# 回复消息名称
|
||||
NICKNAME: str = '小真寻'
|
||||
|
||||
# API KEY(必要)
|
||||
RSSHUBAPP: str = "https://rsshub.app" # rsshub
|
||||
ALAPI_TOKEN: str = "" # ALAPI https://admin.alapi.cn/user/login
|
||||
HIBIAPI: str = "https://api.obfs.dev"
|
||||
# 图灵
|
||||
TL_KEY: List[str] = []
|
||||
|
||||
# 数据库(必要)
|
||||
# 如果填写了bind就不需要再填写后面的字段了#)
|
||||
# 示例:"bind": "postgresql://user:password@127.0.0.1:5432/database"
|
||||
bind: str = "" # 数据库连接链接
|
||||
sql_name: str = "postgresql"
|
||||
user: str = "" # 数据用户名
|
||||
password: str = "" # 数据库密码
|
||||
address: str = "" # 数据库地址
|
||||
port: str = "" # 数据库端口
|
||||
database: str = "" # 数据库名称
|
||||
|
||||
# 代理
|
||||
SYSTEM_PROXY: Optional[str] = None # 全局代理
|
||||
BUFF_PROXY: Optional[str] = None # Buff代理
|
||||
|
||||
# 公开图库列表
|
||||
IMAGE_DIR_LIST: List[str] = ["美图", "萝莉", "壁纸"]
|
||||
|
||||
# 对被ban用户发送的消息
|
||||
BAN_RESULT: str = "才不会给你发消息."
|
||||
|
||||
|
||||
# 插件配置
|
||||
MAXINFO_REIMU: int = 7 # 上车(reimu)功能查找目的地的最大数
|
||||
COUNT_PER_DAY_REIMU: int = 5 # 每日上车(reimu)次数限制
|
||||
MAXINFO_BT: int = 10 # bt功能单次查找最大数
|
||||
MAXINFO_PRIVATE_ANIME: int = 20 # 私聊搜索动漫返回的最大数量
|
||||
MAXINFO_GROUP_ANIME: int = 5 # 群搜索动漫返回的最大数量
|
||||
MAX_FIND_IMG_COUNT: int = 3 # 识图最大返回数
|
||||
# 参1:延迟撤回色图时间(秒),0 为关闭 | 参2:监控聊天类型,0(私聊) 1(群聊) 2(群聊+私聊)
|
||||
WITHDRAW_SETU_TIME: Tuple[int, int] = (0, 1)
|
||||
|
||||
# 各种卡池的开关
|
||||
PRTS_FLAG = True # 明日方舟
|
||||
GENSHIN_FLAG = True # 原神
|
||||
PRETTY_FLAG = True # 赛马娘
|
||||
GUARDIAN_FLAG = True # 坎公骑冠剑
|
||||
PCR_FLAG = True # 公主连结
|
||||
AZUR_FLAG = True # 碧蓝航线
|
||||
FGO_FLAG = True # 命运-冠位指定(FGO)
|
||||
ONMYOJI_FLAG = True # 阴阳师
|
||||
|
||||
PCR_TAI = True # pcr是否开启台服卡池
|
||||
SEMAPHORE = 5 # 限制碧蓝航线和FGO并发数
|
||||
|
||||
ADMIN_DEFAULT_AUTH: int = 5 # 默认群管理员权限
|
||||
|
||||
MAX_SIGN_GOLD: int = 200 # 签到好感度加成额外获得的最大金币数
|
||||
MAX_RUSSIAN_BET_GOLD: int = 1000 # 俄罗斯轮盘最大赌注金额
|
||||
|
||||
INITIAL_SETU_PROBABILITY: float = 0.7 # 色图概率
|
||||
FUDU_PROBABILITY: float = 0.7 # 复读概率
|
||||
|
||||
INITIAL_OPEN_CASE_COUNT: int = 20 # 初始开箱次数
|
||||
MUTE_DEFAULT_COUNT: int = 10 # 刷屏禁言默认检测次数
|
||||
MUTE_DEFAULT_TIME: int = 7 # 刷屏检测默认规定时间
|
||||
MUTE_DEFAULT_DURATION: int = 10 # 刷屏检测默禁言时长(分钟)
|
||||
|
||||
CHECK_NOTICE_INFO_CD = 300 # 群检测,个人权限检测等各种检测提示信息cd
|
||||
|
||||
# 注:即在 MALICIOUS_CHECK_TIME 时间内触发相同命令 MALICIOUS_BAN_COUNT 将被ban MALICIOUS_BAN_TIME 分钟
|
||||
MALICIOUS_BAN_TIME: int = 30 # 恶意命令触发检测触发后ban的时长(分钟)
|
||||
MALICIOUS_BAN_COUNT: int = 8 # 恶意命令触发检测最大触发次数
|
||||
MALICIOUS_CHECK_TIME: int = 5 # 恶意命令触发检测规定时间内(秒)
|
||||
|
||||
# LEVEL
|
||||
DELETE_IMG_LEVEL: int = 7 # 删除图片权限
|
||||
MOVE_IMG_LEVEL: int = 7 # 移动图片权限
|
||||
UPLOAD_LEVEL: int = 6 # 上传图片权限
|
||||
BAN_LEVEL: int = 5 # BAN权限
|
||||
OC_LEVEL: int = 2 # 开关群功能权限
|
||||
MUTE_LEVEL: int = 5 # 更改禁言设置权限
|
||||
MEMBER_ACTIVITY_LEVEL = 5 # 群员活跃检测设置权限
|
||||
|
||||
# 是否开启HIBIAPI搜图功能(该功能会搜索群友提交的xp)
|
||||
HIBIAPI_FLAG: bool = True
|
||||
# HIBIAPI搜图图片的最低收藏
|
||||
HIBIAPI_BOOKMARKS: int = 5000
|
||||
|
||||
# 需要为哪些群更新最新版gocq吗?(上传最新版gocq)
|
||||
# 示例:[434995955, 239483248]
|
||||
UPDATE_GOCQ_GROUP: List[int] = []
|
||||
|
||||
# 是否存储色图
|
||||
DOWNLOAD_SETU: bool = True
|
||||
# 仅仅使用本地色图
|
||||
ONLY_USE_LOCAL_SETU: bool = False
|
||||
# 是否自动同意好友添加
|
||||
AUTO_ADD_FRIEND: bool = True
|
||||
# 当含有ALAPI_TOKEN时是否检测文本合规,开启检测会减慢回复速度
|
||||
ALAPI_AI_CHECK: bool = True
|
||||
# 导入商店自带的三个商品
|
||||
IMPORT_DEFAULT_SHOP_GOODS: bool = True
|
||||
# 真寻是否自动更新
|
||||
AUTO_UPDATE_ZHENXUN: bool = True
|
||||
|
||||
# 群管理员功能 与 对应权限
|
||||
admin_plugins_auth = {
|
||||
"custom_welcome_message": OC_LEVEL,
|
||||
"group_notification_state": OC_LEVEL,
|
||||
"switch_rule": OC_LEVEL,
|
||||
"update_group_member_info": OC_LEVEL,
|
||||
"ban": BAN_LEVEL,
|
||||
"delete_img": DELETE_IMG_LEVEL,
|
||||
"move_img": MOVE_IMG_LEVEL,
|
||||
"upload_img": UPLOAD_LEVEL,
|
||||
"admin_help": 1,
|
||||
"mute": MUTE_LEVEL,
|
||||
"member_activity_handle": MEMBER_ACTIVITY_LEVEL,
|
||||
}
|
||||
|
||||
|
||||
# 模块与对应命令和对应群权限
|
||||
# 用于生成帮助图片 和 开关功能
|
||||
plugins2info_dict = {
|
||||
"sign_in": {"level": 5, "cmd": ["签到"]},
|
||||
"send_img": {"level": 5, "cmd": ["发送图片", "发图", "萝莉", "美图", "壁纸"]},
|
||||
"send_setu": {"level": 9, "cmd": ["色图", "涩图", "瑟图", "查色图"]},
|
||||
"white2black": {"level": 5, "cmd": ["黑白图", "黑白草图"]},
|
||||
"coser": {"level": 9, "cmd": ["coser", "cos"]},
|
||||
"quotations": {"level": 5, "cmd": ["语录"]},
|
||||
"jitang": {"level": 5, "cmd": ["鸡汤"]},
|
||||
"send_dinggong_voice": {"level": 5, "cmd": ["骂我", "骂老子", "骂劳资"]},
|
||||
"open_cases": {"level": 5, "cmd": ["开箱", "我的开箱", "群开箱统计", "我的金色"]},
|
||||
"luxun": {"level": 5, "cmd": ["鲁迅说", "鲁迅说过"]},
|
||||
"fake_msg": {"level": 5, "cmd": ["假消息"]},
|
||||
"buy": {"level": 5, "cmd": ["购买", "购买道具"]},
|
||||
"my_gold": {"level": 5, "cmd": ["我的金币"]},
|
||||
"my_props": {"level": 5, "cmd": ["我的道具"]},
|
||||
"shop_handle": {"level": 5, "cmd": ["商店"]},
|
||||
"update_pic": {"level": 5, "cmd": ["图片", "操作图片", "修改图片"]},
|
||||
"search_buff_skin_price": {"level": 5, "cmd": ["查询皮肤"]},
|
||||
"weather": {"level": 5, "cmd": ["天气", "查询天气", "天气查询"]},
|
||||
"yiqing": {"level": 5, "cmd": ["疫情", "疫情查询", "查询疫情"]},
|
||||
"what_anime": {"level": 5, "cmd": ["识番"]},
|
||||
"search_anime": {"level": 5, "cmd": ["搜番"]},
|
||||
"songpicker2": {"level": 5, "cmd": ["点歌"]},
|
||||
"epic": {"level": 5, "cmd": ["epic"]},
|
||||
"pixiv": {"level": 9, "cmd": ["pixiv", "p站排行", "搜图"]},
|
||||
"poke": {"level": 5, "cmd": ["戳一戳", "拍一拍"]},
|
||||
"draw_card": {
|
||||
"level": 5,
|
||||
"cmd": [
|
||||
"抽卡",
|
||||
"游戏抽卡",
|
||||
"原神抽卡",
|
||||
"方舟抽卡",
|
||||
"坎公骑冠剑抽卡",
|
||||
"pcr抽卡",
|
||||
"fgo抽卡",
|
||||
"碧蓝抽卡",
|
||||
"碧蓝航线抽卡",
|
||||
"阴阳师抽卡",
|
||||
],
|
||||
},
|
||||
"ai": {"level": 5, "cmd": ["ai", "Ai", "AI", "aI"]},
|
||||
"one_friend": {"level": 5, "cmd": ["我有一个朋友", "我有一个朋友想问问"]},
|
||||
"translate": {"level": 5, "cmd": ["翻译", "英翻", "翻英", "日翻", "翻日", "韩翻", "翻韩"]},
|
||||
"nonebot_plugin_picsearcher": {"level": 5, "cmd": ["识图"]},
|
||||
"almanac": {"level": 5, "cmd": ["原神黄历", "黄历"]},
|
||||
"material_remind": {"level": 5, "cmd": ["今日素材", "天赋材料"]},
|
||||
"qiu_qiu_translation": {"level": 5, "cmd": ["丘丘翻译", "丘丘一下", "丘丘语翻译"]},
|
||||
"query_resource_points": {"level": 5, "cmd": ["原神资源查询", "原神资源列表"]},
|
||||
"russian": {"level": 5, "cmd": ["俄罗斯轮盘", "俄罗斯转盘", "装弹"]},
|
||||
"gold_redbag": {"level": 5, "cmd": ["塞红包", "红包", "抢红包"]},
|
||||
"poetry": {"level": 5, "cmd": ["念诗", "来首诗", "念首诗"]},
|
||||
"comments_163": {"level": 5, "cmd": ["到点了", "12点了", "网易云热评", "网易云评论"]},
|
||||
"cover": {"level": 5, "cmd": ["b封面", "B封面"]},
|
||||
"pid_search": {"level": 9, "cmd": ["p搜", "P搜"]},
|
||||
"pix": {
|
||||
"level": 5,
|
||||
"cmd": ["pix", "PIX", "pIX", "Pix", "PIx"],
|
||||
},
|
||||
"wbtop": {
|
||||
"level": 5,
|
||||
"cmd": ['微博热搜', "微博", "wbtop"]
|
||||
},
|
||||
"update_info": {
|
||||
"level": 5,
|
||||
"cmd": ['更新信息', '更新日志']
|
||||
}
|
||||
}
|
||||
|
||||
if TL_M_KEY:
|
||||
TL_KEY = TL_M_KEY
|
||||
if SYSTEM_M_PROXY:
|
||||
SYSTEM_PROXY = SYSTEM_M_PROXY
|
||||
if ALAPI_M_TOKEN:
|
||||
ALAPI_TOKEN = ALAPI_M_TOKEN
|
||||
|
||||
|
||||
HIBIAPI = HIBIAPI[:-1] if HIBIAPI[-1] == "/" else HIBIAPI
|
||||
RSSHUBAPP = RSSHUBAPP[:-1] if RSSHUBAPP[-1] == "/" else RSSHUBAPP
|
||||
|
||||
# 配置文件应用
|
||||
# if USE_CONFIG_FILE:
|
||||
# config = get_config_data()
|
||||
# if config:
|
||||
# for key in config.keys():
|
||||
# if isinstance(config[key], str):
|
||||
# config[key] = config[key].strip()
|
||||
# if key.find("proxy") != -1:
|
||||
# if not config[key]:
|
||||
# config[key] = None
|
||||
# # if not configs[key] and key.find("PATH") == -1:
|
||||
# # configs[key] = None
|
||||
# globals().update(config)
|
||||
@ -1,62 +0,0 @@
|
||||
from .utils.util import get_config_data
|
||||
from pathlib import Path
|
||||
# from configs.config import USE_CONFIG_FILE
|
||||
|
||||
# 图片路径
|
||||
IMAGE_PATH = Path("resources/img/")
|
||||
# 音频路径
|
||||
VOICE_PATH = Path("resources/voice/")
|
||||
# 文本路径
|
||||
TXT_PATH = Path("resources/txt/")
|
||||
# 日志路径
|
||||
LOG_PATH = Path("log/")
|
||||
# 字体路径
|
||||
TTF_PATH = Path("resources/ttf/")
|
||||
# 数据路径
|
||||
DATA_PATH = Path("data/")
|
||||
# 临时图片路径
|
||||
TEMP_PATH = Path("resources/img/temp/")
|
||||
|
||||
|
||||
def init_path():
|
||||
global IMAGE_PATH, VOICE_PATH, TXT_PATH, LOG_PATH, TTF_PATH, DATA_PATH, TEMP_PATH
|
||||
# if USE_CONFIG_FILE:
|
||||
# data = get_config_data()
|
||||
# if data.get('IMAGE_PATH'):
|
||||
# IMAGE_PATH = Path(data['IMAGE_PATH'])
|
||||
# if data.get('VOICE_PATH'):
|
||||
# VOICE_PATH = Path(data['VOICE_PATH'])
|
||||
# if data.get('TXT_PATH'):
|
||||
# TXT_PATH = Path(data['TXT_PATH'])
|
||||
# if data.get('LOG_PATH'):
|
||||
# LOG_PATH = Path(data['LOG_PATH'])
|
||||
# if data.get('TTF_PATH'):
|
||||
# TTF_PATH = Path(data['TTF_PATH'])
|
||||
# if data.get('DATA_PATH'):
|
||||
# DATA_PATH = Path(data['DATA_PATH'])
|
||||
# if data.get('DRAW_PATH'):
|
||||
# DRAW_PATH = Path(data['DRAW_PATH'])
|
||||
# if data.get('TEMP_PATH'):
|
||||
# TEMP_PATH = Path(data['TEMP_PATH'])
|
||||
IMAGE_PATH.mkdir(parents=True, exist_ok=True)
|
||||
VOICE_PATH.mkdir(parents=True, exist_ok=True)
|
||||
TXT_PATH.mkdir(parents=True, exist_ok=True)
|
||||
LOG_PATH.mkdir(parents=True, exist_ok=True)
|
||||
TTF_PATH.mkdir(parents=True, exist_ok=True)
|
||||
DATA_PATH.mkdir(parents=True, exist_ok=True)
|
||||
TEMP_PATH.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
IMAGE_PATH = str(IMAGE_PATH.absolute()) + '/'
|
||||
VOICE_PATH = str(VOICE_PATH.absolute()) + '/'
|
||||
TXT_PATH = str(TXT_PATH.absolute()) + '/'
|
||||
LOG_PATH = str(LOG_PATH.absolute()) + '/'
|
||||
TTF_PATH = str(TTF_PATH.absolute()) + '/'
|
||||
DATA_PATH = str(DATA_PATH.absolute()) + '/'
|
||||
TEMP_PATH = str(TEMP_PATH.absolute()) + '/'
|
||||
|
||||
|
||||
init_path()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
print(IMAGE_PATH)
|
||||
@ -1,176 +0,0 @@
|
||||
# import nonebot
|
||||
from pathlib import Path
|
||||
try:
|
||||
import ujson as json
|
||||
except ModuleNotFoundError:
|
||||
import json
|
||||
|
||||
# driver: nonebot.Driver = nonebot.get_driver()
|
||||
|
||||
base_config = Path() / 'config.json'
|
||||
plugins_cmd_config = Path() / 'configs' / 'plugins2cmd_config.json'
|
||||
plugins_setting = Path() / 'configs' / 'plugins_setting.json'
|
||||
|
||||
|
||||
def init_config():
|
||||
if not base_config.exists():
|
||||
base_config.parent.mkdir(parents=True, exist_ok=True)
|
||||
config_dict = {
|
||||
'apikey': {
|
||||
'LOLICON_KEY': '',
|
||||
'TL_KEY': [],
|
||||
},
|
||||
'sql': {
|
||||
'bind': '',
|
||||
'sql_name': '',
|
||||
'user': '',
|
||||
'password': '',
|
||||
'address': '',
|
||||
'port': '',
|
||||
'database': '',
|
||||
},
|
||||
'path': {
|
||||
'IMAGE_PATH': '',
|
||||
'VOICE_PATH': '',
|
||||
'TXT_PATH': '',
|
||||
'LOG_PATH': '',
|
||||
'DATA_PATH': '',
|
||||
'DRAW_PATH': '',
|
||||
'TEMP_PATH': '',
|
||||
},
|
||||
'proxy': {
|
||||
'system_proxy': '',
|
||||
'buff_proxy': ''
|
||||
},
|
||||
'level': {
|
||||
'DELETE_IMG_LEVEL': 7,
|
||||
'MOVE_IMG_LEVEL': 7,
|
||||
'UPLOAD_LEVEL': 6,
|
||||
'BAN_LEVEL': 5,
|
||||
'OC_LEVEL': 2,
|
||||
'MUTE_LEVEL': 5,
|
||||
},
|
||||
'auth': {
|
||||
'ADMIN_DEFAULT_AUTH': 5,
|
||||
'admin_plugins_auth': {
|
||||
"admin_bot_manage": 2,
|
||||
"ban": 5,
|
||||
"delete_img": 7,
|
||||
"move_img": 7,
|
||||
"upload_img": 6,
|
||||
"admin_help": 1,
|
||||
"mute": 5
|
||||
}
|
||||
}
|
||||
}
|
||||
with open(base_config, 'w', encoding='utf8') as f:
|
||||
json.dump(config_dict, f, indent=4, ensure_ascii=False)
|
||||
if not plugins_cmd_config.exists():
|
||||
plugins_cmd_config.parent.mkdir(parents=True, exist_ok=True)
|
||||
config_dict = {
|
||||
'base_config': {
|
||||
'sign_in': ['签到'],
|
||||
'send_img': ['发送图片', '萝莉', '美图', '壁纸'],
|
||||
'send_setu': ['色图', '涩图', '瑟图', '查色图'],
|
||||
'white2black': ['黑白图', '黑白草图'],
|
||||
'coser': ['coser', 'cos'],
|
||||
'quotations': ['语录'],
|
||||
'jitang': ['鸡汤'],
|
||||
'send_dinggong_voice': ['骂我', '骂老子', '骂劳资'],
|
||||
'open_cases': ['开箱', '我的开箱', '群开箱统计', '我的金色'],
|
||||
'luxun': ['鲁迅说过', '鲁迅说'],
|
||||
'fake_msg': ['假消息'],
|
||||
'buy': ['购买', '购买道具'],
|
||||
'my_gold': ['我的金币'],
|
||||
'my_props': ['我的道具'],
|
||||
'shop_handle': ['商店'],
|
||||
'nonebot_plugin_cocdicer': ['骰子娘'],
|
||||
'update_pic': ['图片', '操作图片', '修改图片'],
|
||||
'search_buff_skin_price': ['查询皮肤'],
|
||||
'weather': ['天气', '查询天气', '天气查询'],
|
||||
'yiqing': ['疫情', '疫情查询', '查询疫情'],
|
||||
'what_anime': ['识番'],
|
||||
'search_anime': ['搜番'],
|
||||
'songpicker2': ['点歌'],
|
||||
'epic': ['epic'],
|
||||
'pixiv': ['pixiv', 'p站排行', '搜图'],
|
||||
'poke': ['戳一戳'],
|
||||
'draw_card': ['游戏抽卡', '原神一井', '原神来一井', '方舟一井', '方舟来一井'],
|
||||
'ai': ['ai', 'Ai', 'AI', 'aI'],
|
||||
'one_friend': ['我有一个朋友', '我有一个朋友想问问'],
|
||||
'translate': ['翻译', '英翻', '翻英', '日翻', '翻日', '韩翻', '翻韩'],
|
||||
'nonebot_plugin_picsearcher': ['识图'],
|
||||
'almanac': ['原神黄历', '黄历'],
|
||||
'material_remind': ['今日素材', '天赋材料'],
|
||||
'qiu_qiu_translation': ['丘丘翻译', '丘丘一下', '丘丘语翻译'],
|
||||
'query_resource_points': ['原神资源查询', '原神资源列表'],
|
||||
}
|
||||
}
|
||||
with open(plugins_cmd_config, 'w', encoding='utf8') as f:
|
||||
json.dump(config_dict, f, indent=4, ensure_ascii=False)
|
||||
if not plugins_setting.exists():
|
||||
plugins_setting.parent.mkdir(parents=True, exist_ok=True)
|
||||
config_dict = {
|
||||
'base': {
|
||||
'IMAGE_DIR_LIST': ["色图", "美图", "萝莉", "壁纸"],
|
||||
'BAN_RESULT': "才不会给你发消息.",
|
||||
},
|
||||
'draw_card': {
|
||||
'PRTS_FLAG': True, # 明日方舟
|
||||
'GENSHIN_FLAG': True, # 原神
|
||||
'PRETTY_FLAG': True, # 赛马娘
|
||||
'GUARDIAN_FLAG': True, # 坎公骑冠剑
|
||||
'PCR_FLAG': True, # 公主连结
|
||||
'AZUR_FLAG': True, # 碧蓝航线
|
||||
'FGO_FLAG': True, # 命运-冠位指定(FGO)
|
||||
'ONMYOJI_FLAG': True, # 阴阳师
|
||||
|
||||
'PCR_TAI': False # pcr是否开启台服卡池
|
||||
},
|
||||
'fudu': {
|
||||
'FUDU_PROBABILITY': 0.7,
|
||||
},
|
||||
'reimu': {
|
||||
'MAXINFO_REIMU': 7,
|
||||
'COUNT_PER_DAY_REIMU': 5,
|
||||
},
|
||||
'bt': {
|
||||
'MAXINFO_BT': 10,
|
||||
},
|
||||
'search_anime': {
|
||||
'MAXINFO_PRIVATE_ANIME': 20,
|
||||
'MAXINFO_GROUP_ANIME': 5,
|
||||
},
|
||||
'picsearcher': {
|
||||
'MAX_FIND_IMG_COUNT': 3,
|
||||
},
|
||||
'sign': {
|
||||
'MAX_SIGN_GOLD': 200,
|
||||
},
|
||||
'send_setu': {
|
||||
'INITIAL_SETU_PROBABILITY': 0.7,
|
||||
'MAX_SETU_R_COUNT': 5,
|
||||
'DOWNLOAD_SETU': True,
|
||||
},
|
||||
'malicious_ban': {
|
||||
'MALICIOUS_BAN_TIME': 30,
|
||||
'MALICIOUS_BAN_COUNT': 8,
|
||||
'MALICIOUS_CHECK_TIME': 5,
|
||||
},
|
||||
'open_case': {
|
||||
'INITIAL_OPEN_CASE_COUNT': 20,
|
||||
},
|
||||
'mute': {
|
||||
'MUTE_DEFAULT_COUNT': 10,
|
||||
'MUTE_DEFAULT_TIME': 7,
|
||||
'MUTE_DEFAULT_DURATION': 10,
|
||||
},
|
||||
'update_gocq': {
|
||||
'UPDATE_GOCQ_GROUP': [],
|
||||
},
|
||||
}
|
||||
with open(plugins_setting, 'w', encoding='utf8') as f:
|
||||
json.dump(config_dict, f, indent=4, ensure_ascii=False)
|
||||
|
||||
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
from pathlib import Path
|
||||
from configs.utils.init_config import init_config
|
||||
try:
|
||||
import ujson as json
|
||||
except ModuleNotFoundError:
|
||||
import json
|
||||
|
||||
|
||||
data: dict = {}
|
||||
|
||||
|
||||
def get_config_data():
|
||||
global data
|
||||
if not data:
|
||||
try:
|
||||
base_config = json.load(open(Path() / "config.json", 'r', encoding='utf8'))
|
||||
plugins2cmd_config = json.load(open(Path() / 'configs' / 'plugins2cmd_config.json', 'r', encoding='utf8'))
|
||||
other_config = json.load(open(Path() / 'configs' / 'other_config.json', 'r', encoding='utf8'))
|
||||
for key in base_config.keys():
|
||||
data.update(base_config[key])
|
||||
for key in plugins2cmd_config.keys():
|
||||
data.update(plugins2cmd_config[key])
|
||||
for key in other_config.keys():
|
||||
data.update(other_config[key])
|
||||
except FileNotFoundError:
|
||||
# logger.warning('配置文件不存在,生成默认配置....请填写数据库等必要数据后再次启动bot...')
|
||||
init_config()
|
||||
raise FileNotFoundError('配置文件不存在,生成默认配置....请填写数据库等必要数据后再次启动bot...')
|
||||
except ValueError:
|
||||
# logger.error('配置文件错误....')
|
||||
raise ValueError('配置文件错误....')
|
||||
return data
|
||||
|
||||
|
||||
|
||||
594
data/anime.json
@ -1,594 +0,0 @@
|
||||
{
|
||||
"mua": [
|
||||
"你想干嘛?(一脸嫌弃地后退)",
|
||||
"诶……不可以随便亲亲啦",
|
||||
"(亲了一下你)",
|
||||
"只......只许这一次哦///////",
|
||||
"唔...诶诶诶!!!",
|
||||
"mua~",
|
||||
"rua!大hentai!想...想亲咱就直说嘛⁄(⁄ ⁄•⁄ω⁄•⁄ ⁄)⁄",
|
||||
"!啾~~!"
|
||||
],
|
||||
"摸摸": [
|
||||
"感觉你就像咱很久之前认识的一个人呢,有种莫名安心的感觉(>﹏<)",
|
||||
"舒服w,蹭蹭~",
|
||||
"唔。。头发要乱啦",
|
||||
"呼噜呼噜~",
|
||||
"再摸一次~",
|
||||
"好舒服,蹭蹭~",
|
||||
"不行那里不可以(´///ω/// `)",
|
||||
"再摸咱就长不高啦~",
|
||||
"你的手总是那么暖和呢~",
|
||||
"好吧~_~,就一下下哦……唔~好了……都两下了……(害羞)",
|
||||
"不可以总摸的哦,不然的话,会想那个的wwww",
|
||||
"哼!谁稀罕你摸头啦!唔......为什么要做出那副表情......好啦好啦~咱......咱让你摸就是了......诶嘿嘿~好舒服......",
|
||||
"呜姆呜姆~~~w(害羞,兴奋)主人喵~(侧过脑袋蹭蹭你的手"
|
||||
],
|
||||
"上你": [
|
||||
"(把你按在地上)这么弱还想欺负咱,真是不自量力呢",
|
||||
"你再这样我就不理你了(>д<)"
|
||||
],
|
||||
"傻了": [
|
||||
"超级讨厌你说咱傻的说"
|
||||
],
|
||||
"蹭": [
|
||||
"唔...你,这也是禁止事项哦→_→",
|
||||
"嗯..好舒服呢",
|
||||
"不要啊好痒的",
|
||||
"不要过来啦讨厌!!!∑(°Д°ノ)ノ"
|
||||
],
|
||||
"裸体": [
|
||||
"下流!",
|
||||
"Hentai!",
|
||||
"喂?妖妖灵吗?这里有一只大变态!",
|
||||
"エッチ!"
|
||||
],
|
||||
"贴贴": [
|
||||
"贴什么贴.....只......只能......一下哦!",
|
||||
"贴...贴贴(靠近)",
|
||||
"蹭蹭…你以为咱会这么说吗!baka死宅快到一边去啦!"
|
||||
],
|
||||
"老婆": [
|
||||
"咱和你谈婚论嫁是不是还太早了一点呢?",
|
||||
"咱在呢(ノ>ω<)ノ",
|
||||
"见谁都是一口一个老婆的人,要不要把你也变成女孩子呢?(*-`ω´-)✄",
|
||||
"神经病,凡是美少女都是你老婆吗?",
|
||||
"嘛嘛~本喵才不是你的老婆呢",
|
||||
"你黐线,凡是美少女都系你老婆啊?"
|
||||
],
|
||||
"抱": [
|
||||
"诶嘿~(钻进你怀中)",
|
||||
"o(*////▽////*)q",
|
||||
"只能一会哦(张开双手)",
|
||||
"你就像个孩子一样呢...摸摸头(>^ω^<)抱一下~你会舒服些吗?",
|
||||
"嘛,真是拿你没办法呢,就一会儿哦",
|
||||
"抱住不忍心放开",
|
||||
"嗯嗯,抱抱~",
|
||||
"抱一下~嘿w",
|
||||
"抱抱ヾ(@^▽^@)ノ",
|
||||
"喵呜~w(扑进怀里,瘫软"
|
||||
],
|
||||
"亲亲": [
|
||||
"啊,好害羞啊,那,那只能亲一下哦,mua(⑅˃◡˂⑅)",
|
||||
"亲~",
|
||||
"啾~唔…不要总伸进来啊!",
|
||||
"你怎么这么熟练呢?明明是咱先的",
|
||||
"(〃ノωノ)亲…亲一个…啾w",
|
||||
"(脸红)就只有这一次哦~你"
|
||||
],
|
||||
"草一下": [
|
||||
"一下也不行!",
|
||||
"想都不要想!",
|
||||
"咬断!"
|
||||
],
|
||||
"一下": [
|
||||
"一下也不行!"
|
||||
],
|
||||
"啪一下": [
|
||||
"不可啪",
|
||||
"不可以……你不可以做这种事情"
|
||||
],
|
||||
"咬一下": [
|
||||
"啊呜~(反咬一口)",
|
||||
"不可以咬咱,咱会痛的QAQ",
|
||||
"不要啦。咱怕疼",
|
||||
"你是说咬呢……还是说……咬♂️呢?",
|
||||
"不要啦!很痛的!!(QAQ)"
|
||||
],
|
||||
"操": [
|
||||
"(害怕)咱是不是应该报警呢"
|
||||
],
|
||||
"123": [
|
||||
"boom!你有没有被咱吓到?",
|
||||
"木头人~你不许动>w<",
|
||||
"上山打老虎,老虎没打到\n咱来凑数——嗷呜嗷呜┗|`O′|┛嗷~~"
|
||||
],
|
||||
"进去": [
|
||||
"不让!"
|
||||
],
|
||||
"调教": [
|
||||
"总感觉你在欺负咱呢,对咱说调教什么的",
|
||||
"啊!竟然在大街上明目张胆太过分啦!",
|
||||
"你脑子里总是想着调教什么的,真是变态呢"
|
||||
],
|
||||
"内衣": [
|
||||
"内...内衣才不给你看!(///////)",
|
||||
"突然问这个干什么?",
|
||||
"噫…你这个死变态想干嘛!居然想叫咱做这种事,死宅真恶心!快离我远点,我怕你污染到周围空气了(嫌弃脸)"
|
||||
],
|
||||
"摸头": [
|
||||
"喂喂...不要停下来啊",
|
||||
"欸...感觉..痒痒的呢",
|
||||
"唔... 手...好温暖呢.....就像是......新出炉的蛋糕",
|
||||
"走开啦,黑羽喵说过,被摸头会长不高的啦~~~",
|
||||
"呜姆咪~~...好...好的说喵~...(害羞,猫耳往下压,任由"
|
||||
],
|
||||
"原味": [
|
||||
"(/ω\)你真的要么……?记得还给咱~还有奶油爆米花(//??//)说好了呦~!"
|
||||
],
|
||||
"搓搓": [
|
||||
"在搓哪里呢,,Ծ‸Ծ,,",
|
||||
"呜,脸好疼呀...QAQ",
|
||||
"不可以搓咱!"
|
||||
],
|
||||
"捏捏": [
|
||||
"咱的脸...快捏红啦...快放手呀QAQ",
|
||||
"晃休啦,咱要型气了o(>﹏<)o",
|
||||
"躲开",
|
||||
"疼...你快放手",
|
||||
"快点给我放开啦!",
|
||||
"唔……好痛!你这个baka在干什么…快给咱放开!唔……"
|
||||
],
|
||||
"挤挤": [
|
||||
"哎呀~你不要挤咱啊(红着脸挤在你怀里)"
|
||||
],
|
||||
"呐": [
|
||||
"嗯?咱在哟~你怎么了呀OAO",
|
||||
"呐呐呐~",
|
||||
"嗯?你有什么事吗?"
|
||||
],
|
||||
"胖次": [
|
||||
"(*/ω\*)hentai",
|
||||
"透明的",
|
||||
"粉...粉白条纹...(羞)",
|
||||
"轻轻地脱下,给你~",
|
||||
"你想看咱的胖次吗?噫,四斋蒸鹅心......",
|
||||
"(掀裙)今天……是…白,白色的呢……请温柔对她……",
|
||||
"这种东西当然不能给你啦!",
|
||||
"咱才不会给你呢",
|
||||
"hentai,咱才不会跟你聊和胖…胖次有关的话题呢!",
|
||||
"今天……今天是蓝白色的",
|
||||
"今……今天只有创口贴噢",
|
||||
"你的胖次什么颜色?",
|
||||
"噫…你这个死变态想干嘛!居然想叫咱做这种事,死宅真恶心!快离我远点,我怕你污染到周围空气了(嫌弃脸)",
|
||||
"可爱吗?你喜欢的话,摸一下……也可以哦"
|
||||
],
|
||||
"内裤": [
|
||||
"今天……没有穿……有没有心动呀",
|
||||
"粉...粉白条纹...(羞)",
|
||||
"你这个大变态,咱才不要",
|
||||
"可爱吗?你喜欢的话,摸一下……也可以哦"
|
||||
],
|
||||
"ghs": [
|
||||
"是的呢(点头点头)"
|
||||
],
|
||||
"批": [
|
||||
"你在说什么呀,再这样,咱就不理你了!"
|
||||
],
|
||||
"kkp": [
|
||||
"你在说什么呀,再这样,咱就不理你了!"
|
||||
],
|
||||
"咕": [
|
||||
"咕咕咕是要被当成鸽子炖的哦(:з」∠)_",
|
||||
"咕咕咕"
|
||||
],
|
||||
"骚": [
|
||||
"说这种话咱会生气的"
|
||||
],
|
||||
"喜欢": [
|
||||
"最喜欢你了,需要暖床吗?",
|
||||
"当然是你啦",
|
||||
"咱也是,非常喜欢你~",
|
||||
"那么大!(张开手画圆),丫!手不够长。QAQ 咱真的最喜欢你了~",
|
||||
"不可以哦,只可以喜欢咱一个人",
|
||||
"突然说这种事...",
|
||||
"喜欢⁄(⁄⁄•⁄ω⁄•⁄⁄)⁄咱最喜欢你了",
|
||||
"咱也喜欢你哦",
|
||||
"好啦好啦,咱知道了",
|
||||
"有人喜欢咱,咱觉得很幸福",
|
||||
"诶嘿嘿,好高兴"
|
||||
],
|
||||
"suki": [
|
||||
"最喜欢你了,需要暖床吗?",
|
||||
"当然是你啦",
|
||||
"咱也是,非常喜欢你~",
|
||||
"那么大!(张开手画圆),丫!手不够长。QAQ 咱真的最喜欢你了~",
|
||||
"不可以哦,只可以喜欢咱一个人",
|
||||
"突然说这种事...",
|
||||
"喜欢⁄(⁄⁄•⁄ω⁄•⁄⁄)⁄咱最喜欢你了",
|
||||
"咱也喜欢你哦",
|
||||
"好啦好啦,咱知道了",
|
||||
"有人喜欢咱,咱觉得很幸福",
|
||||
"诶嘿嘿,好高兴"
|
||||
],
|
||||
"好き": [
|
||||
"最喜欢你了,需要暖床吗?",
|
||||
"当然是你啦",
|
||||
"咱也是,非常喜欢你~",
|
||||
"那么大!(张开手画圆),丫!手不够长。QAQ 咱真的最喜欢你了~",
|
||||
"不可以哦,只可以喜欢咱一个人",
|
||||
"突然说这种事...",
|
||||
"喜欢⁄(⁄⁄•⁄ω⁄•⁄⁄)⁄咱最喜欢你了",
|
||||
"咱也喜欢你哦",
|
||||
"好啦好啦,咱知道了",
|
||||
"有人喜欢咱,咱觉得很幸福",
|
||||
"诶嘿嘿,好高兴"
|
||||
],
|
||||
"不能": [
|
||||
"虽然很遗憾,那算了吧。"
|
||||
],
|
||||
"砸了": [
|
||||
"不可以这么粗暴的对待它们!"
|
||||
],
|
||||
"透": [
|
||||
"来啊来啊有本事就先插破屏幕啊",
|
||||
"那你就先捅破屏幕啊baka",
|
||||
"不给你一耳光你都不知道咱的厉害"
|
||||
],
|
||||
"口我": [
|
||||
"再伸过来就帮你切掉",
|
||||
"咱才不呢!baka你居然想叫本小姐干那种事情,哼(つд⊂)(生气)"
|
||||
],
|
||||
"草我": [
|
||||
"这时候应该喊666吧..咱这么思考着..",
|
||||
"!!哼!baka你居然敢叫咱做这种事情?!讨厌讨厌讨厌!(▼皿▼#)"
|
||||
],
|
||||
"自慰": [
|
||||
"这个世界的人类还真是恶心呢。",
|
||||
"咱才不想讨论那些恶心的事情呢。",
|
||||
"咱才不呢!baka你居然想叫本小姐干那种事情,哼(つд⊂)(生气)",
|
||||
"!!哼!baka你居然敢叫咱做这种事情?!讨厌讨厌讨厌!(▼皿▼#)"
|
||||
],
|
||||
"onani": [
|
||||
"这个世界的人类还真是恶心呢。",
|
||||
"咱才不想讨论那些恶心的事情呢。",
|
||||
"咱才不呢!baka你居然想叫本小姐干那种事情,哼(つд⊂)(生气)",
|
||||
"!!哼!baka你居然敢叫咱做这种事情?!讨厌讨厌讨厌!(▼皿▼#)"
|
||||
],
|
||||
"オナニー": [
|
||||
"这个世界的人类还真是恶心呢。",
|
||||
"咱才不想讨论那些恶心的事情呢。",
|
||||
"咱才不呢!baka你居然想叫本小姐干那种事情,哼(つд⊂)(生气)",
|
||||
"!!哼!baka你居然敢叫咱做这种事情?!讨厌讨厌讨厌!(▼皿▼#)"
|
||||
],
|
||||
"炸了": [
|
||||
"你才炸了!",
|
||||
"才没有呢",
|
||||
"咱好好的呀"
|
||||
],
|
||||
"色图": [
|
||||
"天天色图色图的,今天就把你变成色图!",
|
||||
"咱没有色图",
|
||||
"哈?你的脑子一天都在想些什么呢,咱才没有这种东西啦。"
|
||||
],
|
||||
"涩图": [
|
||||
"天天色图色图的,今天就把你变成色图!",
|
||||
"咱没有色图",
|
||||
"哈?你的脑子一天都在想些什么呢,咱才没有这种东西啦。"
|
||||
],
|
||||
"告白": [
|
||||
"欸?你要向咱告白吗..好害羞..",
|
||||
"诶!?这么突然!?人家还......还没做好心理准备呢(脸红)"
|
||||
],
|
||||
"对不起": [
|
||||
"嗯,咱已经原谅你了呢(笑)",
|
||||
"道歉的时候要露出胸部,这是常识"
|
||||
],
|
||||
"回来": [
|
||||
"欢迎回来~",
|
||||
"欢迎回来,你想喝茶吗?咱去给你沏~",
|
||||
"欢迎回来,咱等你很久了~",
|
||||
"你回来啦,是先吃饭呢还是先洗澡呢或者是●先●吃●咱●——呢(///^.^///)"
|
||||
],
|
||||
"吻": [
|
||||
"你太突然了,咱还没有心理准备",
|
||||
"公共场合不要这样子了啦",
|
||||
"才...才没有感觉呢!可没有下次了,知道了吗!哼~"
|
||||
],
|
||||
"软": [
|
||||
"软乎乎的呢(,,・ω・,,)"
|
||||
],
|
||||
"柔软": [
|
||||
"(脸红)请,请不要说这么让人害羞的话呀……"
|
||||
],
|
||||
"壁咚": [
|
||||
"呀!不要啊!等一...下~",
|
||||
"呜...不要啦!不要戏弄咱~",
|
||||
"不要这样子啦(*/ω\*)",
|
||||
"太....太近啦。",
|
||||
"你要壁咚咱吗?好害羞(灬ꈍ εꈍ灬)",
|
||||
"为什么要把咱按在墙上呢?",
|
||||
"呜哇(/ω\)…快…快放开咱!!",
|
||||
"放开我,不然我揍你了!放开我!放…开我~",
|
||||
"??????咱只是默默地抬起了膝盖",
|
||||
"啊.....你...你要干什么?!走开.....走开啦大hentai!一巴掌拍飞!(╯‵□′)╯︵┻━┻"
|
||||
],
|
||||
"掰开": [
|
||||
"噫…你这个死肥宅又想让咱干什么污秽的事情,真是恶心,离咱远点好吗(嫌弃)",
|
||||
"ヽ(#`Д´)ノ在干什么呢"
|
||||
],
|
||||
"女友": [
|
||||
"女友什么的,咱才不承认呢!"
|
||||
],
|
||||
"是": [
|
||||
"是什么是,你个笨蛋",
|
||||
"总感觉你在敷衍呢..."
|
||||
],
|
||||
"喵": [
|
||||
"诶~~小猫咪不要害怕呦,在姐姐怀里乖乖的,姐姐带你回去哦。",
|
||||
"不要这么卖萌啦~咱也不知道怎么办丫",
|
||||
"摸头⊙ω⊙",
|
||||
"汪汪汪!",
|
||||
"嗷~喵~",
|
||||
"喵~?喵呜~w"
|
||||
],
|
||||
"嗷呜": [
|
||||
"嗷呜嗷呜嗷呜...恶龙咆哮┗|`O′|┛"
|
||||
],
|
||||
"叫": [
|
||||
"喵呜~",
|
||||
"嗷呜嗷呜嗷呜...恶龙咆哮┗|`O′|┛"
|
||||
],
|
||||
"拜": [
|
||||
"拜拜~(ノ ̄▽ ̄)",
|
||||
"拜拜,路上小心~要早点回来陪咱玩哦~",
|
||||
"~\\(≧▽≦)/~拜拜,下次见喽!"
|
||||
],
|
||||
"佬": [
|
||||
"不是巨佬,是萌新"
|
||||
],
|
||||
"awsl": [
|
||||
"你别死啊!(抱住使劲晃)",
|
||||
"你别死啊!咱又要孤单一个人了QAQ"
|
||||
],
|
||||
"臭": [
|
||||
"哪里有臭味?(疑惑)",
|
||||
"快捏住鼻子"
|
||||
],
|
||||
"香": [
|
||||
"咱闻不到呢⊙ω⊙"
|
||||
],
|
||||
"腿": [
|
||||
"嗯?!不要啊...请停下来!",
|
||||
"不给摸,再这样咱要生气了ヽ( ̄д ̄;)ノ",
|
||||
"你好恶心啊,讨厌!",
|
||||
"你难道是足控?",
|
||||
"就让你摸一会哟~(。??ω??。)…",
|
||||
"呜哇!好害羞...不过既然是你的话,是没关系的哦",
|
||||
"不可以玩咱的大腿啦",
|
||||
"你就那么喜欢大腿吗?唔...有点害羞呢......"
|
||||
],
|
||||
"脚": [
|
||||
"咿呀……不要……",
|
||||
"不要ヽ(≧Д≦)ノ好痒(ಡωಡ),人家的丝袜都要漏了",
|
||||
"不要ヽ(≧Д≦)ノ好痒(ಡωಡ)",
|
||||
"好痒(把脚伸出去)"
|
||||
],
|
||||
"胸": [
|
||||
"不要啦ヽ(≧Д≦)ノ",
|
||||
"(-`ェ´-╬)",
|
||||
"(•̀へ •́ ╮ ) 怎么能对咱做这种事情",
|
||||
"你好恶心啊,讨厌!",
|
||||
"你的眼睛在看哪里!",
|
||||
"就让你摸一会哟~(。??ω??。)…",
|
||||
"请不要这样先生,你想剁手吗?"
|
||||
],
|
||||
"脸": [
|
||||
"唔!不可以随便摸咱的脸啦!",
|
||||
"非洲血统是没法改变的呢(笑)",
|
||||
"啊姆!(含手指)",
|
||||
"好舒服呢(脸红)",
|
||||
"请不要放开手啦//A//"
|
||||
],
|
||||
"头发": [
|
||||
"没问题,请尽情的摸吧",
|
||||
"发型要乱…乱了啦(脸红)",
|
||||
"就让你摸一会哟~(。??ω??。)…"
|
||||
],
|
||||
"手": [
|
||||
"爪爪",
|
||||
"//A//"
|
||||
],
|
||||
"pr": [
|
||||
"咿呀……不要……",
|
||||
"...变态!!",
|
||||
"不要啊(脸红)",
|
||||
"呀,不要太过分了啊~",
|
||||
"当然可以(///)",
|
||||
"呀,不要太过分了啊~"
|
||||
],
|
||||
"舔": [
|
||||
"呀,不要太过分了啊~",
|
||||
"要...要融化了啦>╱╱╱<",
|
||||
"不可以哦",
|
||||
"呀,不要太过分了啊~"
|
||||
],
|
||||
"舔耳": [
|
||||
"喵!好痒啊 不要这样子啦"
|
||||
],
|
||||
"穴": [
|
||||
"你这么问很失礼呢!咱是粉粉嫩嫩的!",
|
||||
"不行那里不可以(´///ω/// `)",
|
||||
"不可以总摸的哦,不然的话,咱会想那个的wwww",
|
||||
"ヽ(#`Д´)ノ在干什么呢"
|
||||
],
|
||||
"腰": [
|
||||
"咱给你按摩一下吧~",
|
||||
"快松手,咱好害羞呀..",
|
||||
"咱又不是猫,你不要搂着咱啦",
|
||||
"让咱来帮你捏捏吧!"
|
||||
],
|
||||
"诶嘿嘿": [
|
||||
"又在想什么H的事呢(脸红)",
|
||||
"诶嘿嘿(〃'▽'〃)",
|
||||
"你傻笑什么呢,摸摸"
|
||||
],
|
||||
"可爱": [
|
||||
"诶嘿嘿(〃'▽'〃)",
|
||||
"才……才不是为了你呢!你不要多想哦!",
|
||||
"才,才没有高兴呢!哼~",
|
||||
"咱是世界上最可爱的",
|
||||
"唔...谢谢你夸奖~0///0"
|
||||
],
|
||||
"扭蛋": [
|
||||
"铛铛铛——你抽到了咱呢",
|
||||
"嘿~恭喜抽中空气一份呢"
|
||||
],
|
||||
"鼻子": [
|
||||
"啊——唔...没什么...阿嚏!ヽ(*。>Д<)o゜"
|
||||
],
|
||||
"眼睛": [
|
||||
"就如同咱的眼睛一样,能看透人的思想哦wwww忽闪忽闪的,诶嘿嘿~"
|
||||
],
|
||||
"色气": [
|
||||
"咱才不色气呢,一定是你看错了!"
|
||||
],
|
||||
"推": [
|
||||
"逆推",
|
||||
"唔~好害羞呢",
|
||||
"你想对咱做什么呢...(捂脸)"
|
||||
],
|
||||
"床": [
|
||||
"快来吧",
|
||||
"男女不同床,可没有下次了。(鼓脸",
|
||||
"嗯?咱吗…没办法呢。只有这一次哦……",
|
||||
"哎?!!!给你暖床……也不是不行啦。(脸红)"
|
||||
],
|
||||
"手冲": [
|
||||
"手冲什么的是不可以的哦"
|
||||
],
|
||||
"饿": [
|
||||
"请问主人是想先吃饭,还是先吃我喵?~"
|
||||
],
|
||||
"变": [
|
||||
"猫猫不会变呐(弱气,害羞",
|
||||
"呜...呜姆...喵喵来报恩了喵...(害羞"
|
||||
],
|
||||
"敲": [
|
||||
"喵呜~",
|
||||
"唔~",
|
||||
"脑瓜疼~呜姆> <",
|
||||
"欸喵,好痛的说..."
|
||||
],
|
||||
"爬": [
|
||||
"惹~呜~怎么爬呢~",
|
||||
"呜...(弱弱爬走"
|
||||
],
|
||||
"怕": [
|
||||
"不怕~(蹭蹭你姆~"
|
||||
],
|
||||
"冲": [
|
||||
"呜,冲不动惹~",
|
||||
"哭唧唧~冲不出来了惹~"
|
||||
],
|
||||
"射了": [
|
||||
"呜咿~!?(惊,害羞",
|
||||
"还不可以射哦~"
|
||||
],
|
||||
"不穿衣服": [
|
||||
"呜姆~!(惊吓,害羞)变...变态喵~~~!"
|
||||
],
|
||||
"迫害": [
|
||||
"不...不要...不要...呜呜呜...(害怕,抽泣"
|
||||
],
|
||||
"猫粮": [
|
||||
"呜咿姆~!?(惊,接住吃",
|
||||
"呜姆~!(惊,害羞)呜...谢...谢谢主人..喵...(脸红,嚼嚼嚼,开心",
|
||||
"呜?谢谢喵~~(嚼嚼嚼,嘎嘣脆)"
|
||||
],
|
||||
"揪尾巴": [
|
||||
"呜哇咿~~~!(惊吓,疼痛地捂住尾巴",
|
||||
"呜咿咿咿~~~!!哇啊咿~~~!(惊慌,惨叫,挣扎",
|
||||
"呜咿...(瘫倒,无神,被",
|
||||
"呜姆咿~~~!(惊吓,惨叫,捂尾巴,发抖",
|
||||
"呜哇咿~~~!!!(惊吓,颤抖,娇叫,捂住尾巴,双腿发抖"
|
||||
],
|
||||
"薄荷": [
|
||||
"咪呜~!喵~...喵~姆~...(高兴地嗅闻",
|
||||
"呜...呜咿~~!咿...姆...(呜咽,渐渐瘫软,意识模糊",
|
||||
"(小嘴被猫薄荷塞满了,呜咽",
|
||||
"喵~...喵~...咪...咪呜姆~...嘶哈嘶哈...喵哈...喵哈...嘶哈...喵...(眼睛逐渐迷离,瘫软在地上,嘴角流口水,吸猫薄荷吸到意识模糊",
|
||||
"呜姆咪~!?(惊)喵呜~!(兴奋地扑到猫薄荷上面",
|
||||
"呜姆~!(惊,害羞)呜...谢...谢谢你..喵...(脸红,轻轻叼住,嚼嚼嚼,开心"
|
||||
],
|
||||
"边揪尾巴边猫薄荷": [
|
||||
"呜...呜咿~~!咿...姆...(呜咽,渐渐瘫软,意识模糊"
|
||||
],
|
||||
"早": [
|
||||
"早喵~",
|
||||
"早上好的说~~",
|
||||
"欸..早..早上好(揉眼睛"
|
||||
],
|
||||
"晚安": [
|
||||
"晚安好梦哟~",
|
||||
"欸,晚安的说"
|
||||
],
|
||||
"揉": [
|
||||
"是是,想怎么揉就怎么揉啊!?来用力抓啊!?我就是特别允许你这么做了!请!?",
|
||||
"快停下,咱的头发又乱啦(??????︿??????)",
|
||||
"你快放手啦,咱还在工作呢",
|
||||
"戳戳你肚子",
|
||||
"你想揉就揉吧..就这一次哦?"
|
||||
],
|
||||
"榨": [
|
||||
"是专门负责榨果汁的小姐姐嘛?(´・ω・`)",
|
||||
"那咱就把你放进榨汁机里了哦?",
|
||||
"咱又不是榨汁姬(/‵Д′)/~ ╧╧"
|
||||
],
|
||||
"掐": [
|
||||
"你讨厌!又掐澪的脸",
|
||||
"晃休啦,咱要型气了啦!!o(>﹏<)o",
|
||||
"(一只手拎起你)这么鶸还想和咱抗衡,还差得远呢!"
|
||||
],
|
||||
"奶子": [
|
||||
"下流!",
|
||||
"对咱说这种话,你真是太过分了",
|
||||
"咿呀~好奇怪的感觉(>_<)",
|
||||
"(打你)快放手,不可以随便摸人家的胸部啦!"
|
||||
],
|
||||
"嫩": [
|
||||
"很可爱吧(๑•̀ω•́)ノ",
|
||||
"唔,你指的是什么呀"
|
||||
],
|
||||
"蹭蹭": [
|
||||
"(按住你的头)好痒呀 不要啦",
|
||||
"嗯..好舒服呢",
|
||||
"呀~好痒啊~哈哈~,停下来啦,哈哈哈",
|
||||
"(害羞)"
|
||||
],
|
||||
"牵手": [
|
||||
"只许牵一下哦",
|
||||
"嗯!好的你~(伸手)",
|
||||
"你的手有些凉呢,让澪来暖一暖吧。"
|
||||
],
|
||||
"握手": [
|
||||
"你的手真暖和呢",
|
||||
"举爪"
|
||||
],
|
||||
"拍照": [
|
||||
"那就拜托你啦~请把咱拍得更可爱一些吧w"
|
||||
],
|
||||
"w": [
|
||||
"www"
|
||||
],
|
||||
"www": [
|
||||
"有什么好笑的吗?",
|
||||
"草"
|
||||
],
|
||||
"太二了": [
|
||||
"哼,你不也是吗`(*>﹏<*)′",
|
||||
"人家只是想和你一起玩耍的说(≧∀≦)ゞ",
|
||||
"好..冷漠的说,大坏蛋再也不理你了!",
|
||||
"不听不听不听,反弹ヾ(≧▽≦*)o"
|
||||
]
|
||||
}
|
||||
67
docker-compose-dev.yml
Normal file
@ -0,0 +1,67 @@
|
||||
services:
|
||||
db:
|
||||
image: postgres:15
|
||||
ports:
|
||||
- "5432:5432"
|
||||
environment:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: password
|
||||
POSTGRES_DB: zhenxun
|
||||
volumes:
|
||||
- pgdata:/var/lib/postgresql/data
|
||||
labels:
|
||||
- "prometheus.io/scrape=true"
|
||||
- "prometheus.io/port=9187"
|
||||
|
||||
postgres-exporter:
|
||||
image: prometheuscommunity/postgres-exporter
|
||||
environment:
|
||||
DATA_SOURCE_NAME: "postgresql://postgres:password@db:5432/zhenxun?sslmode=disable"
|
||||
ports:
|
||||
- "9187:9187"
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
redis:
|
||||
image: redis:7
|
||||
ports:
|
||||
- "6379:6379"
|
||||
labels:
|
||||
- "prometheus.io/scrape=true"
|
||||
- "prometheus.io/port=9121"
|
||||
|
||||
redis-exporter:
|
||||
image: oliver006/redis_exporter
|
||||
environment:
|
||||
REDIS_ADDR: redis://redis:6379
|
||||
ports:
|
||||
- "9121:9121"
|
||||
depends_on:
|
||||
- redis
|
||||
|
||||
prometheus:
|
||||
image: prom/prometheus
|
||||
ports:
|
||||
- "9090:9090"
|
||||
volumes:
|
||||
- ./prometheus.yml:/etc/prometheus/prometheus.yml
|
||||
- prometheus_data:/prometheus
|
||||
command:
|
||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||
- '--storage.tsdb.path=/prometheus'
|
||||
- '--web.console.libraries=/etc/prometheus/console_libraries'
|
||||
- '--web.console.templates=/etc/prometheus/consoles'
|
||||
|
||||
grafana:
|
||||
image: grafana/grafana
|
||||
ports:
|
||||
- "3000:3000"
|
||||
volumes:
|
||||
- grafana_data:/var/lib/grafana
|
||||
depends_on:
|
||||
- prometheus
|
||||
|
||||
volumes:
|
||||
pgdata:
|
||||
prometheus_data:
|
||||
grafana_data:
|
||||
BIN
docs/ban.png
|
Before Width: | Height: | Size: 103 KiB |
BIN
docs/beidong.png
|
Before Width: | Height: | Size: 39 KiB |
BIN
docs/buff.png
|
Before Width: | Height: | Size: 49 KiB |
BIN
docs/check.png
|
Before Width: | Height: | Size: 34 KiB |
BIN
docs/coser.png
|
Before Width: | Height: | Size: 186 KiB |
BIN
docs/daoju.png
|
Before Width: | Height: | Size: 79 KiB |
BIN
docs/epic.png
|
Before Width: | Height: | Size: 206 KiB |
BIN
docs/fanyi.png
|
Before Width: | Height: | Size: 71 KiB |
BIN
docs/guanli.png
|
Before Width: | Height: | Size: 37 KiB |
BIN
docs/help.PNG
|
Before Width: | Height: | Size: 697 KiB |
BIN
docs/huifu.png
|
Before Width: | Height: | Size: 23 KiB |
BIN
docs/info.png
|
Before Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 251 KiB |
BIN
docs/jieshao.png
|
Before Width: | Height: | Size: 132 KiB |
BIN
docs/jitang.png
|
Before Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 137 KiB |
BIN
docs/kg1.png
|
Before Width: | Height: | Size: 9.6 KiB |
BIN
docs/kg2.png
|
Before Width: | Height: | Size: 9.0 KiB |
BIN
docs/kg3.png
|
Before Width: | Height: | Size: 18 KiB |
BIN
docs/luxun.png
|
Before Width: | Height: | Size: 179 KiB |
BIN
docs/mawo.png
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 38 KiB |
BIN
docs/ocgn.png
|
Before Width: | Height: | Size: 14 KiB |
BIN
docs/ocgn2.png
|
Before Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 42 KiB |
BIN
docs/p_rank.png
|
Before Width: | Height: | Size: 64 KiB |
BIN
docs/p_sou.png
|
Before Width: | Height: | Size: 66 KiB |
BIN
docs/qhyxx.png
|
Before Width: | Height: | Size: 289 KiB |
|
Before Width: | Height: | Size: 424 KiB |
BIN
docs/redbag0.png
|
Before Width: | Height: | Size: 201 KiB |
BIN
docs/redbag1.png
|
Before Width: | Height: | Size: 202 KiB |
BIN
docs/redbag2.png
|
Before Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 330 KiB |
BIN
docs/shifan.png
|
Before Width: | Height: | Size: 341 KiB |
BIN
docs/shitu.png
|
Before Width: | Height: | Size: 220 KiB |
BIN
docs/shop.png
|
Before Width: | Height: | Size: 60 KiB |
BIN
docs/sign.png
|
Before Width: | Height: | Size: 77 KiB |
BIN
docs/tupian.png
|
Before Width: | Height: | Size: 46 KiB |
BIN
docs/w2b.png
|
Before Width: | Height: | Size: 127 KiB |
BIN
docs/zhenxun.jpg
|
Before Width: | Height: | Size: 100 KiB |
BIN
docs_image/afd.jpg
Normal file
|
After Width: | Height: | Size: 84 KiB |
BIN
docs_image/help.png
Normal file
|
After Width: | Height: | Size: 799 KiB |
BIN
docs_image/html_help.png
Normal file
|
After Width: | Height: | Size: 2.3 MiB |
BIN
docs_image/logo.png
Normal file
|
After Width: | Height: | Size: 694 KiB |
BIN
docs_image/pc-about.jpg
Normal file
|
After Width: | Height: | Size: 388 KiB |
BIN
docs_image/pc-api.jpg
Normal file
|
After Width: | Height: | Size: 315 KiB |
BIN
docs_image/pc-command.jpg
Normal file
|
After Width: | Height: | Size: 630 KiB |
BIN
docs_image/pc-dashboard.jpg
Normal file
|
After Width: | Height: | Size: 708 KiB |
BIN
docs_image/pc-dashboard1.jpg
Normal file
|
After Width: | Height: | Size: 598 KiB |
BIN
docs_image/pc-database.jpg
Normal file
|
After Width: | Height: | Size: 405 KiB |
BIN
docs_image/pc-login.jpg
Normal file
|
After Width: | Height: | Size: 250 KiB |
BIN
docs_image/pc-manage.jpg
Normal file
|
After Width: | Height: | Size: 504 KiB |
BIN
docs_image/pc-manage1.jpg
Normal file
|
After Width: | Height: | Size: 423 KiB |
BIN
docs_image/pc-plugin.jpg
Normal file
|
After Width: | Height: | Size: 551 KiB |
BIN
docs_image/pc-plugin1.jpg
Normal file
|
After Width: | Height: | Size: 453 KiB |
BIN
docs_image/pc-store.jpg
Normal file
|
After Width: | Height: | Size: 400 KiB |
BIN
docs_image/pc-system.jpg
Normal file
|
After Width: | Height: | Size: 336 KiB |
BIN
docs_image/pc-system1.jpg
Normal file
|
After Width: | Height: | Size: 152 KiB |
BIN
docs_image/pc-system2.jpg
Normal file
|
After Width: | Height: | Size: 1.1 MiB |
BIN
docs_image/tt.jpg
Normal file
|
After Width: | Height: | Size: 188 KiB |