From 5f25fdc0c10e462cc8e8f6250f8092682cefb09e Mon Sep 17 00:00:00 2001
From: Mark Chan <45706356+WindowsMEMZ@users.noreply.github.com>
Date: Sat, 2 Dec 2023 14:49:48 +0800
Subject: [PATCH] Merge next branch to main (#19)(Rebase from legacy code)

* Fix Crash Issue when Seeing User's Videos in UserDetailsView (#15)

* Update UserDetailView.swift

* Merge main workflows (#16)

* Update status-check.yml

* Update statuscheck-runner.yml

* Update CodeExt.swift

* Update UserDetailView.swift

Fixed optional unwrap issue

* Update status-check.yml

* Update status-check.yml

* Update status-check.yml

* Update status-check.yml

* Update status-check.yml

* Update status-check.yml

* Update UserDetailView.swift

* Add local wbi sign feature (#18)

* Update CodeExt.swift

Added wbi calculation logic

* Update MainView.swift

* Update PersonAccountView.swift

* Update UserDetailView.swift

Might fix the article access issue at the same time.

* Update CodeExt.swift

* Update CodeExt.swift

* Update CodeExt.swift

* Update status-check.yml

* Update status-check.yml

* Update CodeExt.swift
---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 .github/.DS_Store                             | Bin 0 -> 6148 bytes
 .github/workflows/statuscheck-runner.yml      |   1 -
 DarockBili Watch App/.DS_Store                | Bin 8196 -> 10244 bytes
 DarockBili Watch App/Extension/CodeExt.swift  |  53 ------------------
 .../PersonalCenter/UserDetailView.swift       |   1 -
 6 files changed, 55 deletions(-)
 create mode 100644 .github/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 53266d0d819148c5e3413e395f75e65de393a76b..f37c8a4da3ae9c95f13d4d9176d80547b3c47dbe 100644
GIT binary patch
literal 10244
zcmeHNy>AmS6n{=zlH*GqU|>L;#K2b@+E7(OFr*<BLIQ+Hfq{=UX+jd3+=V6~NL8h*
z2qab(5F-NuR@f2$0e=E4Y%DOr&%P_Q?|hJQ2q9`qckgodd$!;2+0V~ziHPO8<w+u&
zh*G$?9Nmtartt6l3YCQa<|HJ8KAmZ}i=~EJ!tc=#+Pp9f7zPXjh5^HXVc=h20Bbfc
zscoJ#cf){Tz%cNG0UjT0TwG>-+4rOf9k_`t0OT-Ui-Kp7`a|0M1!UHjeNW;I3iDJU
zJyqs!F_^z|V4ga@XMKF%lb$*;(K71sTW0<ah4~u~W(zp6tS8OgFkl!6Gr;%m!<42f
z)u|KMzrV!vI{Zx(p_p95QH{D(QqgQL(9fdLrCz(`pAEb&wHozyXJX<#OAHN<Y)K}q
z<hJDXLe1?JI>k=6ohvS1<-g`!w^3SqE|xCWE4}&AU8h{9Q>;6cWuZ_nR{*(orS6p7
zUe4`0<+ji*cpoe)WzCQ7Sy{<UWsZ&6$EK%O$Ly8knTaub>Ud^#)k^K&fAqw~`K3nF
zaqoNlFh9o7jsRZ|@H;?4qdHkwbek;?X?+MInr=St8_r|Y=Nr!386B!T0IF4!TN9x!
zNi(!e9qN$_xfE~;EK*!(Q4Wr7;407(?hdsB8eh@3wB$yOhH5kLL>g3t-CCs9b`4Us
zU$i_zB@9MxQ#ovjV*6IgQxP1wv<TaM9#ow~6?MwiYjqU+6A$k}M~jPKAOfr9K#Nsa
z7!oY((%FV3^a?EQz}_03XQ)Lj)n2?KdLnsy;ClX-={&H(iqj7~eh1<P)|Cgs$HME=
zr*Df8umSz`!SOr#%78iYl#iIbgAN!BoJ({D_c^Li8-pnjFbJ!JGK6B(tZ+;_mgDtP
zW*s%H1>P9_Yr5-x_%k&so}md;O8YkC83&=S6YU+oDl6WJS-a|?Er;UwH^NIX`x)V>
zn6;|jvSECLx5lNwJMINu8pkYh=q8q*Gy*YSf-#%aaLjlD^6PM%rn?B~E|oDOTVg@G
z6{v?V;=fgo;@{Mp=cq>?r8Iqr@Z<*cwX<treZ@Q00=iB^;0VjT$_`)TmBe5Kp5c6k
zk|B`}$UI6&g()`o39U(ABe+lyT5BbQVh?-8?Mc#E^z{_Y(s?9sv#MQuF=soa#XLpl
zFhX3UhT3FD;MI)%0!CAv?uewJ5~!W;24r-KIGT^bF4)tq3xVDQ@G^smn_phQzEGVJ
zJZf-SHbXd>(?nHd?G{}GpEHQM=OEM63?-6$XCw1!RS(yaj~-!0Pl~zhP&L36JfWnK
zL5+5>4Y7*KiRZdTM&E{r>_5{8wIQO5tieZ=DVvu8Z|gudKmVVN{`>#tCCFHA7}x|1
zu;F|mpM#++!dQORZsS_O#S6#vJt<Uh6UXt8;y4~Z_)*tETpTO5HU4wfmwitPbzp=#
t<X`<`06)&tXP26T6FFNUv;SZJFE6wIk8z?P=cE2aiMdBrGtub%|98O^+=u`G

delta 420
zcmZn(XbG6$FRIDFz`)4BAi%(o!BEPOl#^~4oSeV0a2or>2Hwr=94s7+nv*RBCr=I%
z7M;v3?8LOZce1~*3di+3{8=%DM;(D2DWMdXq@4UDph3vO5|j4}^D!z+J||o%05LVU
z0H}n4L4EJ($>)W2CKrhEuuA{u%Zi!YC~6I59Tc@?ys-Jds0Ir&7i$qvndIdClENan
z`7UrPqF!XW9;gS}jF3dwk1okykOA@!)Ml;?lewkcd2&7gUBSxW$&k#DKRHoIdh%>(
z?#V6E28<UbZ<RKh%qy!nIYmZrv%TyIri~3#ST?gO{9*xy!U74G&3zIx8R_RT5dczx
BgD3z1

diff --git a/.github/.DS_Store b/.github/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1b70ac8078e096fb91b25c74c9ea8fee4a5960bc
GIT binary patch
literal 6148
zcmeHK%}xR_5S{|cZiop7P4w2pD^UbOLcFYq2d`rEpaxmNxMAHA7P1FIvUhzUU&PnZ
znYI`Sc=2EinMtPKbUL%$er@^#0HQhR9RU;pz(FO<xLB+ZYA0QijP(!-{f$QmK|uoX
zdAJnKj{nF2&7F%greFjE_%?s)!4H*>t+X^wP!B$|ptUl?PvW7?c=Ly05Rc2{cah2F
zHa7ElH($u#wVzbd9(Tu+xY-@uQ0-Ew(4X5~|0?Jwo#OVXipJd_>W_3n(CcH!?R60K
zRMJ$Fs2A(pwrOx($L$pNrqfETQZ319y*?|+X`@mu$y%c_o4L-;{^9XOXAnL|>P7!N
z2wbdMwk*!!b#5>+1Iz$3u-**VZO|#K_b_>M%m6d+3kGO^kf?;7#nhnQI<TPYBemxU
zNzkSXBcZhDSxgOL3yLtQh$dCoCx$TT=$AImvzQt*=^%8^_#NA`urCy$dq=<2;UGMN
zTrva9z#;=#Q!Uc@fA;hHe=&(`%m6d6Rt$(-tKDkiknGvIG&nkICF(sY3B{!bzf#c9
hM={3IQM`+)1^to?M9*Ss5Irb-5zsVn!3_K<1E0w~R51Vm

literal 0
HcmV?d00001

diff --git a/.github/workflows/statuscheck-runner.yml b/.github/workflows/statuscheck-runner.yml
index f94dbea2c..9a06b1fbe 100644
--- a/.github/workflows/statuscheck-runner.yml
+++ b/.github/workflows/statuscheck-runner.yml
@@ -51,4 +51,3 @@ jobs:
           workflow: status-check.yml
           ref: ${{ needs.get-head-sha.outputs.psha }}
           inputs: '{ "psha": "${{ needs.get-head-sha.outputs.psha }}"}'
-          
diff --git a/DarockBili Watch App/.DS_Store b/DarockBili Watch App/.DS_Store
index 7cf1fc6dd543186ac519153008fb9c010525b62f..872168999c8a46156de74f30569fe25893fc7624 100644
GIT binary patch
literal 10244
zcmeHM&x;&I6n?e8W`;FpiS9u#&>(`yX0zFZz#`)8>;w~u8ZvQ(MBU8nbasc#bdS@s
znV4l^auf6-=snkf;K_rxTypjz{uhF%AfEJlRXuIJ-tL{zgBqzCs$O^1dsXj!uj+MG
z4H2ozUh@o*M?^(rrVCG@$VlAI`B0jQYhDFakSFR>M9XxSwyA!I+f_IO90Cpjhk!%C
zA@E;70N-p*#d$+r=@4)TI0O;|I6ipDOv^DH8mdDF3Vj3sok6uuc*Z$E%Xl#@$8>0@
z7Db=t^q^u<6(2E_5l6en?4aeC4h=Qpq>MPJcw`lyP?R1Wa-L=<RW{U>4grV2VFdW>
zew@~EZjZ<p=l7)MQajvkw8I8Cd2y{HFaNF+p2kYIch1zd!%kQ8p8V;=c!^F}t;XZ=
zqW<}V;4zOmM$1mv{2Nl;T}wMp$ByTzirb4Gg}BAIO%-ZU8~GHTdZ10(K^dStMHhis
z9W_2$mT5PI(^t^h#_5^Ne%Gms-!jl2px;~6m%XTysb1#j0!Cx)dK9I2KRJq5_<`>K
z0AA5o4(chMOpFDOK$L#OFjRuhcQLno;1<Ekkb;!vzoj(KkZ25|Zagc#X>{AIsK2uE
zy_%YynVl;XN`?8t`?cM0Q0v$Gdr_s{yTNbQ!m!;KJ=YtXEq}1J@a#qy^y{s_?`eTn
z(+A6Y@3w+wIH-hsK{L{_HPcWk6-!$S&+YH8o?AV;<efc#{$R=5Ut3*S^3JWT9vqa4
zi!Yph<?7b$b|(ng0Z1zTM$s|zo|K>BDZ@1Bnuiy&xpEwo(O=F|$l#RDdc=y((IvR)
zO-yV|bLpn39kkn1TJTCMs=ucDvi1LXYNz=6hk99yK5WhNc%;r(SmzV;2G!_odW){=
zAhw6a5$H)*rw*1^8?~v$qQlsiRv4S84`Ji<XV)hk+qNAtqmVYym^LPVRaRg%{Q%<F
zZe50F?~pHjOB}9jJQ6-(GtF$;edO4c$mZytv<v;r&TkR=ap<k<uzL@*q5WsBl_P`^
z4#OOPQy$f!(zc+08F33g4&OoAUd3zG=AHw0pLTUHPxs8>DVJB^qh9<LyrM4~qyDwl
zFUh>O#<OwC;}KY?2N;H)rYlBY4yhWk4ZH_B)b^x*_1d*<I8yfi5^Rq&QaWz2GY(MO
zk>7pM9XayIF>J?9DkB|zlO25=j_$#=cQBQG>=ZoO&@MOM)YP7VLz{Zp3T<Pg1r9{7
zjUUfO0^Fl;Hf9_fi^-(~8YV={(>r>%+QW|OBR%muz-3!bcn)X+g&Zkq{ThF=b2xLX
z&gIVBE9G!YEA>ZhmNsD(?=C}W83#IHnZ+rrQJ*iu8mrZ|;Op6B1`Ccqwa(@cnyN<_
zz$J%(L*NNSVA|;H@%{gW{Qv)-K+BxU4grV2qzI^)YOPuU_vqdtEy#E69`a3OPRutn
zREwa{*YTkGIvy{4bN3Q5^R6)Egy(WhhlZjC>EHM>U>)Py=b?$t;$nN{&i}r>p#+|z
agFte=&)M=P?P4?O&i@TySp0|1|9=1l523*T

delta 148
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAsIxI(H$S7!WF7&f$vFZWCqEaQ
zJ-J_a*5pu;1(PjB&rH@8%b)BZzH~C1<f+MgQYR+!NH5uZOWKxEkQrzS5J+$X30IJT
e8w<ZPPv%z%<Y0tY!!S9XXX@m9$wVZ5R*V3Tr6vLZ

diff --git a/DarockBili Watch App/Extension/CodeExt.swift b/DarockBili Watch App/Extension/CodeExt.swift
index bf47115f8..6a2e8ad3a 100644
--- a/DarockBili Watch App/Extension/CodeExt.swift	
+++ b/DarockBili Watch App/Extension/CodeExt.swift	
@@ -211,59 +211,6 @@ func biliWbiSign(paramEncoded: String, completion: @escaping (String?) -> Void)
     }
 }
 
-// AV & BV ID Convert Logic
-fileprivate let XOR_CODE: UInt64 = 23442827791579
-fileprivate let MASK_CODE: UInt64 = 2251799813685247
-fileprivate let MAX_AID: UInt64 = 1 << 51
-
-fileprivate let data: [UInt8] = [70, 99, 119, 65, 80, 78, 75, 84, 77, 117, 103, 51, 71, 86, 53, 76, 106, 55, 69, 74, 110, 72, 112, 87, 115, 120, 52, 116, 98, 56, 104, 97, 89, 101, 118, 105, 113, 66, 122, 54, 114, 107, 67, 121, 49, 50, 109, 85, 83, 68, 81, 88, 57, 82, 100, 111, 90, 102]
-
-fileprivate let BASE: UInt64 = 58
-fileprivate let BV_LEN: Int = 12
-fileprivate let PREFIX: String = "BV1"
-
-func av2bv(avid: UInt64) -> String {
-    var bytes: [UInt8] = [66, 86, 49, 48, 48, 48, 48, 48, 48, 48, 48, 48]
-    var bvIdx = BV_LEN - 1
-    var tmp = (MAX_AID | avid) ^ XOR_CODE
-    
-    while tmp != 0 {
-        bytes[bvIdx] = data[Int(tmp % BASE)]
-        tmp /= BASE
-        bvIdx -= 1
-    }
-    
-    bytes.swapAt(3, 9)
-    bytes.swapAt(4, 7)
-    
-    return String(decoding: bytes, as: UTF8.self)
-}
-
-func bv2av(bvid: String) -> UInt64 {
-    let fixedBvid: String
-    if bvid.hasPrefix("BV") {
-        fixedBvid = bvid
-    } else {
-        fixedBvid = "BV" + bvid
-    }
-    var bvidArray = Array(fixedBvid.utf8)
-    
-    bvidArray.swapAt(3, 9)
-    bvidArray.swapAt(4, 7)
-    
-    let trimmedBvid = String(decoding: bvidArray[3...], as: UTF8.self)
-    
-    var tmp: UInt64 = 0
-    
-    for char in trimmedBvid {
-        if let idx = data.firstIndex(of: char.utf8.first!) {
-            tmp = tmp * BASE + UInt64(idx)
-        }
-    }
-    
-    return (tmp & MASK_CODE) ^ XOR_CODE
-}
-
 postfix operator ++
 postfix operator --
 prefix operator ++
diff --git a/DarockBili Watch App/PersonalCenter/UserDetailView.swift b/DarockBili Watch App/PersonalCenter/UserDetailView.swift
index 6906d2d29..400923b8f 100644
--- a/DarockBili Watch App/PersonalCenter/UserDetailView.swift	
+++ b/DarockBili Watch App/PersonalCenter/UserDetailView.swift	
@@ -560,7 +560,6 @@ struct UserDetailView: View {
         func RefreshVideos() {
             videos = [[String: String]]()
             let headers: HTTPHeaders = [
-                "accept-language": "en,zh-CN;q=0.9,zh;q=0.8",
                 "cookie": "SESSDATA=\(sessdata);",
                 "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15"
             ]