.gitignore

@@ -7,4 +7,3 @@
 .project
 */.factorypath
 **/.antlr/
-*.code-workspace

CHANGELOG.md

@@ -1,20 +1,3 @@
-5.3.4-J62
-========================
-Current Good working copy after chaturbate reverting their changes. Chaturbate Video and audio currently working.
-* jre bundled (in releases) (fixed permissions) (linux and macos)
-* updated ffmpeg (in releases) (fixed permissions) (windows, linux and macos)
-* fixed run script permissions (linux and macos)
-* bump ver
-* all builds checked
-
-5.3.3-J62
-========================
-Reverted for chaturbate reverting their changes. Chaturbate Video and audio currently working.
-* jre bundled (in releases)
-* flirt4free fix - "topic" no longer sent, replaced with empty string
-* bump ver
-* all builds checked
-
 5.3.0
 ========================
 * Added menu entry to force recording of models without changing the prio

README.md

@@ -1,28 +1,10 @@
 # CTB Recorder
-![splash](https://git.ctbrec.com/j62/ctbrec/raw/branch/main/splash-small.png)
-## Current State Version 5.3.3
-Reverted for chaturbate reverting their changes. Chaturbate Video and audio currently working.<br>
+![splash](https://git.ctbrec.com/j62/ctbrec/raw/branch/main/splash.png)
+## Current State Version 5.3.2-a
 
-- jre bundled<br>
-- f4f fix<br>
-- bump ver<br>
-- all builds checked<br>
+## updates to fix chaturbate broken audio coming soon
 
-### ABOUT This Repo, server and domain hosted and maintained by J62
-I (j62) now have a fully set up development environment again(have been here and assisted in different ways since 2020), allowing me to handle all builds with ease. I’ve also set up a domain, Git server, and hosting—at my own expense—to provide a stable and maintained platform for the foreseeable future.<br>
-
-I took this step after witnessing the chaotic distribution of zip files in Discord, where multiple developers were scrambling to fix the Chaturbate issue. It became clear that there was a need (once again) for a centralized collaboration and download hub.<br>
-
-Ideally, everyone should utilize the Git server and create their own forks(of this repo). This way, we can manage changes efficiently through pull requests between forks.<br>
-
-Support me:<br>
-
-Bitcoin: bc1q7fvtkx8wklvd4zttsec7sfgxqh9zadk0x236lt <br>
-Ether: 0x2e687A5628ff16c8f9624A914C1f727000089C3A <br>
-Solana: Z5YwNPkLheSHuaSJjyHhg3L8UxjpJPt5WU6vu4hFsNR <br>
-Monero: 47tjD1z63wu3FEnDCvWnFaRAZbpDKc3Ys1WCbgzvB2Gg8XbqU8bARpcCC37mWzuWBAeZPu2UGY4TAcYGhb6fptoTR8X9vjc
-
-## A free recording software for different camsites. Currently supported: BongaCams, Cam4, CamSoda, Chaturbate, FC2Live, LiveJasmin, MyFreeCams, Streamate
+A free recording software for different camsites. Currently supported: BongaCams, Cam4, CamSoda, Chaturbate, FC2Live, LiveJasmin, MyFreeCams, Streamate
 
 ![Screenshot](https://git.ctbrec.com/j62/ctbrec/raw/branch/main/docs/img/featured-s.jpg)
 

client/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>ctbrec</groupId>
         <artifactId>master</artifactId>
-        <version>5.3.4</version>
+        <version>5.3.3</version>
         <relativePath>../master</relativePath>
     </parent>
 

client/src/main/java/ctbrec/ui/CamrecApplication.java

@@ -268,8 +268,7 @@ public class CamrecApplication extends Application {
             tabPane.getTabs().add(new RecentlyWatchedTab(recorder, sites));
         }
         tabPane.getTabs().add(new SettingsTab(sites, recorder));
-        //tabPane.getTabs().add(new NewsTab(config));
-        tabPane.getTabs().add(new NewsTab(config, getHostServices()));
+        tabPane.getTabs().add(new NewsTab(config));
         tabPane.getTabs().add(new DonateTabFx());
         tabPane.getTabs().add(new HelpTab());
         tabPane.getTabs().add(new LoggingTab());

client/src/main/java/ctbrec/ui/news/NewsTab.java

@@ -6,22 +6,17 @@ import ctbrec.GlobalThreadPool;
 import ctbrec.Version;
 import ctbrec.io.HttpException;
 import ctbrec.io.json.ObjectMapperFactory;
+import ctbrec.ui.CamrecApplication;
 import ctbrec.ui.controls.Dialogs;
 import ctbrec.ui.tabs.TabSelectionListener;
-import javafx.application.HostServices;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.control.Hyperlink;
-import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tab;
 import javafx.scene.layout.VBox;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.IOException;
@@ -32,17 +27,16 @@ import static ctbrec.io.HttpConstants.USER_AGENT;
 
 @Slf4j
 public class NewsTab extends Tab implements TabSelectionListener {
-    private static final String URL = "https://git.ctbrec.com/api/v1/repos/j62/ctbrec/releases";
+    private static final String ACCESS_TOKEN = "a2804d73a89951a22e0f8483a6fcec8943afd88b7ba17c459c095aa9e6f94fd0";
+    private static final String URL = "https://mastodon.cloud/api/v1/accounts/480960/statuses?limit=20&exclude_replies=true";
     private final Config config;
-    private final HostServices hostServices;
     private final VBox layout = new VBox();
-    private final ObjectMapper mapper = ObjectMapperFactory.getMapper();
-    private final OkHttpClient httpClient = new OkHttpClient();
 
-    public NewsTab(Config config, HostServices hostServices) {
+    private final ObjectMapper mapper = ObjectMapperFactory.getMapper();
+
+    public NewsTab(Config config) {
         this.config = config;
-        this.hostServices = hostServices;
-        setText("Releases");
+        setText("News");
         layout.setMaxWidth(800);
         layout.setAlignment(Pos.CENTER);
         setContent(new ScrollPane(layout));
@@ -50,21 +44,24 @@ public class NewsTab extends Tab implements TabSelectionListener {
 
     @Override
     public void selected() {
-        GlobalThreadPool.submit(this::loadReleases);
+        GlobalThreadPool.submit(this::loadToots);
     }
 
-    private void loadReleases() {
+    private void loadToots() {
         try {
             var request = new Request.Builder()
                     .url(URL)
+                    .header("Authorization", "Bearer " + ACCESS_TOKEN)
                     .header(USER_AGENT, "ctbrec " + Version.getVersion())
                     .build();
-            try (Response response = httpClient.newCall(request).execute()) {
+            try (var response = CamrecApplication.httpClient.execute(request)) {
                 if (response.isSuccessful()) {
                     var body = Objects.requireNonNull(response.body(), HTTP_RESPONSE_BODY_IS_NULL).string();
                     log.debug(body);
                     if (body.startsWith("[")) {
                         onSuccess(body);
+                    } else if (body.startsWith("{")) {
+                        onError(body);
                     } else {
                         throw new IOException("Unexpected response: " + body);
                     }
@@ -73,53 +70,30 @@ public class NewsTab extends Tab implements TabSelectionListener {
                 }
             }
         } catch (IOException e) {
-            log.info("Error while loading releases", e);
-            Dialogs.showError(getTabPane().getScene(), "Releases", "Couldn't load release information", e);
+            log.info("Error while loading news", e);
+            Dialogs.showError(getTabPane().getScene(), "News", "Couldn't load news from mastodon", e);
+        }
+    }
+
+    private void onError(String body) throws IOException {
+        var json = new JSONObject(body);
+        if (json.has("error")) {
+            throw new IOException("Request not successful: " + json.getString("error"));
+        } else {
+            throw new IOException("Unexpected response: " + body);
         }
     }
 
     private void onSuccess(String body) throws IOException {
-        JSONArray releases = new JSONArray(body);
+        Status[] statusArray = mapper.readValue(body, Status[].class);
         Platform.runLater(() -> {
             layout.getChildren().clear();
-            for (int i = 0; i < releases.length(); i++) {
-                JSONObject release = releases.getJSONObject(i);
-                String tagName = release.optString("tag_name", "Unknown Version");
-                String releaseName = release.optString("name", "No Name");
-                String description = release.optString("body", "No description available.");
-                JSONArray assets = release.optJSONArray("assets");
-
-                var releasePane = new VBox();
-                releasePane.setPadding(new Insets(10));
-                releasePane.setSpacing(5);
-
-                Label versionLabel = new Label("Version: " + tagName);
-                versionLabel.setStyle("-fx-font-weight: bold;");
-
-                Label nameLabel = new Label("Release: " + releaseName);
-                Label descLabel = new Label(description);
-
-                releasePane.getChildren().addAll(versionLabel, nameLabel, descLabel);
-
-                if (assets != null) {
-                    Label assetsLabel = new Label("Assets:");
-                    releasePane.getChildren().add(assetsLabel);
-                    for (int j = 0; j < assets.length(); j++) {
-                        JSONObject asset = assets.getJSONObject(j);
-                        String assetName = asset.optString("name", "Unknown File");
-                        String downloadUrl = asset.optString("browser_download_url", "#");
-                        int size = asset.optInt("size", 0);
-                        int downloads = asset.optInt("download_count", 0);
-
-                        Hyperlink assetLink = new Hyperlink(assetName + " (" + size / 1024 / 1024 + " MB, " + downloads + " downloads)");
-                        assetLink.setOnAction(event -> hostServices.showDocument(downloadUrl));
-
-                        releasePane.getChildren().add(assetLink);
-                    }
+            for (Status status : statusArray) {
+                if (status.getInReplyToId() == null && !Objects.equals("direct", status.getVisibility())) {
+                    var stp = new StatusPane(status, config.getDateTimeFormatter());
+                    layout.getChildren().add(stp);
+                    VBox.setMargin(stp, new Insets(10));
                 }
-
-                layout.getChildren().add(releasePane);
-                VBox.setMargin(releasePane, new Insets(10));
             }
         });
     }

client/src/main/java/ctbrec/ui/tabs/DonateTabFx.java

@@ -24,9 +24,9 @@ public class DonateTabFx extends Tab {
 
         var headerVbox = new VBox(10);
         headerVbox.setAlignment(Pos.CENTER);
-        var beer = new Label("Buy me a drink?!");
+        var beer = new Label("Buy me some beer?!");
         beer.setFont(new Font(36));
-        var desc = new Label("If you like this software and want to buy me some MtDew or Energy Drinks(boost ctbrec dev productivity! :), Beer or Pizza, here are some possibilities!");
+        var desc = new Label("If you like this software and want to buy me some beer or pizza, here are some possibilities!");
         desc.setFont(new Font(24));
         headerVbox.getChildren().addAll(beer, desc);
         var header = new HBox();
@@ -36,7 +36,7 @@ public class DonateTabFx extends Tab {
         container.setTop(header);
 
         var prefWidth = 360;
-        var bitcoinAddress = new TextField("bc1q7fvtkx8wklvd4zttsec7sfgxqh9zadk0x236lt");
+        var bitcoinAddress = new TextField("15sLWZon8diPqAX4UdPQU1DcaPuvZs2GgA");
         bitcoinAddress.setEditable(false);
         bitcoinAddress.setPrefWidth(prefWidth);
         var bitcoinQrCode = new ImageView(getClass().getResource("/html/bitcoin-address.png").toString());
@@ -46,7 +46,7 @@ public class DonateTabFx extends Tab {
         bitcoinBox.setAlignment(Pos.TOP_CENTER);
         bitcoinBox.getChildren().addAll(bitcoinLabel, bitcoinAddress, bitcoinQrCode);
 
-        var ethereumAddress = new TextField("0x2e687A5628ff16c8f9624A914C1f727000089C3A");
+        var ethereumAddress = new TextField("0x996041638eEAE7E31f39Ef6e82068d69bA7C090e");
         ethereumAddress.setEditable(false);
         ethereumAddress.setPrefWidth(prefWidth);
         var ethereumQrCode = new ImageView(getClass().getResource("/html/ethereum-address.png").toString());
@@ -56,7 +56,7 @@ public class DonateTabFx extends Tab {
         ethereumBox.setAlignment(Pos.TOP_CENTER);
         ethereumBox.getChildren().addAll(ethereumLabel, ethereumAddress, ethereumQrCode);
 
-        var moneroAddress = new TextField("47tjD1z63wu3FEnDCvWnFaRAZbpDKc3Ys1WCbgzvB2Gg8XbqU8bARpcCC37mWzuWBAeZPu2UGY4TAcYGhb6fptoTR8X9vjc");
+        var moneroAddress = new TextField("871K7xaLR2X8E84CUBi7D88diXgKjbhjZHTEFfJv9ec9eo4NVPCQ2UsGxkroseCcKQbZsHMgW3kg6HR4tfct3fX2HoFDzK6");
         moneroAddress.setEditable(false);
         moneroAddress.setPrefWidth(prefWidth);
         var moneroQrCode = new ImageView(getClass().getResource("/html/monero-address.png").toString());

common/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>ctbrec</groupId>
         <artifactId>master</artifactId>
-        <version>5.3.4</version>
+        <version>5.3.3</version>
         <relativePath>../master</relativePath>
     </parent>
 

master/pom.xml

@@ -6,7 +6,7 @@
     <groupId>ctbrec</groupId>
     <artifactId>master</artifactId>
     <packaging>pom</packaging>
-    <version>5.3.4</version>
+    <version>5.3.3</version>
 
     <modules>
         <module>../common</module>

server/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>ctbrec</groupId>
         <artifactId>master</artifactId>
-        <version>5.3.4</version>
+        <version>5.3.3</version>
         <relativePath>../master</relativePath>
     </parent>