diff --git a/assets/js/halcyon/halcyonUI.js b/assets/js/halcyon/halcyonUI.js
index cb2b0dc..a17c2cd 100644
--- a/assets/js/halcyon/halcyonUI.js
+++ b/assets/js/halcyon/halcyonUI.js
@@ -1214,7 +1214,7 @@ replace_emoji();
});
}
$(function() {
-$(document).on('click','.media_attachment[otype="image"]', function(e) {
+$(document).on('click','.media_attachment.with_overlay', function(e) {
e.stopPropagation();
setOverlayMedia($(this).attr('sid'),$(this).attr('mediacount'));
$('.media_detail .toot_entry .media_views').addClass('invisible');
@@ -2054,6 +2054,16 @@ $('.close_button').click();
window.open("https://www.youtube.com/watch?v="+$(".overlay_redirect_invidious").data("video"),"_blank");
if($("#redirect_invidious_permanent")[0].checked) localStorage.setting_redirect_invidious = "false";
});
+$('.overlay_redirect_nitter_yes').click(function() {
+$('.close_button').click();
+window.open("https://"+server_setting_nitter+"/"+$(".overlay_redirect_nitter").data("path"),"_blank");
+if($("#redirect_nitter_permanent")[0].checked) localStorage.setting_redirect_nitter = "true";
+});
+$('.overlay_redirect_nitter_no').click(function() {
+$('.close_button').click();
+window.open("https://twitter.com/"+$(".overlay_redirect_nitter").data("path"),"_blank");
+if($("#redirect_nitter_permanent")[0].checked) localStorage.setting_redirect_nitter = "false";
+});
if($("#js-overlay_content_wrap").hasClass("view")) $(document.body).css("overflow-y","hidden");
$("#js-overlay_content_wrap").attrchange(function(attr) {
if(attr == "class" && $("#js-overlay_content_wrap").hasClass("view")) $(document.body).css("overflow-y","hidden");
@@ -2099,8 +2109,10 @@ $(document).on('click','.link_preview',function(e) {
e.stopPropagation();
const ytcom = $(this).data("url").match(/https?:\/\/(www\.)?youtube\.com\/watch\?v=([a-zA-Z\d_-]+)/);
const ytbe = $(this).data("url").match(/https?:\/\/(www\.)?youtu\.be\/([a-zA-Z\d_-]+)/);
+const twcom = $(this).data("url").match(/https?:\/\/(www\.)?twitter\.com\/(.*)/);
if(ytcom) openVideo(ytcom[2]);
else if(ytbe) openVideo(ytbe[2]);
+else if(twcom) openNitter(twcom[2]);
else window.open($(this).data("url"),"_blank");
});
$(document).on('focus','.status_textarea textarea,.status_top .status_spoiler',function(e) {
diff --git a/config/config.ini.sample b/config/config.ini.sample
index c6f26da..9698f07 100644
--- a/config/config.ini.sample
+++ b/config/config.ini.sample
@@ -12,10 +12,12 @@ url_unshortener = true
; YouPlay resolves YouTube MP4s on your server and sends this link to the user for privacy-friendly watching
; Vimeo embeds work in the same way as YouPlay embeds here because the official players contain too much spyware
; Invidous is a external service to watch YouTube videos in a privacy-friendly way - Halcyon can automatically rewrite links to a instance you can set here
+; Nitter is a external service to view Twitter contents in a privacy-friendly way - Halcyon can automatically rewrite links to a instance you can set here
[Media]
youplay = true
vimeo = true
invidious = invidiou.sh
+nitter = nitter.nixnet.xyz
; The proxy can be used optionally to resolve data for privacy-friendly media embeds on the server side - It is not used for Mastodon API requests on login
; Proxy type can be set to none, socks5, socks4, http or https - Example settings for locally installed Tor client
diff --git a/footer.php b/footer.php
index 14d4ba0..9a3ade6 100644
--- a/footer.php
+++ b/footer.php
@@ -16,6 +16,7 @@ include dirname(__FILE__).('/widgets/overlay_confirm.php');
include dirname(__FILE__).('/widgets/overlay_prompt.php');
include dirname(__FILE__).('/widgets/overlay_addlist.php');
include dirname(__FILE__).('/widgets/overlay_redirect_invidious.php');
+include dirname(__FILE__).('/widgets/overlay_redirect_nitter.php');
if($_SERVER["REQUEST_URI"] == "/settings/filters") include dirname(__FILE__).('/widgets/overlay_filter.php');
?>
diff --git a/header.php b/header.php
index 616f446..0734ecc 100644
--- a/header.php
+++ b/header.php
@@ -75,6 +75,7 @@ server_setting_youplay = ;
server_setting_vimeo = ;
server_setting_unshorten = ;
server_setting_invidious = ;
+server_setting_nitter = ;
diff --git a/login/auth.php b/login/auth.php
index 95730df..143ecbd 100644
--- a/login/auth.php
+++ b/login/auth.php
@@ -58,6 +58,7 @@ localStorage.setItem('setting_play_vimeo','false');
localStorage.setItem('setting_post_privacy','".$profile["source"]["privacy"]."');
localStorage.setItem('setting_post_sensitive','".$profile["source"]["sensitive"]."');
localStorage.setItem('setting_redirect_invidious','unset');
+localStorage.setItem('setting_redirect_nitter','unset');
$.cookie('darktheme','unset',{path:'/',expires:3650});
if(sessionStorage.return && sessionStorage.return == 'share') location.href = '/intent/toot?action=send';
else location.href = '/';
diff --git a/settings_media.php b/settings_media.php
index 860bdf2..8737462 100644
--- a/settings_media.php
+++ b/settings_media.php
@@ -99,7 +99,7 @@