From 5e221e3c67b1c7e9527160905f64473fb9c73b0f Mon Sep 17 00:00:00 2001
From: Martin Persson <mnpn03@icloud.com>
Date: Mon, 20 Nov 2023 17:02:05 +0100
Subject: [PATCH] Update social links

---
 app/AboutViewController.m       | 8 ++++----
 app/Base.lproj/About.storyboard | 4 ++--
 app/Icons/Icons.plist           | 2 +-
 emu/float80.c                   | 2 +-
 fastlane/footer.txt             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/AboutViewController.m b/app/AboutViewController.m
index 6ea54fbecd..70ab6f2c21 100644
--- a/app/AboutViewController.m
+++ b/app/AboutViewController.m
@@ -23,7 +23,7 @@ @interface AboutViewController ()
 
 @property (weak, nonatomic) IBOutlet UITableViewCell *sendFeedback;
 @property (weak, nonatomic) IBOutlet UITableViewCell *openGithub;
-@property (weak, nonatomic) IBOutlet UITableViewCell *openTwitter;
+@property (weak, nonatomic) IBOutlet UITableViewCell *openFediverse;
 @property (weak, nonatomic) IBOutlet UITableViewCell *openDiscord;
 
 @property (weak, nonatomic) IBOutlet UITableViewCell *upgradeApkCell;
@@ -99,10 +99,10 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         [UIApplication openURL:@"mailto:tblodt@icloud.com?subject=Feedback%20for%20iSH"];
     } else if (cell == self.openGithub) {
         [UIApplication openURL:@"https://github.com/ish-app/ish"];
-    } else if (cell == self.openTwitter) {
-        [UIApplication openURL:@"https://twitter.com/tblodt"];
+    } else if (cell == self.openFediverse) {
+        [UIApplication openURL:@"https://publ.ish.app/ish"];
     } else if (cell == self.openDiscord) {
-        [UIApplication openURL:@"https://discord.gg/HFAXj44"];
+        [UIApplication openURL:@"https://discord.gg/ish"];
     } else if (cell == self.exportContainerCell) {
         // copy the files to the app container so they can be extracted from iTunes file sharing
         NSURL *container = ContainerURL();
diff --git a/app/Base.lproj/About.storyboard b/app/Base.lproj/About.storyboard
index f299c24473..20d521d08f 100644
--- a/app/Base.lproj/About.storyboard
+++ b/app/Base.lproj/About.storyboard
@@ -241,7 +241,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="293.5" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="@tblodt on Twitter" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wyO-AY-ccm">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="iSH on the Fediverse" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wyO-AY-ccm">
                                                     <rect key="frame" x="16" y="0.0" width="269.5" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -375,8 +375,8 @@
                         <outlet property="exportContainerCell" destination="OIE-9g-Btx" id="qxo-l5-0Mq"/>
                         <outlet property="launchCommandField" destination="gDx-hv-hhV" id="RQn-gk-Dx8"/>
                         <outlet property="openDiscord" destination="K5r-jy-Dzl" id="b4l-Vr-6l8"/>
+                        <outlet property="openFediverse" destination="bge-GA-6p8" id="ghM-X8-itm"/>
                         <outlet property="openGithub" destination="F4i-eC-hQ6" id="66M-sQ-RJR"/>
-                        <outlet property="openTwitter" destination="bge-GA-6p8" id="r0A-lN-0e0"/>
                         <outlet property="resetMountsCell" destination="Bqt-ud-CI0" id="2AS-2S-XCr"/>
                         <outlet property="sendFeedback" destination="gMm-4C-5X3" id="nhX-ZH-zyP"/>
                         <outlet property="themeCell" destination="dqn-Cd-cNm" id="dfh-et-0o7"/>
diff --git a/app/Icons/Icons.plist b/app/Icons/Icons.plist
index ddddfa71fb..b8b4c9d683 100644
--- a/app/Icons/Icons.plist
+++ b/app/Icons/Icons.plist
@@ -5,7 +5,7 @@
 	<key></key>
 	<dict>
 		<key>link</key>
-		<string>https://twitter.com/tblodt</string>
+		<string>https://mastodon.social/@tbodt</string>
 		<key>author</key>
 		<string>@tbodt</string>
 		<key>description</key>
diff --git a/emu/float80.c b/emu/float80.c
index c1586dae32..f1b5539025 100644
--- a/emu/float80.c
+++ b/emu/float80.c
@@ -397,7 +397,7 @@ float80 f80_add(float80 a, float80 b) {
             sign = 1;
         }
 
-        // a bizarre special case https://twitter.com/tblodt/status/1262145524620234752
+        // a bizarre special case https://web.archive.org/web/20200517222437/https://twitter.com/tblodt/status/1262145524620234752
         if (signif == 0 && a_signif != 0 && f80_rounding_mode == round_down)
             return (float80) {.sign = 1};
 
diff --git a/fastlane/footer.txt b/fastlane/footer.txt
index 0561741363..685035b085 100644
--- a/fastlane/footer.txt
+++ b/fastlane/footer.txt
@@ -1,5 +1,5 @@
 Send bug reports or feedback here: https://github.com/ish-app/ish/issues (or by email, if you prefer)
-Follow iSH on Twitter: https://twitter.com/iSH_app
-Join the Discord: https://discord.gg/HFAXj44
+Follow iSH on the Fediverse: @ish@ish.app
+Join the Discord: https://discord.gg/ish
 Give me money here: https://patreon.com/tbodt