From f0087cf1cf52e7eaf11f3dc561009d0fad964d74 Mon Sep 17 00:00:00 2001 From: marlon-erler Date: Wed, 23 Sep 2026 00:39:51 +0200 Subject: [PATCH] do not show namespaces in marquee --- dist/index.js | 59 +++++++++--------- src/Model/Chat/.chatModel.ts.swp | Bin 28672 -> 0 bytes src/ViewModel/Chat/.chatListViewModel.ts.swp | Bin 0 -> 16384 bytes src/ViewModel/Chat/chatListViewModel.ts | 10 +++ .../Global/.notificationViewModel.ts.swp | Bin 0 -> 12288 bytes src/ViewModel/Global/notificationViewModel.ts | 13 ++-- 6 files changed, 45 insertions(+), 37 deletions(-) delete mode 100644 src/Model/Chat/.chatModel.ts.swp create mode 100644 src/ViewModel/Chat/.chatListViewModel.ts.swp create mode 100644 src/ViewModel/Global/.notificationViewModel.ts.swp diff --git a/dist/index.js b/dist/index.js index 39f6bab3..1d8ea4ed 100644 --- a/dist/index.js +++ b/dist/index.js @@ -5596,6 +5596,19 @@ ); } + // src/View/Components/deletableListItem.tsx + function DeletableListItem(coreViewModel2, text, primaryButton, ondelete) { + return /* @__PURE__ */ createElement("div", { class: "tile flex-row justify-apart align-center padding-0" }, /* @__PURE__ */ createElement("span", { class: "padding-h ellipsis" }, text), /* @__PURE__ */ createElement("div", { class: "flex-row justify-end" }, primaryButton, /* @__PURE__ */ createElement( + "button", + { + class: "danger", + "aria-label": coreViewModel2.translations.general.deleteItemButtonAudioLabel, + "on:click": ondelete + }, + /* @__PURE__ */ createElement("span", { class: "icon" }, "delete") + ))); + } + // src/View/Modals/searchModal.tsx function SearchModal(coreViewModel2, searchViewModel, headline, isOpen) { function close() { @@ -5670,24 +5683,21 @@ function applySuggestion() { searchViewModel.search(suggestion); } - return /* @__PURE__ */ createElement("div", { class: "flex-row surface align-center" }, /* @__PURE__ */ createElement("span", { class: "width-100 flex-1 padding-h" }, suggestion), /* @__PURE__ */ createElement( - "button", - { - class: "danger", - "aria-label": coreViewModel2.translations.general.deleteButton, - "on:click": deleteSuggestion - }, - /* @__PURE__ */ createElement("span", { class: "icon" }, "delete") - ), /* @__PURE__ */ createElement( - "button", - { - class: "primary", - "aria-label": coreViewModel2.translations.general.applyButton, - "on:click": applySuggestion, - "toggle:disabled": isApplied - }, - /* @__PURE__ */ createElement("span", { class: "icon" }, "check") - )); + return DeletableListItem( + coreViewModel2, + suggestion, + /* @__PURE__ */ createElement( + "button", + { + class: "primary", + "aria-label": coreViewModel2.translations.general.applyButton, + "on:click": applySuggestion, + "toggle:disabled": isApplied + }, + /* @__PURE__ */ createElement("span", { class: "icon" }, "check") + ), + deleteSuggestion + ); } // src/View/Components/colorPicker.tsx @@ -5982,19 +5992,6 @@ ); } - // src/View/Components/deletableListItem.tsx - function DeletableListItem(coreViewModel2, text, primaryButton, ondelete) { - return /* @__PURE__ */ createElement("div", { class: "tile flex-row justify-apart align-center padding-0" }, /* @__PURE__ */ createElement("span", { class: "padding-h ellipsis" }, text), /* @__PURE__ */ createElement("div", { class: "flex-row justify-end" }, primaryButton, /* @__PURE__ */ createElement( - "button", - { - class: "danger", - "aria-label": coreViewModel2.translations.general.deleteItemButtonAudioLabel, - "on:click": ondelete - }, - /* @__PURE__ */ createElement("span", { class: "icon" }, "delete") - ))); - } - // src/View/ChatPages/settingsPage.tsx function SettingsPage(coreViewModel2, settingsPageViewModel) { settingsPageViewModel.loadData(); diff --git a/src/Model/Chat/.chatModel.ts.swp b/src/Model/Chat/.chatModel.ts.swp deleted file mode 100644 index da4d6d14c288c62e2cbbad71b2a4811df2c3bf6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 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 diff --git a/src/ViewModel/Chat/.chatListViewModel.ts.swp b/src/ViewModel/Chat/.chatListViewModel.ts.swp new file mode 100644 index 0000000000000000000000000000000000000000..a06ecfa15f2e69856af1625775aba4e67caf9078 GIT binary patch literal 16384 zcmeHNOOM<{5N;A)3kl&RKuUmS0@5r2I|&Gp-E25a5DChLJd|8Q4qi{stck}S?4HRE z$p$H)@CQ&hfVgppgv0@m2!DWw1O$ON06zf20VFseAtAo%_S+7-5*I*i?YCpMtE#KN zs(!fbg{?>T&hs7CR)*td#x|{e_qnt8+|6#;!&u*wRJ!8fhpyuWP!{VORKeXVHGHFz~-*Kn~Zi7tyjcN$dRN z_o~Y8+T{AW z3*d9$RiFzT2c88u@a6T4y$QSqoCgj9Hn0Ks9UB^718)Q8010@&0^k5o0KZ(z*gL>E z;50A-B(MnBz@OKke&A!^Bj5sX8W;f*SOlI19soYOnz1*4KClzm4%`l`2i5@$_!*lm z7lBj24qzMb6XJ6jxCDF(d;)w3oCPR$zhcAYk95-}&$B6x!wrL2^4`ez4~d?Ln#x4r z3O>i_tBZM3nd*fRZ)?TzfQLGeFHxv8?>4_k|Nteo^IF!l5s< zr)T&$^tz>NC4pw1W8ouhgvwXlIbdTHbVbh#L|2=4{V-O1)y%8ftD$SmaVtLI4floN zF!h=IRt;f^vp%-AuC2EQ6eAcplb5YoR(M( zqez2PV}KjvY9mTnhGhO2xONCTWprp?IwsJM^jC z#wKLG{qq`2`C05lilVHdMmH!9bZ9nLIbN@7tY*q?Y8ulnrNM#78#vJfr!?_r!(gkG zPfDa#2=i*KpKKAmn1$#fPkPU1&vnn(|(G z^|wsS@m4Eu$+0Ud9M@7VcnoDHiyQnpBpg>-+SLP5xHLH|F$rf2f&R#e8XU|fB5k)g zRm>zNm7SgC&U`wb!FHi;T3qS+wXhRRcC|Gb<<6bjq?x(FZrN5Ql;(CLg{etxjuxCj zzida{X}4NQToA69sHp{uVpnq4O2^j&m_)LX!5TIsa~`~McdHH~NC!ssAacpF61}51 zRV8c|i^|-CSTcZCVEyLkMl{YBGtKMWStgc-VI(Jt4q(K*G7P2kH7sz>w+-%eKgx$cA9iFH1ew7{7w zbE!^!?VXE1<%bK7Z#PW0MFWKub%Sc*ZmzVy=^3J?+!&DDNNw3)GmvIpmUX!@F`gBt ziYf$IDTHY`%J6*uC_vBuc-&RTTev;~90F($U?=bxpyU!6^J5q=3>XFs1BL;^fMLKe zU>GnA7zPXjhJpVE1NzOwGMh^FvwJHS;Jsu`D1TRp*NjszM>{WGkE^$s>Yb~8zdEO0 z!s5Z4b~mT7xuZ7G$Af&w+46#3SlKz6)%NuEWA+v|d1G5w4zky%TX_9$c~feZ{RPLL BD3<^L literal 0 HcmV?d00001 diff --git a/src/ViewModel/Chat/chatListViewModel.ts b/src/ViewModel/Chat/chatListViewModel.ts index cf62d219..4617b37f 100644 --- a/src/ViewModel/Chat/chatListViewModel.ts +++ b/src/ViewModel/Chat/chatListViewModel.ts @@ -102,4 +102,14 @@ export default class ChatListViewModel { this.loadChats(); } + + // utility + stripNamespace = (fullChannel: string): string => { + for (const vm of this.chatViewModels.value) { + const fullReference = vm.chatModel.info.namespace + vm.chatModel.info.primaryChannel; + if (fullReference == fullChannel) return vm.chatModel.info.primaryChannel; + } + + return fullChannel; + } } diff --git a/src/ViewModel/Global/.notificationViewModel.ts.swp b/src/ViewModel/Global/.notificationViewModel.ts.swp new file mode 100644 index 0000000000000000000000000000000000000000..80eeaeddd65dc471bfccb21aa8f9c6b017a83c9f GIT binary patch literal 12288 zcmeI2&x;&I6vr#ZU(u{T5)cfiwHsJxLhKnMLfp-4FbOdO*(91DmnDbZnVOx}p6;=$ zI=f3;69`^J#UFT#m*82!KR`SMLBXq@^ri>#Og!_3W;*0X-7^wJoyBB^aNu|fuh#2M;Lefupi5D)^EaLL#jCO zmqg>jvH4@|#?g2%kPVr18W#ewJRf&O*mx<77yYmi#VY6p9bW};RNVBG92<@^a0)mD zMiod^@0o)W?70Ka>ZQJSYLf5Xb$-;!T{{Jw0!{&^fK$LJ;1qBQI0c*n|6>Kza2vaV z`Q4SxG01*y8~K@Cx*tvfr+`zyDc}@v3OEIv0!{&^fK$LJ;1qBQ{09~AyNn&dAOC-D zNAURn|NQU&uODXYJ@#o`TmgNs7wiUq>|pG3@F{p3q~JI> z4CcTA@D%vdJ7rjF`)<|W9okg| z{2P6?>X+uTk?oe+wq&$PQa2Kk^MQ~OpYpW3Wp2dEFisQ?A|;ZZ-x2(j^%W1l%$SM7 zob_}}716JBm}1Kudvvv*=^NQ8ueRL6Tvu(VTBpFg)7#qez7H+1!KG2uHZB^ruap9EO3)tZR8F z7((}6XkIj8bQ0k!VJny0&KO@t_xjAJx+GGg!BZ84jM0UjPm*@<%~frfE`~uzPp&c{ z1lR;EfzBbA@1lW{z(Vd7*!M|LM3+Bf8DfxdVhTh%3pbid zJ_16LLKUOu)1c0DR2(qfgj3Mt)j0X2HM2T5g=c11s5wrgfuFpd3gJP7RKVE&POcQo zcUD2 zHDO&)>$)n&QdV9(6ww*%i#1yJ^vk)`p^#pd2x$pjnA;Q4>eHR|s#{$t3Ock4I++b7 zjg}LCI27G8Nq|CGJ!gDMuOov=;T z!7!Em%9N13ik9~3Cwc3YyPY&iM5OD7v_K*^sHI8|TRxo*>X*5p?tFT>uqU~T3yx!x ztV(Pd9VNQdKg(&}M3rrt%3UYRt{r-16dK9fq()0GWVQ8ps1$YaGwMf2B?>+B7SlJf zlkvUjL)KblW6R9iu8K{C0;;Z!T(VNdG38zOlGPo&@5}sEzze$d>bj8qczLv#vkh+a zz2Q^B*AVr@Po)yXa2yO;ZZtR6bY~F&gGgk>B`Ehji>br_Q z72$W3cUIw@=1?U*%kx~VT5I{ wL4}|%r)F~}`?xQSAeBz2#f~bisCT7;O5?(D<$l@KgjPIt?BI&7#q7}SFE(eCo&W#< literal 0 HcmV?d00001 diff --git a/src/ViewModel/Global/notificationViewModel.ts b/src/ViewModel/Global/notificationViewModel.ts index 0f90e922..5b5594f9 100644 --- a/src/ViewModel/Global/notificationViewModel.ts +++ b/src/ViewModel/Global/notificationViewModel.ts @@ -13,12 +13,11 @@ export default class NotificationViewModel { // main showNotification = (message: ChatMessage): void => { - const notification: Notification = - NotificationViewModel.createNotification(message); if (this.seenMessageIds.has(message.id)) return; - if (this.chatListViewModel.selectedChat.value == undefined) return; + const notification: Notification = + this.createNotification(message); const currentChat = this.chatListViewModel.selectedChat.value.chatModel .unwrappedPrimaryChannel; @@ -83,13 +82,15 @@ export default class NotificationViewModel { }; // init - constructor(public readonly chatListViewModel: ChatListViewModel) {} + constructor(public chatListViewModel: ChatListViewModel) {} // util - static createNotification(message: ChatMessage): Notification { + createNotification(message: ChatMessage): Notification { + const fullChannel = ChatModel.splitChannel(message.channel)[0]; + const chat = this.chatListViewModel.stripNamespace(fullChannel); return { messageId: message.id, - chat: ChatModel.splitChannel(message.channel)[0], + chat, sender: message.sender, body: message.body, };