From 950169152ec13b228db2e8b27a9bd888d82def85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 27 Feb 2026 14:47:15 -0500
Subject: [PATCH 1/5] mobile fix for acp searches

---
 src/views/admin/dashboard/searches.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/admin/dashboard/searches.tpl b/src/views/admin/dashboard/searches.tpl
index ef20b9223b..52d1b8ea20 100644
--- a/src/views/admin/dashboard/searches.tpl
+++ b/src/views/admin/dashboard/searches.tpl
@@ -1,6 +1,6 @@
 <div class="row dashboard px-lg-4">
-	<div class="col-8 mx-auto">
-		<div class="d-flex justify-content-between align-items-center mb-3">
+	<div class="col-12 col-md-8 mx-auto">
+		<div class="d-flex flex-wrap gap-3 justify-content-between align-items-center mb-3">
 			<form class="d-flex flex-wrap gap-3 align-sm-items-center" method="GET">
 				<div class="d-flex align-items-center gap-2">
 					<label class="form-label mb-0" for="start">[[admin/dashboard:start]]</label>
@@ -14,7 +14,7 @@
 					<button onclick="$('form').submit();return false;"class="btn btn-primary btn-sm" type="submit">[[admin/dashboard:filter]]</button>
 				</div>
 			</form>
-			<button id="clear-search-history" class="btn btn-sm btn-light"><i class="fa fa-trash text-danger"></i> [[admin/dashboard:clear-search-history]]</button>
+			<button id="clear-search-history" class="btn btn-sm btn-light text-nowrap"><i class="fa fa-trash text-danger"></i> [[admin/dashboard:clear-search-history]]</button>
 		</div>
 
 		<table class="table table-sm text-sm search-list w-100">

From 96719843e58b1d58d663b61d192b8547e14b8b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 27 Feb 2026 14:51:06 -0500
Subject: [PATCH 2/5] dont display title

---
 public/src/admin/modules/dashboard-line-graph.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/admin/modules/dashboard-line-graph.js b/public/src/admin/modules/dashboard-line-graph.js
index 3087518c9d..33404236be 100644
--- a/public/src/admin/modules/dashboard-line-graph.js
+++ b/public/src/admin/modules/dashboard-line-graph.js
@@ -78,7 +78,7 @@ export function init({ set, dataset }) {
 							position: 'left',
 							beginAtZero: true,
 							title: {
-								display: true,
+								display: false,
 								text: key,
 							},
 						},

From 6f1291675e59e486ee959677f791b14d0c79bf35 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 27 Feb 2026 14:54:31 -0500
Subject: [PATCH 3/5] fix: skip parsing of duplicate emoji tags

---
 src/activitypub/helpers.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/activitypub/helpers.js b/src/activitypub/helpers.js
index 558a4ee8d7..044fc2c82d 100644
--- a/src/activitypub/helpers.js
+++ b/src/activitypub/helpers.js
@@ -559,6 +559,7 @@ Helpers.renderEmoji = (text, tags, strip = false) => {
 	tags = Array.isArray(tags) ? tags : [tags];
 	let result = text;
 
+	const parsed = new Set();
 	tags.forEach((tag) => {
 		const isEmoji = tag.type === 'Emoji';
 		const hasUrl = tag.icon && tag.icon.url;
@@ -566,6 +567,9 @@ Helpers.renderEmoji = (text, tags, strip = false) => {
 
 		if (isEmoji && (strip || (hasUrl && isImage))) {
 			let { name } = tag;
+			if (parsed.has(name)) {
+				return;
+			}
 
 			if (!name.startsWith(':')) {
 				name = `:${name}`;
@@ -583,6 +587,7 @@ Helpers.renderEmoji = (text, tags, strip = false) => {
 				result = result.substring(0, index) + imgTag + result.substring(index + name.length);
 				index = result.indexOf(name, index + imgTag.length);
 			}
+			parsed.add(name);
 		}
 	});
 

From f67414b33e886736a9e68620705880ec11d069a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 27 Feb 2026 14:20:58 -0500
Subject: [PATCH 4/5] add missing center

---
 src/views/admin/partials/dashboard/graph.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/admin/partials/dashboard/graph.tpl b/src/views/admin/partials/dashboard/graph.tpl
index e6eb91ff29..cc009d12b9 100644
--- a/src/views/admin/partials/dashboard/graph.tpl
+++ b/src/views/admin/partials/dashboard/graph.tpl
@@ -3,7 +3,7 @@
 		<div class="d-flex justify-content-between align-items-center">
 			{graphTitle}
 
-			<div class="d-flex gap-1">
+			<div class="d-flex gap-1 align-items-center">
 				<select data-action="updateGraph" class="form-select form-select-sm">
 					<option value="1">[[admin/dashboard:page-views-last-day]]</option>
 					<option value="7">[[admin/dashboard:page-views-seven]]</option>

From f1fa8f12b1cdf6d17701e98e6d53f9001c04f946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 27 Feb 2026 16:46:40 -0500
Subject: [PATCH 5/5] fix: fullscreen acp graphs

---
 public/language/en-GB/admin/dashboard.json   |  2 +-
 public/scss/admin/general/dashboard.scss     |  6 +++-
 public/src/admin/dashboard.js                | 37 ++------------------
 public/src/admin/dashboard/logins.js         |  3 +-
 public/src/admin/dashboard/topics.js         |  5 ++-
 public/src/admin/dashboard/users.js          |  5 ++-
 public/src/admin/modules/fullscreen.js       | 30 ++++++++++++++++
 src/views/admin/partials/dashboard/graph.tpl |  8 ++---
 8 files changed, 53 insertions(+), 43 deletions(-)
 create mode 100644 public/src/admin/modules/fullscreen.js

diff --git a/public/language/en-GB/admin/dashboard.json b/public/language/en-GB/admin/dashboard.json
index a35775fdce..1149767ecc 100644
--- a/public/language/en-GB/admin/dashboard.json
+++ b/public/language/en-GB/admin/dashboard.json
@@ -11,7 +11,7 @@
 	"page-views-seven": "Last 7 Days",
 	"page-views-thirty": "Last 30 Days",
 	"page-views-last-day": "Last 24 hours",
-	"page-views-custom": "Custom Date Range",
+	"page-views-custom": "Custom Range",
 	"page-views-custom-start": "Range Start",
 	"page-views-custom-end": "Range End",
 	"page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is <code>YYYY-MM-DD</code>",
diff --git a/public/scss/admin/general/dashboard.scss b/public/scss/admin/general/dashboard.scss
index 2cfc461a0e..db73c92e75 100644
--- a/public/scss/admin/general/dashboard.scss
+++ b/public/scss/admin/general/dashboard.scss
@@ -1,3 +1,6 @@
+.template-admin-dashboard .graph-container {
+	min-height: 300px;
+}
 .dashboard {
 	.card {
 		max-width: 100% !important;
@@ -12,7 +15,8 @@
 		}
 
 		&.fullscreen {
-			width: 100%;
+			width: 100%!important;
+			height: 100%!important;
 			padding: 40px;
 		}
 	}
diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js
index 8be06177b0..a290a791c7 100644
--- a/public/src/admin/dashboard.js
+++ b/public/src/admin/dashboard.js
@@ -18,6 +18,8 @@ import * as alerts from '../modules/alerts';
 import * as translator from '../modules/translator';
 import { formattedNumber } from '../modules/helpers';
 
+import { setupFullscreen } from './modules/fullscreen';
+
 Chart.register(
 	LineController,
 	DoughnutController,
@@ -75,7 +77,7 @@ export function init() {
 		socket.emit('admin.rooms.getAll', updateRoomUsage);
 		initiateDashboard();
 	});
-	setupFullscreen();
+	setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
 }
 
 function updateRoomUsage(err, data) {
@@ -579,36 +581,3 @@ function initiateDashboard(realtime) {
 	}, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.graphInterval);
 }
 
-function setupFullscreen() {
-	const container = document.getElementById('analytics-panel');
-	const $container = $(container);
-	const btn = $container.find('#expand-analytics');
-	let fsMethod;
-	let exitMethod;
-
-	if (container.requestFullscreen) {
-		fsMethod = 'requestFullscreen';
-		exitMethod = 'exitFullscreen';
-	} else if (container.mozRequestFullScreen) {
-		fsMethod = 'mozRequestFullScreen';
-		exitMethod = 'mozCancelFullScreen';
-	} else if (container.webkitRequestFullscreen) {
-		fsMethod = 'webkitRequestFullscreen';
-		exitMethod = 'webkitCancelFullScreen';
-	} else if (container.msRequestFullscreen) {
-		fsMethod = 'msRequestFullscreen';
-		exitMethod = 'msCancelFullScreen';
-	}
-
-	if (fsMethod) {
-		btn.on('click', function () {
-			if ($container.hasClass('fullscreen')) {
-				document[exitMethod]();
-				$container.removeClass('fullscreen');
-			} else {
-				container[fsMethod]();
-				$container.addClass('fullscreen');
-			}
-		});
-	}
-}
diff --git a/public/src/admin/dashboard/logins.js b/public/src/admin/dashboard/logins.js
index eea048293c..c82b54f17b 100644
--- a/public/src/admin/dashboard/logins.js
+++ b/public/src/admin/dashboard/logins.js
@@ -1,6 +1,6 @@
 'use strict';
 
-define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph'], (graph) => {
+define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph', 'admin/modules/fullscreen'], (graph, { setupFullscreen }) => {
 	const ACP = {};
 
 	ACP.init = () => {
@@ -8,6 +8,7 @@ define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph'], (graph)
 			set: 'logins',
 			dataset: ajaxify.data.dataset,
 		});
+		setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
 	};
 
 	return ACP;
diff --git a/public/src/admin/dashboard/topics.js b/public/src/admin/dashboard/topics.js
index 91e0754779..5a9bcb262b 100644
--- a/public/src/admin/dashboard/topics.js
+++ b/public/src/admin/dashboard/topics.js
@@ -1,6 +1,8 @@
 'use strict';
 
-define('admin/dashboard/topics', ['admin/modules/dashboard-line-graph', 'hooks'], (graph, hooks) => {
+define('admin/dashboard/topics', [
+	'admin/modules/dashboard-line-graph', 'hooks', 'admin/modules/fullscreen'
+], (graph, hooks, { setupFullscreen }) => {
 	const ACP = {};
 
 	ACP.init = () => {
@@ -10,6 +12,7 @@ define('admin/dashboard/topics', ['admin/modules/dashboard-line-graph', 'hooks']
 		}).then(() => {
 			hooks.onPage('action:admin.dashboard.updateGraph', ACP.updateTable);
 		});
+		setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
 	};
 
 	ACP.updateTable = () => {
diff --git a/public/src/admin/dashboard/users.js b/public/src/admin/dashboard/users.js
index c9798e9572..7ef00ea477 100644
--- a/public/src/admin/dashboard/users.js
+++ b/public/src/admin/dashboard/users.js
@@ -1,6 +1,8 @@
 'use strict';
 
-define('admin/dashboard/users', ['admin/modules/dashboard-line-graph', 'hooks'], (graph, hooks) => {
+define('admin/dashboard/users', [
+	'admin/modules/dashboard-line-graph', 'hooks', 'admin/modules/fullscreen',
+], (graph, hooks, { setupFullscreen }) => {
 	const ACP = {};
 
 	ACP.init = () => {
@@ -10,6 +12,7 @@ define('admin/dashboard/users', ['admin/modules/dashboard-line-graph', 'hooks'],
 		}).then(() => {
 			hooks.onPage('action:admin.dashboard.updateGraph', ACP.updateTable);
 		});
+		setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
 	};
 
 	ACP.updateTable = () => {
diff --git a/public/src/admin/modules/fullscreen.js b/public/src/admin/modules/fullscreen.js
new file mode 100644
index 0000000000..eac4ffd0c5
--- /dev/null
+++ b/public/src/admin/modules/fullscreen.js
@@ -0,0 +1,30 @@
+export function setupFullscreen($btn, $container) {
+	let fsMethod;
+	let exitMethod;
+	const container = $container.get(0);
+	if (container.requestFullscreen) {
+		fsMethod = 'requestFullscreen';
+		exitMethod = 'exitFullscreen';
+	} else if (container.mozRequestFullScreen) {
+		fsMethod = 'mozRequestFullScreen';
+		exitMethod = 'mozCancelFullScreen';
+	} else if (container.webkitRequestFullscreen) {
+		fsMethod = 'webkitRequestFullscreen';
+		exitMethod = 'webkitCancelFullScreen';
+	} else if (container.msRequestFullscreen) {
+		fsMethod = 'msRequestFullscreen';
+		exitMethod = 'msCancelFullScreen';
+	}
+
+	if (fsMethod) {
+		$btn.on('click', function () {
+			if ($container.hasClass('fullscreen')) {
+				document[exitMethod]().catch(err => console.error(err));
+				$container.removeClass('fullscreen');
+			} else {
+				container[fsMethod]().catch(err => console.error(err));
+				$container.addClass('fullscreen');
+			}
+		});
+	}
+}
\ No newline at end of file
diff --git a/src/views/admin/partials/dashboard/graph.tpl b/src/views/admin/partials/dashboard/graph.tpl
index cc009d12b9..c01b923109 100644
--- a/src/views/admin/partials/dashboard/graph.tpl
+++ b/src/views/admin/partials/dashboard/graph.tpl
@@ -4,20 +4,20 @@
 			{graphTitle}
 
 			<div class="d-flex gap-1 align-items-center">
+				<a class="btn btn-sm btn-light lh-sm" target="_blank" id="view-as-json" href="{config.relative_path}/api/v3/admin/analytics/{set}?type=hourly" data-bs-toggle="tooltip" data-bs-placement="bottom" title="[[admin/dashboard:view-as-json]]"><i class="fa fa-fw fa-xs fa-terminal text-primary"></i></a>
+				<a class="btn btn-sm btn-light lh-sm" id="expand-analytics" href="#" data-bs-toggle="tooltip" data-bs-placement="bottom" title="[[admin/dashboard:expand-analytics]]"><i class="fa fa-fw fa-xs fa-expand text-primary"></i></a>
 				<select data-action="updateGraph" class="form-select form-select-sm">
 					<option value="1">[[admin/dashboard:page-views-last-day]]</option>
 					<option value="7">[[admin/dashboard:page-views-seven]]</option>
 					<option value="30">[[admin/dashboard:page-views-thirty]]</option>
 					<option value="custom">[[admin/dashboard:page-views-custom]]</option>
-					<option value="range" class="hidden">[[admin/dashboard:page-views-custom]]</option>
+					<option value="range" class="hidden"></option>
 				</select>
-				<a class="btn btn-sm btn-light lh-sm" target="_blank" id="view-as-json" href="{config.relative_path}/api/v3/admin/analytics/{set}?type=hourly" data-bs-toggle="tooltip" data-bs-placement="bottom" title="[[admin/dashboard:view-as-json]]"><i class="fa fa-fw fa-xs fa-terminal text-primary"></i></a>
-				<a class="btn btn-sm btn-light lh-sm" id="expand-analytics" href="#" data-bs-toggle="tooltip" data-bs-placement="bottom" title="[[admin/dashboard:expand-analytics]]"><i class="fa fa-fw fa-xs fa-expand text-primary"></i></a>
 			</div>
 		</div>
 	</div>
 	<div class="card-body p-0">
-		<div class="graph-container position-relative" id="analytics-traffic-container" style="width: 100%; {{{ if template.admin/dashboard }}}min-height: 300px;{{{ end }}}">
+		<div class="graph-container position-relative {template.name}" id="analytics-traffic-container" style="width: 100%;">
 			<canvas id="analytics-traffic"></canvas>
 		</div>
 	</div>