Baked in twemoji to energised.botegirl.parts. This will later become a config option.

PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=thedesk
 _pkgname=TheDesk
-pkgver=24.2.0
+pkgver=24.2.1
 _electronversion=22
 pkgrel=2
 pkgdesc="Mastodon Client for PC, Zergling_man's pleroma-focused fork."

app/js/tl/card.js

@@ -6,7 +6,7 @@ function additional(acct_id, tlid) {
 
 	$('#timeline-container .mention').addClass('parsed')
 
-	$('#timeline-container .hashtag, #timeline-container [rel=tag]').each(function(i, elem) {
+	$('#timeline-container .hashtatwemg, #timeline-container [rel=tag]').each(function(i, elem) {
 		var tags = $(this)
 			.attr('href')
 			.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/tags?\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/)
@@ -233,10 +233,10 @@ function cardHtml(json, acct_id, id) {
 		if (json.html || json.provider_name == 'Twitter') {
 			if(isHad) {
 				var prved = `<img class="emoji" draggable="false" alt="✅" 
-					src="https://twemoji.maxcdn.com/v/12.1.3/72x72/2705.png">`
+					src="https://energised.botegirl.parts/v/12.1.3/72x72/2705.png">`
 				var title = lang.lang_cards_trusted
 			}else{
-				var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/26a0.png">'
+				var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://energised.botegirl.parts/v/12.1.4/72x72/26a0.png">'
 				var title = lang.lang_cards_untrusted
 			}
 			analyze =`<a onclick="cardHtmlShow('${acct_id}','${id}')" class="add-show pointer" title="${title}">

app/js/tl/mix.js

@@ -191,6 +191,7 @@ async function mixmore(tlid, type) {
 	var obj = JSON.parse(multi)
 	var acct_id = obj[tlid].domain
 	moreloading = true
+	console.log('moreloading mixmore '+tlid+' '+type)
 	todo('Integrated TL MoreLoading...(Local)')
 	const domain = localStorage.getItem('domain_' + acct_id)
 	const sid = $('#timeline_' + tlid + ' .cvo')

app/js/tl/notification.js

@@ -306,6 +306,7 @@ function notfmore(tlid) {
     var domain = localStorage.getItem('domain_' + acct_id)
     if (sid && !moreloading) {
         moreloading = true
+        console.log('moreloading notfmore '+tlid)
         var httpreq = new XMLHttpRequest()
         if (localStorage.getItem('mode_' + domain) == 'misskey') {
             var misskey = true

app/js/tl/parse.js

@@ -1452,7 +1452,7 @@ function pollParse(poll, acct_id, emojis) {
 			var me = minechoice[i]
 			if (me == keyc) {
 				var voteit =
-					'<span class="ownMark"><img class="emoji" draggable="false" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/2705.png"></span>'
+					'<span class="ownMark"><img class="emoji" draggable="false" src="https://energised.botegirl.parts/v/12.1.4/72x72/2705.png"></span>'
 				break
 			}
 		}

app/js/tl/src.js

@@ -193,6 +193,7 @@ function moreTs(tlid, q) {
 		.last()
 		.attr('data-maxid')
 	moreloading = true
+	console.log('moreloading src '+tlid)
 	var start =
 		'https://tootsearch.chotto.moe/api/v1/search?from=' + sid + '&sort=created_at%3Adesc&q=' + q
 	$('#notice_' + tlid).text('tootsearch(' + q + ')')

app/js/tl/tl.js

@@ -540,6 +540,7 @@ function moreload(type, tlid) {
             return
         }
         moreloading = true
+        console.log('moreloading moreload '+tlid)
         localStorage.setItem('now', type)
         todo(cap(type) + ' TL MoreLoading')
         if (type != 'noauth') {
@@ -673,6 +674,7 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
             return
         }
         moreloading = true
+        console.log('moreloading tldiff '+tlid)
         localStorage.setItem('now', type)
         todo(cap(type) + ' TL MoreLoading')
         if (type != 'noauth') {
@@ -1353,6 +1355,7 @@ function asReadEnd() {
 //ブックマーク
 function getBookmark(acct_id, tlid, more) {
     moreloading = true
+    console.log('moreloading getbookmark '+tlid)
     console.log(acct_id, tlid, more)
     if (more) {
         var sid = $('#timeline_' + tlid + ' .notif-marker')
@@ -1407,6 +1410,7 @@ function getBookmark(acct_id, tlid, more) {
 function getUtl(acct_id, tlid, data, more) {
 
     moreloading = true
+    console.log('moreloading getutl '+tlid)
     if (more) {
         var sid = $('#timeline_' + tlid + ' .cvo')
             .last()

app/nano.html

@@ -148,7 +148,7 @@
 				var lang = "ja";
 			}
 		</script>
-		<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
+		<script src="https://energised.harpy.faith/2/twemoji.min.js?2.7"></script>
 		<script type="text/javascript" src="./node_modules/lodash/lodash.min.js"></script>
 		<script type="text/javascript" src="./js/platform/first.js"></script>
 		<script type="text/javascript" src="./js/platform/plugin.js"></script>

app/view/make/components/index.html

@@ -73,7 +73,7 @@
 		<script type="text/javascript" src="../../@@node_base@@/sweetalert2/dist/sweetalert2.min.js"></script>
 		<script type="text/javascript" src="../../js/platform/punycode.js"></script>
 		<script type="text/javascript" src="../../js/ui/tips.js"></script>
-		<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
+		<script src="https://energised.botegirl.parts/2/twemoji.min.js?2.7"></script>
 		<script type="text/javascript" src="../../js/common/about.js"></script>
 		<script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
 		<script type="text/javascript" src="../../js/tl/dm.js"></script>

app/view/make/setting.sample.html

@@ -318,7 +318,7 @@
                     <div class="area-display_name grid">
                         <div class="flex-name">
                             <span class="user">TheDesk<img class="emoji" draggable="false" alt="👀"
-                                    src="https://twemoji.maxcdn.com/v/13.0.2/72x72/1f440.png"></span>
+                                    src="https://energised.botegirl.parts/v/13.0.2/72x72/1f440.png"></span>
                             <span class="sml gray"
                                 style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;">
                                 @thedesk@a.thedesk.tld <i class="fas fa-lock red-text"></i>